@forge/api

8.5.0-next.38.5.0-next.4
out/api/fetch.js
~out/api/fetch.jsModified
+30−6
Index: package/out/api/fetch.js
===================================================================
--- package/out/api/fetch.js
+++ package/out/api/fetch.js
@@ -3,11 +3,13 @@
 exports.__requestAtlassianAsUser = exports.__requestAtlassianAsApp = exports.wrapRequestConnectedData = exports.wrapRequestTeamworkGraph = exports.wrapRequestGraph = exports.handleProxyResponseErrors = exports.getForgeProxyError = void 0;
 exports.__fetchProduct = __fetchProduct;
 exports.fetchRemote = fetchRemote;
 exports.getFetchAPI = getFetchAPI;
+const ari_1 = require("@forge/util/packages/ari");
 const safeUrl_1 = require("../safeUrl");
 const errors_1 = require("./errors");
 const runtime_1 = require("./runtime");
+const CONTEXT_PRODUCTS = ['jira', 'confluence'];
 async function wrapInMetrics(options, cb) {
     const metrics = (0, runtime_1.__getRuntime)().metrics;
     metrics.counter(options.name, options.tags).incr();
     const timer = metrics.timing(options.name, options.tags).measure();
@@ -132,15 +134,37 @@
         },
         fetch: defaultAccountInfo ? defaultAccountInfo.methods.fetch : lazyThrowNoValidCredentialsError()
     };
 };
-const withContext = (provider, accountId) => (contextAri) => {
-    const requestProductFn = wrapRequestProduct(__fetchProduct({ provider, contextAri, type: 'fpp', accountId }));
-    return {
-        requestJira: requestProductFn,
-        requestConfluence: requestProductFn,
-        requestBitbucket: requestProductFn
+const withContext = (provider, accountId) => {
+    const isContextProduct = (resourceOwner) => CONTEXT_PRODUCTS.includes(resourceOwner);
+    const parseContextAri = (contextAri) => {
+        try {
+            return ari_1.AnyAri.parse(contextAri);
+        }
+        catch {
+            throw new Error(`Invalid context ID: '${contextAri}'`);
+        }
     };
+    return (contextAri) => {
+        const { resourceOwner } = parseContextAri(contextAri);
+        if (!isContextProduct(resourceOwner)) {
+            throw new Error(`Unsupported context resource owner '${resourceOwner}' for withContext. Only ${CONTEXT_PRODUCTS.join(', ')} are supported.`);
+        }
+        const makeRequest = (product) => {
+            const requestProduct = wrapRequestProduct(__fetchProduct({ provider, contextAri, type: 'fpp', accountId }));
+            return async (path, init) => {
+                if (resourceOwner !== product) {
+                    throw new Error(`Context resource owner '${resourceOwner}' does not match request${product.charAt(0).toUpperCase()}${product.slice(1)}`);
+                }
+                return requestProduct(path, init);
+            };
+        };
+        return {
+            requestJira: makeRequest('jira'),
+            requestConfluence: makeRequest('confluence')
+        };
+    };
 };
 const wrapWithRouteUnwrapper = (fetch) => (path, init) => {
     const stringPath = (0, safeUrl_1.isRoute)(path) ? path.value : path;
     return fetch(stringPath, init);