fix: properly deserialize trustedOrgs from context (#1256)

Esri · Oct 4, 2023 · 760b4ff · 760b4ff
1 parent bc8106a
commit 760b4ff
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/common/src/ArcGISContextManager.ts b/packages/common/src/ArcGISContextManager.ts
@@ -245,6 +245,12 @@ export class ArcGISContextManager {
         if (state.properties) {
           opts.properties = state.properties;
         }
+        if (state.trustedOrgIds) {
+          opts.trustedOrgIds = state.trustedOrgIds;
+        }
+        if (state.trustedOrgs) {
+          opts.trustedOrgs = state.trustedOrgs;
+        }
       }
     } else {
       // if the session is expired, we can still carry forward the portalUrl

diff --git a/packages/common/test/ArcGISContextManager.test.ts b/packages/common/test/ArcGISContextManager.test.ts
@@ -219,6 +219,8 @@ const serializedContext = {
   properties: {
     foo: "bar",
   },
+  trustedOrgIds: ["FAKEID", "FOTHERID"],
+  trustedOrgs: onlinePartneredOrgResponse.trustedOrgs,
 };
 
 const validSerializedContext = cloneObject(serializedContext);
@@ -597,6 +599,13 @@ describe("ArcGISContext:", () => {
         validSerializedContext.currentUser
       );
       expect(mgr.context.session.token).toEqual(validSession.token);
+      // trusted orgs/ids
+      expect(mgr.context.trustedOrgIds).toEqual(
+        validSerializedContext.trustedOrgIds
+      );
+      expect(mgr.context.trustedOrgs).toEqual(
+        validSerializedContext.trustedOrgs
+      );
     });
     it("can deserialize sparse, valid context", async () => {
       const selfSpy = spyOn(portalModule, "getSelf").and.callFake(() => {
@@ -612,6 +621,8 @@ describe("ArcGISContext:", () => {
       delete sparseValidContext.currentUser;
       delete sparseValidContext.portal;
       delete sparseValidContext.properties;
+      delete sparseValidContext.trustedOrgIds;
+      delete sparseValidContext.trustedOrgs;
 
       const serialized = unicodeToBase64(JSON.stringify(sparseValidContext));
       const mgr = await ArcGISContextManager.deserialize(serialized!);