@forge/api 6.4.4-next.2-experimental-3c69930 → 7.0.0-next.3

package/CHANGELOG.md

@@ -1,16 +1,10 @@
 # @forge/api
 
-## 6.4.4-next.2-experimental-3c69930
+## 7.0.0-next.3
 
-### Patch Changes
+### Major Changes
 
-- Updated dependencies [6b7a4ef]
-- Updated dependencies [dfa2aa6]
-- Updated dependencies [e21f32f]
-- Updated dependencies [545ecc1]
-- Updated dependencies [eadb4a6]
-- Updated dependencies [8db2311]
-  - @forge/manifest@12.0.0-next.3-experimental-3c69930
+- 8f24ce1: Updated webtrigger APIs for query and deletion
 
 ## 6.4.4-next.2
 

package/out/webTrigger.d.ts

@@ -1,8 +1,12 @@
 interface WebTriggerAPI {
     getUrl: (webTriggerModuleKey: string, forceCreate?: boolean) => Promise<string>;
     deleteUrl: (webTriggerUrl: string) => Promise<void>;
-    getUrlIds: (webTriggerUrl: string) => Promise<string[]>;
+    queryUrls: (moduleKey?: string) => Promise<WebTriggerQueryResult[]>;
 }
+export declare type WebTriggerQueryResult = {
+    moduleKey: string;
+    url: string;
+};
 export declare const webTrigger: WebTriggerAPI;
 /** @experimental */
 export interface WebTriggerResponse {

package/out/webTrigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webTrigger.d.ts","sourceRoot":"","sources":["../src/webTrigger.ts"],"names":[],"mappings":"AAGA,UAAU,aAAa;IACrB,MAAM,EAAE,CAAC,mBAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChF,SAAS,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,SAAS,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACzD;AAyID,eAAO,MAAM,UAAU,EAAE,aAKxB,CAAC;AAMF,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CACvC;AAMD,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,OAAO,MAAM,EAAE,CAAC;CACjC;AAKD,oBAAY,gBAAgB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;AAM3E,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,gBAAgB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC3C"}
+{"version":3,"file":"webTrigger.d.ts","sourceRoot":"","sources":["../src/webTrigger.ts"],"names":[],"mappings":"AAGA,UAAU,aAAa;IACrB,MAAM,EAAE,CAAC,mBAAmB,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChF,SAAS,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC;CACrE;AAED,oBAAY,qBAAqB,GAAG;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AA4IF,eAAO,MAAM,UAAU,EAAE,aAKxB,CAAC;AAMF,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;KAAE,CAAC;CACvC;AAMD,MAAM,WAAW,iBAAiB;IAChC,cAAc,EAAE,OAAO,MAAM,EAAE,CAAC;CACjC;AAKD,oBAAY,gBAAgB,GAAG,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,QAAQ,GAAG,OAAO,CAAC;AAM3E,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,gBAAgB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAClC,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;CAC3C"}

package/out/webTrigger.js

@@ -37,12 +37,17 @@ const proxyGetWebTriggerURL = (0, runtime_1.wrapInMetrics)('api.getWebTriggerUrl
     return responseBody.data.createWebTriggerUrl.url;
 });
 const proxyDeleteWebTriggerURL = (0, runtime_1.wrapInMetrics)('api.deleteWebTriggerUrl', async (webTriggerUrl) => {
-    const callDelete = async (webTriggerUrlId) => {
-        const response = await (0, fetch_1.__requestAtlassianAsApp)('/graphql', {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({
-                query: `
+    const webTriggerUrlIdRegexGroupMatch = /\/x1\/([^\/\?\#]+)/;
+    const matches = webTriggerUrl.match(webTriggerUrlIdRegexGroupMatch);
+    if (!matches || matches.length < 1) {
+        throw new Error('Internal error occurred: Failed to parse web trigger URL for ID');
+    }
+    const id = matches[0];
+    const response = await (0, fetch_1.__requestAtlassianAsApp)('/graphql', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            query: `
             mutation forge_app_deleteWebTriggerUrl($id: ID!) {
               deleteWebTriggerUrl(id: $id) {
                 success
@@ -50,26 +55,21 @@ const proxyDeleteWebTriggerURL = (0, runtime_1.wrapInMetrics)('api.deleteWebTrig
               }
             }
           `,
-                variables: {
-                    id: webTriggerUrlId
-                }
-            })
-        });
-        if (!response.ok) {
-            throw new Error(`Internal error occurred: Failed to delete web trigger URL: ${response.statusText}.`);
-        }
-        const responseBody = (await response.json());
-        if (!responseBody?.data?.deleteWebTriggerUrl?.success) {
-            const errorText = responseBody?.data?.deleteWebTriggerUrl?.message || 'unknown error';
-            throw new Error(`Internal error occurred: Failed to delete web trigger URL: ${errorText}`);
-        }
-    };
-    const urlIds = await exports.webTrigger.getUrlIds(webTriggerUrl);
-    for (const urlId of urlIds) {
-        await callDelete(urlId);
+            variables: {
+                id
+            }
+        })
+    });
+    if (!response.ok) {
+        throw new Error(`Internal error occurred: Failed to delete web trigger URL: ${response.statusText}.`);
+    }
+    const responseBody = (await response.json());
+    if (!responseBody?.data?.deleteWebTriggerUrl?.success) {
+        const errorText = responseBody?.data?.deleteWebTriggerUrl?.message || 'unknown error';
+        throw new Error(`Internal error occurred: Failed to delete web trigger URL: ${errorText}`);
     }
 });
-const proxyGetWebTriggerUrlIds = (0, runtime_1.wrapInMetrics)('api.getWebTriggerUrlIds', async (webTriggerUrl) => {
+const proxyQueryWebTriggerURLs = (0, runtime_1.wrapInMetrics)('api.queryWebTriggerUrls', async (moduleKey) => {
     const runtime = (0, runtime_1.__getRuntime)();
     const response = await (0, fetch_1.__requestAtlassianAsApp)('/graphql', {
         method: 'POST',
@@ -78,7 +78,7 @@ const proxyGetWebTriggerUrlIds = (0, runtime_1.wrapInMetrics)('api.getWebTrigger
             query: `
             query forge_app_webTriggerUrlsByAppContext($appId: ID!, $envId: ID!, $contextId: ID!) {
               webTriggerUrlsByAppContext(appId: $appId, envId: $envId, contextId: $contextId) {
-                id
+                triggerKey
                 url
               }
             }
@@ -94,19 +94,21 @@ const proxyGetWebTriggerUrlIds = (0, runtime_1.wrapInMetrics)('api.getWebTrigger
         throw new Error(`Internal error occurred: Failed to get web trigger URLs: ${response.statusText}.`);
     }
     const responseBody = (await response.json());
-    if (!responseBody?.data?.webTriggerUrlsByAppContext || responseBody.data.webTriggerUrlsByAppContext.length == 0) {
-        throw new Error('Internal error occurred: No web trigger URLs found');
+    if (!responseBody?.data?.webTriggerUrlsByAppContext) {
+        throw new Error('Internal error occurred: No data from web trigger URLs query.');
     }
-    const result = responseBody.data.webTriggerUrlsByAppContext
-        .filter((webTriggerResult) => webTriggerResult.url == webTriggerUrl)
-        .map((webTriggerResult) => webTriggerResult.id);
-    if (!result || result.length == 0) {
-        throw new Error('Internal error occurred: Web trigger URL matching URL not found');
+    let result = responseBody.data.webTriggerUrlsByAppContext;
+    if (moduleKey) {
+        result = result.filter((webTriggerResult) => webTriggerResult.triggerKey === moduleKey);
     }
+    result = result.map((webTriggerResult) => ({
+        moduleKey: webTriggerResult.triggerKey,
+        url: webTriggerResult.url
+    }));
     return result;
 });
 exports.webTrigger = {
     getUrl: async (webTriggerModuleKey, forceCreate = false) => proxyGetWebTriggerURL(webTriggerModuleKey, forceCreate),
     deleteUrl: async (webTriggerUrl) => proxyDeleteWebTriggerURL(webTriggerUrl),
-    getUrlIds: async (webTriggerUrl) => proxyGetWebTriggerUrlIds(webTriggerUrl)
+    queryUrls: async (moduleKey) => proxyQueryWebTriggerURLs(moduleKey)
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/api",
-  "version": "6.4.4-next.2-experimental-3c69930",
+  "version": "7.0.0-next.3",
   "description": "Forge API methods",
   "author": "Atlassian",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -28,7 +28,7 @@
     "@forge/auth": "0.0.9",
     "@forge/egress": "2.3.1",
     "@forge/i18n": "0.0.7",
-    "@forge/manifest": "^12.0.0-next.3-experimental-3c69930",
+    "@forge/manifest": "^12.0.0-next.3",
     "@forge/storage": "2.0.3",
     "headers-utils": "^3.0.2"
   },