@globus/sdk 4.4.0 → 5.0.0

package/dist/cjs/core/authorization/index.js

@@ -322,7 +322,7 @@ function toString(info) {
 }
 
 // src/core/info/version.ts
-var VERSION = "4.4.0";
+var VERSION = "5.0.0";
 
 // src/core/info/index.ts
 var VERSION2 = VERSION;
@@ -586,64 +586,6 @@ function isGlobusAuthTokenResponse(check) {
   return isToken(check) && check !== null && "resource_server" in check;
 }
 
-// src/core/storage/memory.ts
-var MemoryStorage = class {
-  #storage = {};
-  get(key) {
-    return this.#storage[key] !== void 0 ? this.#storage[key] : null;
-  }
-  set(key, value) {
-    this.#storage[key] = typeof value !== "string" ? JSON.stringify(value) : value;
-  }
-  remove(key) {
-    delete this.#storage[key];
-  }
-  keys() {
-    return Object.keys(this.#storage);
-  }
-  clear() {
-    this.#storage = {};
-  }
-};
-
-// src/core/storage/local-storage.ts
-var LocalStorage = class {
-  #storage = globalThis.localStorage;
-  get(key) {
-    return this.#storage.getItem(key);
-  }
-  set(key, value) {
-    this.#storage.setItem(key, typeof value !== "string" ? JSON.stringify(value) : value);
-  }
-  keys() {
-    return Object.keys(this.#storage);
-  }
-  remove(key) {
-    this.#storage.removeItem(key);
-  }
-  clear() {
-    this.#storage.clear();
-  }
-};
-
-// src/core/storage/index.ts
-var storage;
-function createStorage(storageType = "memory") {
-  if (!storage) {
-    let Factory;
-    if (storageType === "localStorage") {
-      Factory = LocalStorage;
-    } else if (storageType === "memory") {
-      Factory = MemoryStorage;
-    } else {
-      Factory = storageType;
-    }
-    storage = new Factory();
-  }
-  return storage;
-}
-var getStorage = createStorage;
-
 // src/core/authorization/Event.ts
 var Event = class {
   constructor(name) {
@@ -779,30 +721,33 @@ var RedirectTransport = class _RedirectTransport {
   }
 };
 
-// src/core/authorization/TokenLookup.ts
-function getTokenFromStorage(key) {
-  const raw = getStorage().get(key) || "null";
-  let token2 = null;
-  try {
-    const parsed = JSON.parse(raw);
-    if (isToken(parsed)) {
-      token2 = parsed;
-    }
-  } catch (e) {
-  }
-  return token2;
-}
-var TokenLookup = class {
+// src/core/authorization/TokenManager.ts
+var TokenManager = class {
   #manager;
   constructor(options) {
     this.#manager = options.manager;
   }
-  #getClientStorageEntry(identifier) {
-    return getTokenFromStorage(`${this.#manager.storageKeyPrefix}${identifier}`);
+  /**
+   * Retrieve and parse an item from the storage.
+   */
+  #getTokenFromStorage(key) {
+    const raw = this.#manager.storage.getItem(key) || "null";
+    let token2 = null;
+    try {
+      const parsed = JSON.parse(raw);
+      if (isToken(parsed)) {
+        token2 = parsed;
+      }
+    } catch (e) {
+    }
+    return token2;
   }
   #getTokenForService(service) {
     const resourceServer = CONFIG.RESOURCE_SERVERS?.[service];
-    return this.#getClientStorageEntry(resourceServer);
+    return this.getByResourceServer(resourceServer);
+  }
+  getByResourceServer(resourceServer) {
+    return this.#getTokenFromStorage(`${this.#manager.storageKeyPrefix}${resourceServer}`);
   }
   get auth() {
     return this.#getTokenForService(SERVICES.AUTH);
@@ -828,16 +773,16 @@ var TokenLookup = class {
   gcs(endpoint) {
     return this.getByResourceServer(endpoint);
   }
-  getByResourceServer(resourceServer) {
-    return this.#getClientStorageEntry(resourceServer);
-  }
   getAll() {
-    const entries = getStorage().keys().reduce((acc, key) => {
-      if (key.startsWith(this.#manager.storageKeyPrefix)) {
-        acc.push(getTokenFromStorage(key));
-      }
-      return acc;
-    }, []);
+    const entries = Object.keys(this.#manager.storage).reduce(
+      (acc, key) => {
+        if (key.startsWith(this.#manager.storageKeyPrefix)) {
+          acc.push(this.#getTokenFromStorage(key));
+        }
+        return acc;
+      },
+      []
+    );
     return entries.filter(isToken);
   }
   /**
@@ -846,16 +791,19 @@ var TokenLookup = class {
   add(token2) {
     const created = Date.now();
     const expires = created + token2.expires_in * 1e3;
-    getStorage().set(`${this.#manager.storageKeyPrefix}${token2.resource_server}`, {
-      ...token2,
-      /**
-       * Add metadata to the token to track when it was created and when it expires.
-       */
-      __metadata: {
-        created,
-        expires
-      }
-    });
+    this.#manager.storage.setItem(
+      `${this.#manager.storageKeyPrefix}${token2.resource_server}`,
+      JSON.stringify({
+        ...token2,
+        /**
+         * Add metadata to the token to track when it was created and when it expires.
+         */
+        __metadata: {
+          created,
+          expires
+        }
+      })
+    );
     if ("other_tokens" in token2) {
       token2.other_tokens?.forEach((t) => {
         this.add(t);
@@ -877,10 +825,38 @@ var TokenLookup = class {
   }
 };
 
+// src/core/storage/memory.ts
+var MemoryStorage = class {
+  #storage = {};
+  getItem(key) {
+    return this.#storage[key] !== void 0 ? this.#storage[key] : null;
+  }
+  setItem(key, value) {
+    this.#storage[key] = value;
+  }
+  removeItem(key) {
+    delete this.#storage[key];
+  }
+  key(index) {
+    return Object.keys(this.#storage)[index];
+  }
+  clear() {
+    this.#storage = {};
+  }
+  get length() {
+    return Object.keys(this.#storage).length;
+  }
+};
+
 // src/core/authorization/AuthorizationManager.ts
+var TRANSPORTS = {
+  redirect: RedirectTransport
+  // popup: PopupTransport,
+};
 var DEFAULT_CONFIGURATION = {
   useRefreshTokens: false,
-  defaultScopes: "openid profile email"
+  defaultScopes: "openid profile email",
+  transport: "redirect"
 };
 var DEFAULT_HANDLE_ERROR_OPTIONS = {
   execute: true,
@@ -889,6 +865,11 @@ var DEFAULT_HANDLE_ERROR_OPTIONS = {
 var AuthorizationManager = class {
   #transport;
   configuration;
+  /**
+   * The storage system used by the `AuthorizationManager`.
+   * @implements Storage
+   */
+  storage;
   #authenticated = false;
   /**
    * The `AuthorizationManager` is considered `authenticated` if it has a valid Globus Auth token.
@@ -924,7 +905,6 @@ var AuthorizationManager = class {
     revoke: new Event("revoke")
   };
   constructor(configuration) {
-    createStorage(configuration.storage || "localStorage");
     if (!configuration.client) {
       throw new Error("You must provide a `client` for your application.");
     }
@@ -934,6 +914,7 @@ var AuthorizationManager = class {
       ...configuration,
       scopes: [configuration.scopes ? configuration.scopes : "", scopes].filter((s) => s.length).join(" ")
     };
+    this.storage = configuration.storage || new MemoryStorage();
     if (this.configuration.events) {
       Object.entries(this.configuration.events).forEach(([name, callback]) => {
         if (name in this.events) {
@@ -941,7 +922,7 @@ var AuthorizationManager = class {
         }
       });
     }
-    this.tokens = new TokenLookup({
+    this.tokens = new TokenManager({
       manager: this
     });
     this.#checkAuthorizationState();
@@ -1013,7 +994,7 @@ var AuthorizationManager = class {
    * Retrieve the Globus Auth token managed by the instance.
    */
   getGlobusAuthToken() {
-    const entry = getStorage().get(`${this.storageKeyPrefix}${RESOURCE_SERVERS.AUTH}`);
+    const entry = this.storage.getItem(`${this.storageKeyPrefix}${RESOURCE_SERVERS.AUTH}`);
     return entry ? JSON.parse(entry) : null;
   }
   #checkAuthorizationState() {
@@ -1035,9 +1016,9 @@ var AuthorizationManager = class {
    * This method **does not** emit the `revoke` event. If you need to emit the `revoke` event, use the `AuthorizationManager.revoke` method.
    */
   reset() {
-    getStorage().keys().forEach((key) => {
+    Object.keys(this.storage).forEach((key) => {
       if (key.startsWith(this.storageKeyPrefix)) {
-        getStorage().remove(key);
+        this.storage.removeItem(key);
       }
     });
     this.authenticated = false;
@@ -1049,16 +1030,26 @@ var AuthorizationManager = class {
   #withOfflineAccess(scopes) {
     return `${scopes}${this.configuration.useRefreshTokens ? " offline_access" : ""}`;
   }
-  #buildTransport(overrides) {
-    const scopes = this.#withOfflineAccess(overrides?.scopes ?? (this.configuration.scopes || ""));
-    return new RedirectTransport({
+  #buildTransport(options) {
+    const { scopes, ...overrides } = options ?? {};
+    const TransportFactory = TRANSPORTS[this.configuration.transport || "redirect"];
+    let scopesToRequest = this.#withOfflineAccess(scopes ?? (this.configuration.scopes || ""));
+    if (this.storage instanceof MemoryStorage) {
+      scopesToRequest = [
+        // Use a Set to deduplicate the scopes.
+        ...new Set(
+          scopesToRequest.split(" ").concat((this.configuration?.scopes || "").split(" "))
+        )
+      ].join(" ");
+    }
+    return new TransportFactory({
       client: this.configuration.client,
       redirect: this.configuration.redirect,
-      scopes,
+      scopes: scopesToRequest,
       ...overrides,
-      // @todo Decide if we want to include the `include_consented_scopes` parameter by default.
       params: {
-        // include_consented_scopes: true,
+        // @todo @todo Decide if we want to include the `include_consented_scopes` parameter by default.
+        // include_consented_scopes: 'true',
         ...overrides?.params
       }
     });