@forge/api 2.18.4-next.1 → 2.18.4-next.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @forge/api
 
+## 2.18.4-next.3
+
+### Patch Changes
+
+- 854ff5d: Fix Authorize API on Node runtime
+- Updated dependencies [854ff5d]
+  - @forge/auth@0.0.4-next.1
+
+## 2.18.4-next.2
+
+### Patch Changes
+
+- Updated dependencies [2cba32e]
+  - @forge/storage@1.5.6-next.1
+
 ## 2.18.4-next.1
 
 ### Patch Changes

package/out/api/runtime.d.ts

@@ -15,6 +15,7 @@ export type ForgeRuntime = {
         moduleType: string;
         moduleKey: string;
     };
+    aaid?: string;
     allowedEgress: string[];
     lambdaContext: {
         awsRequestId: string;

package/out/api/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/api/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAU5E,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF,wBAAgB,UAAU,IAAI,YAAY,CAOzC;AAED,wBAAgB,aAAa,CAAC,IAAI,SAAS,OAAO,EAAE,EAAE,GAAG,EACvD,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,EACnC,EAAE,IAAI,EAAE,GAAE;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAO,GAC7B,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,CAiBjC"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/api/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,wCAAwC,CAAC;AAU5E,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,EAAE,SAAS,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE;QACV,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,OAAO,EAAE;QACP,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF,wBAAgB,UAAU,IAAI,YAAY,CAOzC;AAED,wBAAgB,aAAa,CAAC,IAAI,SAAS,OAAO,EAAE,EAAE,GAAG,EACvD,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,EACnC,EAAE,IAAI,EAAE,GAAE;IAAE,IAAI,CAAC,EAAE,IAAI,CAAA;CAAO,GAC7B,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,GAAG,CAAC,CAiBjC"}

package/out/authorization/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/authorization/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS;;;;;CAgBrB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/authorization/index.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,SAAS;;;;;CA0BrB,CAAC"}

package/out/authorization/index.js

@@ -2,16 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const auth_1 = require("@forge/auth");
-const api = global.api;
+const __1 = require("..");
 const authorize = () => {
-    if (!process.env.__CURRENT_USER_ACCOUNT_ID)
+    let accountId;
+    if (global.api) {
+        accountId = process.env.__CURRENT_USER_ACCOUNT_ID;
+    }
+    else {
+        accountId = (0, __1.getRuntime)().aaid;
+    }
+    if (!accountId) {
         throw new Error(`Couldn’t find the accountId of the invoking user. This API can only be used inside user-invoked modules.`);
-    const accountId = process.env.__CURRENT_USER_ACCOUNT_ID;
+    }
     return Object.assign(Object.assign({}, (0, auth_1.authorizeConfluenceWithFetch)(async (path, opts) => {
-        const res = await api.asUser().requestConfluence(path, opts);
+        const res = await (0, __1.asUser)().requestConfluence((0, __1.assumeTrustedRoute)(path), opts);
         return res.json();
     }, accountId)), (0, auth_1.authorizeJiraWithFetch)(async (path, opts) => {
-        const res = await api.asUser().requestJira(path, opts);
+        const res = await (0, __1.asUser)().requestJira((0, __1.assumeTrustedRoute)(path), opts);
         return res.json();
     }, accountId));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/api",
-  "version": "2.18.4-next.1",
+  "version": "2.18.4-next.3",
   "description": "Forge API methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -12,15 +12,15 @@
     "compile": "tsc -b -v"
   },
   "devDependencies": {
-    "@forge/runtime": "4.4.6-next.1",
+    "@forge/runtime": "4.4.6-next.4",
     "@types/node": "14.18.54",
     "jest-matcher-specific-error": "^1.0.0",
     "nock": "^10.0.6"
   },
   "dependencies": {
-    "@forge/auth": "0.0.4-next.0",
+    "@forge/auth": "0.0.4-next.1",
     "@forge/egress": "1.2.2",
-    "@forge/storage": "1.5.6-next.0",
+    "@forge/storage": "1.5.6-next.1",
     "@forge/util": "1.3.1",
     "@types/node-fetch": "^2.6.4",
     "node-fetch": "2.6.12"