@forge/storage 1.6.0 → 1.7.0

package/README.md

@@ -25,7 +25,6 @@ async function apiClient(path: string, init: RequestInit): Promise<APIResponse>
   const extraHeaders = {
     // See add-forge-user-agent.ts
     'User-Agent': `H11n/${version} ${appAri}`,
-    'X-Forge-Context': appContextAri,
 
     Authorization: `Bearer ${token}`
 

package/out/__test__/global-storage.test.js

@@ -4,8 +4,7 @@ const errors_1 = require("../errors");
 const global_storage_1 = require("../global-storage");
 const gql_queries_1 = require("../gql-queries");
 const mocks_1 = require("@atlassian/metrics-interface/dist/mocks");
-const contextAri = 'app-ari';
-const getStorage = (apiClientMock, metrics) => new global_storage_1.GlobalStorage(() => contextAri, apiClientMock, () => metrics);
+const getStorage = (apiClientMock, metrics) => new global_storage_1.GlobalStorage(apiClientMock, () => metrics);
 const getApiClientMock = (response, statusCode = 200) => {
     return jest.fn().mockReturnValue({
         ok: statusCode === 200,
@@ -72,11 +71,6 @@ describe.each([
         const expectedBody = query ? { query, variables } : { variables };
         expect(JSON.parse(body)).toEqual(expect.objectContaining(expectedBody));
     }
-    beforeEach(() => {
-        global.api = {
-            __getAppAri: jest.fn().mockReturnValue(contextAri)
-        };
-    });
     describe('get', () => {
         it('should call the storage API, passing the provided key and returning the stored value', async () => {
             const apiClientMock = getApiClientMock({
@@ -90,7 +84,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 key: 'testKey',
                 encrypted: false
             });
@@ -111,7 +104,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 key: 'testKey',
                 encrypted: false
             });
@@ -132,7 +124,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 key: 'testKey',
                 encrypted: false
             });
@@ -153,7 +144,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 key: 'testKey',
                 encrypted: false
             });
@@ -211,7 +201,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getSecret('testKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 key: 'testKey',
                 encrypted: true
             });
@@ -237,7 +226,6 @@ describe.each([
             await globalStorage.set('testKey', 'testValue');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     key: 'testKey',
                     value: 'testValue',
                     encrypted: false
@@ -293,7 +281,6 @@ describe.each([
             await expect(globalStorage.set('testKey', 'testValue')).rejects.toThrow(errors_1.APIError.forStatus(500));
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     key: 'testKey',
                     value: 'testValue',
                     encrypted: false
@@ -320,7 +307,6 @@ describe.each([
             await globalStorage.setSecret('testKey', 'testValue');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     key: 'testKey',
                     value: 'testValue',
                     encrypted: true
@@ -347,7 +333,6 @@ describe.each([
             await globalStorage.delete('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     key: 'testKey',
                     encrypted: false
                 }
@@ -404,7 +389,6 @@ describe.each([
             await globalStorage.deleteSecret('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     key: 'testKey',
                     encrypted: true
                 }
@@ -427,7 +411,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 entityName: 'testEntityName',
                 key: 'testEntityKey'
             });
@@ -448,7 +431,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 entityName: 'testEntityName',
                 key: 'testEntityKey'
             });
@@ -469,7 +451,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 entityName: 'testEntityName',
                 key: 'testEntityKey'
             });
@@ -490,7 +471,6 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             const returnedValue = await globalStorage.getEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 entityName: 'testEntityName',
                 key: 'testEntityKey'
             });
@@ -551,7 +531,6 @@ describe.each([
             await globalStorage.setEntity('testEntityName', 'testEntityKey', 'testValue');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     entityName: 'testEntityName',
                     key: 'testEntityKey',
                     value: 'testValue'
@@ -607,7 +586,6 @@ describe.each([
             await expect(globalStorage.setEntity('testEntityName', 'testEntityKey', 'testValue')).rejects.toThrow(errors_1.APIError.forStatus(500));
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     entityName: 'testEntityName',
                     key: 'testEntityKey',
                     value: 'testValue'
@@ -634,7 +612,6 @@ describe.each([
             await globalStorage.deleteEntity('testEntityName', 'testEntityKey');
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
-                    contextAri,
                     entityName: 'testEntityName',
                     key: 'testEntityKey'
                 }
@@ -700,11 +677,10 @@ describe.each([
             const limit = 10;
             const response = await globalStorage.list({ where, cursor, limit });
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 where,
                 cursor,
                 limit
-            }, gql_queries_1.UntypedQueries.listQuery(contextAri, {}).query);
+            }, gql_queries_1.UntypedQueries.listQuery({}).query);
             expect(response).toEqual(expect.objectContaining({
                 results: [
                     { key: 'key1', value: 'testValue' },
@@ -741,11 +717,10 @@ describe.each([
             const limit = 10;
             const response = await globalStorage.list({ where, cursor, limit });
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 where,
                 cursor,
                 limit
-            }, gql_queries_1.UntypedQueries.listQueryForCleanup(contextAri, {}).query);
+            }, gql_queries_1.UntypedQueries.listQueryForCleanup({}).query);
             expect(response).toEqual(expect.objectContaining({
                 results: [
                     { key: 'key1', value: 'testValue' },
@@ -770,11 +745,10 @@ describe.each([
             const globalStorage = getStorage(apiClientMock, passMetrics ? metricMocks.mockMetrics : undefined);
             await globalStorage.list({});
             verifyApiClientCalledWith(apiClientMock, {
-                contextAri,
                 where: null,
                 cursor: null,
                 limit: null
-            }, gql_queries_1.UntypedQueries.listQuery(contextAri, {}).query);
+            }, gql_queries_1.UntypedQueries.listQuery({}).query);
             passMetrics
                 ? checkMetricsFired(metricMocks, { store: 'untyped', operation: 'query', encrypted: false }, true)
                 : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
@@ -846,9 +820,7 @@ describe.each([
                 results: [],
                 nextCursor: null
             });
-            verifyApiClientCalledWith(apiClientMock, {
-                contextAri
-            }, gql_queries_1.CustomEntityQueries.listQuery(contextAri, {}).query);
+            verifyApiClientCalledWith(apiClientMock, {}, gql_queries_1.CustomEntityQueries.listQuery({}).query);
             passMetrics
                 ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'query', encrypted: false }, true)
                 : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();
@@ -869,9 +841,7 @@ describe.each([
                 results: [],
                 nextCursor: 'DUMMY_CURSOR'
             });
-            verifyApiClientCalledWith(apiClientMock, {
-                contextAri
-            }, gql_queries_1.CustomEntityQueries.listQuery(contextAri, {}).query);
+            verifyApiClientCalledWith(apiClientMock, {}, gql_queries_1.CustomEntityQueries.listQuery({}).query);
             passMetrics
                 ? checkMetricsFired(metricMocks, { store: 'typed', operation: 'query', encrypted: false }, true)
                 : expect(metricMocks.mockMetrics.counter).not.toHaveBeenCalled();

package/out/global-storage.d.ts

@@ -12,12 +12,10 @@ interface ListResults {
 export declare type StoreType = 'typed' | 'untyped';
 export declare type OperationType = 'get' | 'set' | 'query' | 'delete';
 export declare class GlobalStorage implements SharedStorageAdapter {
-    private getAppContextAri;
     private apiClient;
     private readonly getMetrics;
     private readonly endpoint;
-    constructor(getAppContextAri: (() => string) | string, apiClient: FetchMethod, getMetrics: () => Metrics | undefined);
-    private doGetAppContextAri;
+    constructor(apiClient: FetchMethod, getMetrics: () => Metrics | undefined);
     get(key: string): Promise<any>;
     getSecret(key: string): Promise<any>;
     list(options: ListOptions): Promise<ListResults>;

package/out/global-storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-storage.d.ts","sourceRoot":"","sources":["../src/global-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,SAAS,CAAC;AAInD,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AAEtE,UAAU,WAAW;IACnB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAcD,oBAAY,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;AAC5C,oBAAY,aAAa,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AA+B/D,qBAAa,aAAc,YAAW,oBAAoB;IAGtD,OAAO,CAAC,gBAAgB;IACxB,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAJ7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;gBAE5C,gBAAgB,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EACzC,SAAS,EAAE,WAAW,EACb,UAAU,EAAE,MAAM,OAAO,GAAG,SAAS;IAGxD,OAAO,CAAC,kBAAkB;IAIpB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAqBhD,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAc1E,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxC,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAI/D,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5E,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAU1D,WAAW;YAUX,iBAAiB;IAU/B,OAAO,CAAC,YAAY;YAUN,KAAK;YAML,QAAQ;YAsBR,YAAY;CAyC3B"}
+{"version":3,"file":"global-storage.d.ts","sourceRoot":"","sources":["../src/global-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,SAAS,CAAC;AAInD,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wCAAwC,CAAC;AAEtE,UAAU,WAAW;IACnB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAcD,oBAAY,SAAS,GAAG,OAAO,GAAG,SAAS,CAAC;AAC5C,oBAAY,aAAa,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,CAAC;AA+B/D,qBAAa,aAAc,YAAW,oBAAoB;IAGtD,OAAO,CAAC,SAAS;IACjB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAH7B,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;gBAE5C,SAAS,EAAE,WAAW,EACb,UAAU,EAAE,MAAM,OAAO,GAAG,SAAS;IAGlD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAqBhD,kBAAkB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAC;IAc1E,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAU3C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOlC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxC,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC;IAI/D,SAAS,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAO5E,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAU1D,WAAW;YAUX,iBAAiB;IAU/B,OAAO,CAAC,YAAY;YAUN,KAAK;YAML,QAAQ;YAsBR,YAAY;CAyC3B"}

package/out/global-storage.js

@@ -25,18 +25,13 @@ async function getResponseBody(response) {
     return responseBody.data;
 }
 class GlobalStorage {
-    getAppContextAri;
     apiClient;
     getMetrics;
     endpoint = '/forge/entities/graphql';
-    constructor(getAppContextAri, apiClient, getMetrics) {
-        this.getAppContextAri = getAppContextAri;
+    constructor(apiClient, getMetrics) {
         this.apiClient = apiClient;
         this.getMetrics = getMetrics;
     }
-    doGetAppContextAri() {
-        return typeof this.getAppContextAri === 'function' ? this.getAppContextAri() : this.getAppContextAri;
-    }
     async get(key) {
         return this.getInternal(key, false);
     }
@@ -45,8 +40,8 @@ class GlobalStorage {
     }
     async list(options) {
         const requestBody = process.env.IS_CLEANUP_FUNCTION === 'true'
-            ? gql_queries_1.UntypedQueries.listQueryForCleanup(this.doGetAppContextAri(), options)
-            : gql_queries_1.UntypedQueries.listQuery(this.doGetAppContextAri(), options);
+            ? gql_queries_1.UntypedQueries.listQueryForCleanup(options)
+            : gql_queries_1.UntypedQueries.listQuery(options);
         const response = await this.wrapInMetric('untyped', 'query', false, async () => await this.query(requestBody));
         const edges = process.env.IS_CLEANUP_FUNCTION === 'true'
             ? response.appStoredEntitiesForCleanup.edges
@@ -59,7 +54,7 @@ class GlobalStorage {
         };
     }
     async listCustomEntities(options) {
-        const requestBody = gql_queries_1.CustomEntityQueries.listQuery(this.doGetAppContextAri(), options);
+        const requestBody = gql_queries_1.CustomEntityQueries.listQuery(options);
         const response = await this.wrapInMetric('typed', 'query', false, async () => await this.query(requestBody));
         const edges = response.appStoredCustomEntities.edges;
         const results = edges.map(({ node }) => node);
@@ -69,39 +64,39 @@ class GlobalStorage {
         };
     }
     async set(key, value) {
-        const requestBody = gql_queries_1.UntypedQueries.set(this.doGetAppContextAri(), key, value, false);
+        const requestBody = gql_queries_1.UntypedQueries.set(key, value, false);
         await this.wrapInMetric('untyped', 'set', false, async () => await this.mutation(requestBody, 'appStorage', 'setAppStoredEntity'));
     }
     async setSecret(key, value) {
-        const requestBody = gql_queries_1.UntypedQueries.set(this.doGetAppContextAri(), key, value, true);
+        const requestBody = gql_queries_1.UntypedQueries.set(key, value, true);
         await this.wrapInMetric('untyped', 'set', true, async () => await this.mutation(requestBody, 'appStorage', 'setAppStoredEntity'));
     }
     async delete(key) {
-        const requestBody = gql_queries_1.UntypedQueries.delete(this.doGetAppContextAri(), key, false);
+        const requestBody = gql_queries_1.UntypedQueries.delete(key, false);
         await this.wrapInMetric('untyped', 'delete', false, async () => this.mutation(requestBody, 'appStorage', 'deleteAppStoredEntity'));
     }
     async deleteSecret(key) {
-        const requestBody = gql_queries_1.UntypedQueries.delete(this.doGetAppContextAri(), key, true);
+        const requestBody = gql_queries_1.UntypedQueries.delete(key, true);
         await this.wrapInMetric('untyped', 'delete', true, async () => this.mutation(requestBody, 'appStorage', 'deleteAppStoredEntity'));
     }
     async getEntity(entityName, entityKey) {
         return this.getEntityInternal(entityName, entityKey);
     }
     async setEntity(entityName, entityKey, value) {
-        const requestBody = gql_queries_1.CustomEntityQueries.set(this.doGetAppContextAri(), entityName, entityKey, value);
+        const requestBody = gql_queries_1.CustomEntityQueries.set(entityName, entityKey, value);
         await this.wrapInMetric('typed', 'set', false, async () => this.mutation(requestBody, 'appStorageCustomEntity', 'setAppStoredCustomEntity'));
     }
     async deleteEntity(entityName, entityKey) {
-        const requestBody = gql_queries_1.CustomEntityQueries.delete(this.doGetAppContextAri(), entityName, entityKey);
+        const requestBody = gql_queries_1.CustomEntityQueries.delete(entityName, entityKey);
         await this.wrapInMetric('typed', 'delete', false, async () => await this.mutation(requestBody, 'appStorageCustomEntity', 'deleteAppStoredCustomEntity'));
     }
     async getInternal(key, encrypted) {
-        const requestBody = gql_queries_1.UntypedQueries.get(this.doGetAppContextAri(), key, encrypted);
+        const requestBody = gql_queries_1.UntypedQueries.get(key, encrypted);
         const { appStoredEntity: { value } } = await this.wrapInMetric('untyped', 'get', encrypted, async () => await this.query(requestBody));
         return value ?? undefined;
     }
     async getEntityInternal(entityName, entityKey) {
-        const requestBody = gql_queries_1.CustomEntityQueries.get(this.doGetAppContextAri(), entityName, entityKey);
+        const requestBody = gql_queries_1.CustomEntityQueries.get(entityName, entityKey);
         const { appStoredCustomEntity: { value } } = await this.wrapInMetric('typed', 'get', false, async () => await this.query(requestBody));
         return value ?? undefined;
     }

package/out/gql-queries.d.ts

@@ -1,47 +1,42 @@
 import { CustomEntityListOptions, ListOptions } from './query-interfaces';
 export declare class UntypedQueries {
-    static get: (contextAri: string, key: string, encrypted: boolean) => {
+    static get: (key: string, encrypted: boolean) => {
         query: string;
         variables: {
-            contextAri: string;
             key: string;
             encrypted: boolean;
         };
     };
-    static set: (contextAri: string, key: string, value: any, encrypted: boolean) => {
+    static set: (key: string, value: any, encrypted: boolean) => {
         query: string;
         variables: {
             input: {
-                contextAri: string;
                 key: string;
                 value: any;
                 encrypted: boolean;
             };
         };
     };
-    static delete: (contextAri: string, key: string, encrypted: boolean) => {
+    static delete: (key: string, encrypted: boolean) => {
         query: string;
         variables: {
             input: {
-                contextAri: string;
                 key: string;
                 encrypted: boolean;
             };
         };
     };
-    static listQuery: (contextAri: string, options: ListOptions) => {
+    static listQuery: (options: ListOptions) => {
         query: string;
         variables: {
-            contextAri: string;
             where: import("./query-interfaces").WhereClause[] | null;
             cursor: string | null;
             limit: number | null;
         };
     };
-    static listQueryForCleanup: (contextAri: string, options: ListOptions) => {
+    static listQueryForCleanup: (options: ListOptions) => {
         query: string;
         variables: {
-            contextAri: string;
             where: import("./query-interfaces").WhereClause[] | null;
             cursor: string | null;
             limit: number | null;
@@ -49,36 +44,33 @@ export declare class UntypedQueries {
     };
 }
 export declare class CustomEntityQueries {
-    static get: (contextAri: string, entityName: string, key: string) => {
+    static get: (entityName: string, key: string) => {
         query: string;
         variables: {
-            contextAri: string;
             entityName: string;
             key: string;
         };
     };
-    static set: (contextAri: string, entityName: string, key: string, value: any) => {
+    static set: (entityName: string, key: string, value: any) => {
         query: string;
         variables: {
             input: {
-                contextAri: string;
                 entityName: string;
                 key: string;
                 value: any;
             };
         };
     };
-    static delete: (contextAri: string, entityName: string, key: string) => {
+    static delete: (entityName: string, key: string) => {
         query: string;
         variables: {
             input: {
-                contextAri: string;
                 entityName: string;
                 key: string;
             };
         };
     };
-    static listQuery: (contextAri: string, options: CustomEntityListOptions) => {
+    static listQuery: (options: CustomEntityListOptions) => {
         query: string;
         variables: {
             limit?: number | undefined;
@@ -88,7 +80,6 @@ export declare class CustomEntityQueries {
             filters?: {
                 [x: string]: import("./query-interfaces").FilterClause[];
             } | undefined;
-            contextAri: string;
             entityName: string | undefined;
             indexName: string | undefined;
             range: import("./query-interfaces").RangeClause | undefined;

package/out/gql-queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gql-queries.d.ts","sourceRoot":"","sources":["../src/gql-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1E,qBAAa,cAAc;IACzB,OAAc,GAAG,eAAgB,MAAM,OAAO,MAAM,aAAa,OAAO;;;;;;;MAcrE;IAEH,OAAc,GAAG,eAAgB,MAAM,OAAO,MAAM,SAAS,GAAG,aAAa,OAAO;;;;;;;;;;MA0BjF;IAEH,OAAc,MAAM,eAAgB,MAAM,OAAO,MAAM,aAAa,OAAO;;;;;;;;;MAyBxE;IAEH,OAAc,SAAS,eAAgB,MAAM,WAAW,WAAW;;;;;;;;MAuBhE;IAEH,OAAc,mBAAmB,eAAgB,MAAM,WAAW,WAAW;;;;;;;;MAuB1E;CACJ;AAED,qBAAa,mBAAmB;IAC9B,OAAc,GAAG,eAAgB,MAAM,cAAc,MAAM,OAAO,MAAM;;;;;;;MAerE;IAEH,OAAc,GAAG,eAAgB,MAAM,cAAc,MAAM,OAAO,MAAM,SAAS,GAAG;;;;;;;;;;MA0BjF;IAEH,OAAc,MAAM,eAAgB,MAAM,cAAc,MAAM,OAAO,MAAM;;;;;;;;;MAyBxE;IAEH,OAAc,SAAS,eAAgB,MAAM,WAAW,uBAAuB;;;;;;;;;;;;;;;MAuC7E;CACH"}
+{"version":3,"file":"gql-queries.d.ts","sourceRoot":"","sources":["../src/gql-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAE1E,qBAAa,cAAc;IACzB,OAAc,GAAG,QAAS,MAAM,aAAa,OAAO;;;;;;MAajD;IAEH,OAAc,GAAG,QAAS,MAAM,SAAS,GAAG,aAAa,OAAO;;;;;;;;;MAyB7D;IAEH,OAAc,MAAM,QAAS,MAAM,aAAa,OAAO;;;;;;;;MAwBpD;IAEH,OAAc,SAAS,YAAa,WAAW;;;;;;;MAqB5C;IAEH,OAAc,mBAAmB,YAAa,WAAW;;;;;;;MAqBtD;CACJ;AAED,qBAAa,mBAAmB;IAC9B,OAAc,GAAG,eAAgB,MAAM,OAAO,MAAM;;;;;;MAcjD;IAEH,OAAc,GAAG,eAAgB,MAAM,OAAO,MAAM,SAAS,GAAG;;;;;;;;;MAyB7D;IAEH,OAAc,MAAM,eAAgB,MAAM,OAAO,MAAM;;;;;;;;MAwBpD;IAEH,OAAc,SAAS,YAAa,uBAAuB;;;;;;;;;;;;;;MAsCzD;CACH"}

package/out/gql-queries.js

@@ -2,22 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CustomEntityQueries = exports.UntypedQueries = void 0;
 class UntypedQueries {
-    static get = (contextAri, key, encrypted) => ({
+    static get = (key, encrypted) => ({
         query: `
-      query forge_app_getApplicationStorageEntity($contextAri: ID!, $key: ID!, $encrypted: Boolean!) {
-        appStoredEntity(contextAri: $contextAri, key: $key, encrypted: $encrypted) {
+      query forge_app_getApplicationStorageEntity($key: ID!, $encrypted: Boolean!) {
+        appStoredEntity(key: $key, encrypted: $encrypted) {
           key
           value
         }
       }
     `,
         variables: {
-            contextAri,
             key,
             encrypted
         }
     });
-    static set = (contextAri, key, value, encrypted) => ({
+    static set = (key, value, encrypted) => ({
         query: `
       mutation forge_app_setApplicationStorageEntity($input: SetAppStoredEntityMutationInput!) {
         appStorage{
@@ -37,14 +36,13 @@ class UntypedQueries {
     `,
         variables: {
             input: {
-                contextAri,
                 key,
                 value,
                 encrypted
             }
         }
     });
-    static delete = (contextAri, key, encrypted) => ({
+    static delete = (key, encrypted) => ({
         query: `
       mutation forge_app_deleteApplicationStorageEntity($input: DeleteAppStoredEntityMutationInput!) {
         appStorage {
@@ -64,16 +62,15 @@ class UntypedQueries {
     `,
         variables: {
             input: {
-                contextAri,
                 key,
                 encrypted
             }
         }
     });
-    static listQuery = (contextAri, options) => ({
+    static listQuery = (options) => ({
         query: `
-      query forge_app_getApplicationStorageEntities($contextAri: ID!, $where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
-        appStoredEntities(contextAri: $contextAri, where: $where, after: $cursor, first: $limit) {
+      query forge_app_getApplicationStorageEntities($where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
+        appStoredEntities(where: $where, after: $cursor, first: $limit) {
           edges {
             node {
               value
@@ -86,16 +83,15 @@ class UntypedQueries {
       }
     `,
         variables: {
-            contextAri,
             where: options.where ?? null,
             cursor: options.cursor ?? null,
             limit: options.limit ?? null
         }
     });
-    static listQueryForCleanup = (contextAri, options) => ({
+    static listQueryForCleanup = (options) => ({
         query: `
-      query forge_app_getApplicationStorageEntitiesForCleanup($contextAri: ID!, $where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
-        appStoredEntitiesForCleanup(contextAri: $contextAri, where: $where, after: $cursor, first: $limit) {
+      query forge_app_getApplicationStorageEntitiesForCleanup($where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
+        appStoredEntitiesForCleanup(where: $where, after: $cursor, first: $limit) {
           edges {
             node {
               value
@@ -108,7 +104,6 @@ class UntypedQueries {
       }
     `,
         variables: {
-            contextAri,
             where: options.where ?? null,
             cursor: options.cursor ?? null,
             limit: options.limit ?? null
@@ -117,10 +112,10 @@ class UntypedQueries {
 }
 exports.UntypedQueries = UntypedQueries;
 class CustomEntityQueries {
-    static get = (contextAri, entityName, key) => ({
+    static get = (entityName, key) => ({
         query: `
-    query forge_app_getApplicationStorageCustomEntity ($contextAri: ID!, $key: ID!, $entityName: String!) {
-      appStoredCustomEntity(contextAri: $contextAri, key: $key, entityName: $entityName) {
+    query forge_app_getApplicationStorageCustomEntity ($key: ID!, $entityName: String!) {
+      appStoredCustomEntity(key: $key, entityName: $entityName) {
           value
           entityName
           key
@@ -128,12 +123,11 @@ class CustomEntityQueries {
   }
     `,
         variables: {
-            contextAri,
             entityName,
             key
         }
     });
-    static set = (contextAri, entityName, key, value) => ({
+    static set = (entityName, key, value) => ({
         query: `
       mutation forge_app_setApplicationStorageCustomEntity($input: SetAppStoredCustomEntityMutationInput!) {
         appStorageCustomEntity{
@@ -153,14 +147,13 @@ class CustomEntityQueries {
     `,
         variables: {
             input: {
-                contextAri,
                 entityName,
                 key,
                 value
             }
         }
     });
-    static delete = (contextAri, entityName, key) => ({
+    static delete = (entityName, key) => ({
         query: `
       mutation forge_app_deleteApplicationStorageCustomEntity($input: DeleteAppStoredCustomEntityMutationInput!) {
         appStorageCustomEntity {
@@ -180,17 +173,16 @@ class CustomEntityQueries {
     `,
         variables: {
             input: {
-                contextAri,
                 entityName,
                 key
             }
         }
     });
-    static listQuery = (contextAri, options) => {
+    static listQuery = (options) => {
         return {
             query: `
-      query AppStorageCustomEntityQueries ($contextAri: ID!, $entityName: String!, $indexName: String!, $range: AppStoredCustomEntityRange, $filters: AppStoredCustomEntityFilters, $sort:SortOrder, $limit: Int, $cursor: String, $partition: [AppStoredCustomEntityFieldValue!]) {
-        appStoredCustomEntities(contextAri: $contextAri, entityName: $entityName, indexName: $indexName, range: $range, filters: $filters, sort:$sort, limit: $limit, cursor: $cursor, partition: $partition) {
+      query AppStorageCustomEntityQueries ($entityName: String!, $indexName: String!, $range: AppStoredCustomEntityRange, $filters: AppStoredCustomEntityFilters, $sort:SortOrder, $limit: Int, $cursor: String, $partition: [AppStoredCustomEntityFieldValue!]) {
+        appStoredCustomEntities(entityName: $entityName, indexName: $indexName, range: $range, filters: $filters, sort:$sort, limit: $limit, cursor: $cursor, partition: $partition) {
             edges {
                 node {
                     key
@@ -208,7 +200,6 @@ class CustomEntityQueries {
   } 
       `,
             variables: {
-                contextAri,
                 entityName: options.entityName,
                 indexName: options.indexName,
                 range: options.range,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/storage",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "Forge Storage methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -18,7 +18,7 @@
     "@types/node": "14.18.63",
     "@types/node-fetch": "^2.6.11",
     "node-fetch": "2.7.0",
-    "@forge/util": "1.4.4",
+    "@forge/util": "1.4.6",
     "@atlassian/metrics-interface": "4.0.0"
   }
 }