@itwin/map-layers-auth 3.4.0-dev.8 → 3.5.0-dev.4

package/lib/esm/ArcGis/ArcGisTokenManager.d.ts

@@ -1,21 +1,21 @@
-/** @packageDocumentation
- * @module Tiles
- */
-import { MapLayerAccessToken } from "@itwin/core-frontend";
-import { ArcGisGenerateTokenOptions, ArcGisOAuth2Token, ArcGisToken } from "./ArcGisTokenGenerator";
-/** @internal */
-export declare class ArcGisTokenManager {
-    private static readonly tokenExpiryThreshold;
-    private static _cache;
-    private static _oauth2Cache;
-    private static _generator;
-    private static readonly _browserStorageKey;
-    static getToken(arcGisRestServiceUrl: string, userName: string, password: string, options: ArcGisGenerateTokenOptions): Promise<ArcGisToken | undefined>;
-    static invalidateToken(token: MapLayerAccessToken): boolean;
-    static getOAuth2Token(key: string): ArcGisOAuth2Token | undefined;
-    static invalidateOAuth2Token(token: MapLayerAccessToken): boolean;
-    static setOAuth2Token(key: string, token: ArcGisOAuth2Token): void;
-    static loadFromBrowserStorage(): void;
-    static saveToBrowserStorage(): void;
-}
+/** @packageDocumentation
+ * @module Tiles
+ */
+import { MapLayerAccessToken } from "@itwin/core-frontend";
+import { ArcGisGenerateTokenOptions, ArcGisOAuth2Token, ArcGisToken } from "./ArcGisTokenGenerator";
+/** @internal */
+export declare class ArcGisTokenManager {
+    private static readonly tokenExpiryThreshold;
+    private static _cache;
+    private static _oauth2Cache;
+    private static _generator;
+    private static readonly _browserStorageKey;
+    static getToken(arcGisRestServiceUrl: string, userName: string, password: string, options: ArcGisGenerateTokenOptions): Promise<ArcGisToken | undefined>;
+    static invalidateToken(token: MapLayerAccessToken): boolean;
+    static getOAuth2Token(key: string): ArcGisOAuth2Token | undefined;
+    static invalidateOAuth2Token(token: MapLayerAccessToken): boolean;
+    static setOAuth2Token(key: string, token: ArcGisOAuth2Token): void;
+    static loadFromBrowserStorage(): void;
+    static saveToBrowserStorage(): void;
+}
 //# sourceMappingURL=ArcGisTokenManager.d.ts.map

package/lib/esm/ArcGis/ArcGisTokenManager.js

@@ -1,106 +1,106 @@
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @packageDocumentation
- * @module Tiles
- */
-import { ArcGisTokenGenerator } from "./ArcGisTokenGenerator";
-/** @internal */
-export class ArcGisTokenManager {
-    static async getToken(arcGisRestServiceUrl, userName, password, options) {
-        if (!ArcGisTokenManager._generator)
-            ArcGisTokenManager._generator = new ArcGisTokenGenerator();
-        const tokenCacheKey = `${encodeURIComponent(userName)}@${arcGisRestServiceUrl}`;
-        // First check in the session cache
-        const cachedToken = ArcGisTokenManager._cache.get(tokenCacheKey);
-        // Check if token is in cached and is valid within the threshold, if not, generate a new token immediately.
-        if (cachedToken !== undefined && (cachedToken.expires - (+new Date()) > ArcGisTokenManager.tokenExpiryThreshold)) {
-            return cachedToken;
-        }
-        // Nothing in cache, generate a new token
-        const newToken = await ArcGisTokenManager._generator.generate(arcGisRestServiceUrl, userName, password, options);
-        if (newToken.token) {
-            const token = newToken;
-            ArcGisTokenManager._cache.set(tokenCacheKey, token);
-            return token;
-        }
-        return undefined;
-    }
-    static invalidateToken(token) {
-        for (const [key, value] of ArcGisTokenManager._cache) {
-            if (value.token === token.token)
-                return ArcGisTokenManager._cache.delete(key);
-        }
-        return false;
-    }
-    static getOAuth2Token(key) {
-        if (ArcGisTokenManager._oauth2Cache === undefined) {
-            ArcGisTokenManager._oauth2Cache = new Map();
-            ArcGisTokenManager.loadFromBrowserStorage();
-        }
-        const cachedToken = ArcGisTokenManager._oauth2Cache.get(key);
-        // If cached token has expired (or about to expire), invalidate don't return it.
-        if (cachedToken !== undefined && (cachedToken.expiresAt - (+new Date()) < ArcGisTokenManager.tokenExpiryThreshold)) {
-            ArcGisTokenManager._oauth2Cache.delete(key);
-            return undefined;
-        }
-        return cachedToken;
-    }
-    static invalidateOAuth2Token(token) {
-        if (ArcGisTokenManager._oauth2Cache) {
-            for (const [key, value] of ArcGisTokenManager._oauth2Cache) {
-                if (value.token === token.token)
-                    return ArcGisTokenManager._cache.delete(key);
-            }
-        }
-        return false;
-    }
-    static setOAuth2Token(key, token) {
-        if (ArcGisTokenManager._oauth2Cache === undefined) {
-            ArcGisTokenManager._oauth2Cache = new Map();
-        }
-        ArcGisTokenManager._oauth2Cache.set(key, token);
-        ArcGisTokenManager.saveToBrowserStorage();
-    }
-    static loadFromBrowserStorage() {
-        var _a, _b;
-        if (ArcGisTokenManager._oauth2Cache === undefined) {
-            return;
-        }
-        const loadEntries = (json) => {
-            if (json && ArcGisTokenManager._oauth2Cache !== undefined) {
-                const tokens = JSON.parse(json);
-                if (tokens) {
-                    for (const [key, value] of Object.entries(tokens)) {
-                        ArcGisTokenManager._oauth2Cache.set(key, value);
-                    }
-                }
-            }
-        };
-        loadEntries((_a = window.sessionStorage.getItem(this._browserStorageKey)) !== null && _a !== void 0 ? _a : undefined);
-        loadEntries((_b = window.localStorage.getItem(this._browserStorageKey)) !== null && _b !== void 0 ? _b : undefined);
-    }
-    static saveToBrowserStorage() {
-        if (ArcGisTokenManager._oauth2Cache === undefined) {
-            return;
-        }
-        const sessionTokens = {};
-        const storageTokens = {};
-        ArcGisTokenManager._oauth2Cache.forEach((value, key) => {
-            // ignore the persist flag for now, and only save to session storage
-            // if (value.persist === true) {
-            //   storageTokens[key] = value;
-            // } else {
-            //   sessionTokens[key] = value;
-            // }
-            sessionTokens[key] = value;
-        });
-        window.sessionStorage.setItem(this._browserStorageKey, JSON.stringify(sessionTokens));
-        window.localStorage.setItem(this._browserStorageKey, JSON.stringify(storageTokens));
-    }
-}
-ArcGisTokenManager.tokenExpiryThreshold = 300000; // 5 minutes in milliseconds
-ArcGisTokenManager._cache = new Map();
-ArcGisTokenManager._browserStorageKey = "arcGisOAuth";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @packageDocumentation
+ * @module Tiles
+ */
+import { ArcGisTokenGenerator } from "./ArcGisTokenGenerator";
+/** @internal */
+export class ArcGisTokenManager {
+    static async getToken(arcGisRestServiceUrl, userName, password, options) {
+        if (!ArcGisTokenManager._generator)
+            ArcGisTokenManager._generator = new ArcGisTokenGenerator();
+        const tokenCacheKey = `${encodeURIComponent(userName)}@${arcGisRestServiceUrl}`;
+        // First check in the session cache
+        const cachedToken = ArcGisTokenManager._cache.get(tokenCacheKey);
+        // Check if token is in cached and is valid within the threshold, if not, generate a new token immediately.
+        if (cachedToken !== undefined && (cachedToken.expires - (+new Date()) > ArcGisTokenManager.tokenExpiryThreshold)) {
+            return cachedToken;
+        }
+        // Nothing in cache, generate a new token
+        const newToken = await ArcGisTokenManager._generator.generate(arcGisRestServiceUrl, userName, password, options);
+        if (newToken.token) {
+            const token = newToken;
+            ArcGisTokenManager._cache.set(tokenCacheKey, token);
+            return token;
+        }
+        return undefined;
+    }
+    static invalidateToken(token) {
+        for (const [key, value] of ArcGisTokenManager._cache) {
+            if (value.token === token.token)
+                return ArcGisTokenManager._cache.delete(key);
+        }
+        return false;
+    }
+    static getOAuth2Token(key) {
+        if (ArcGisTokenManager._oauth2Cache === undefined) {
+            ArcGisTokenManager._oauth2Cache = new Map();
+            ArcGisTokenManager.loadFromBrowserStorage();
+        }
+        const cachedToken = ArcGisTokenManager._oauth2Cache.get(key);
+        // If cached token has expired (or about to expire), invalidate don't return it.
+        if (cachedToken !== undefined && (cachedToken.expiresAt - (+new Date()) < ArcGisTokenManager.tokenExpiryThreshold)) {
+            ArcGisTokenManager._oauth2Cache.delete(key);
+            return undefined;
+        }
+        return cachedToken;
+    }
+    static invalidateOAuth2Token(token) {
+        if (ArcGisTokenManager._oauth2Cache) {
+            for (const [key, value] of ArcGisTokenManager._oauth2Cache) {
+                if (value.token === token.token)
+                    return ArcGisTokenManager._cache.delete(key);
+            }
+        }
+        return false;
+    }
+    static setOAuth2Token(key, token) {
+        if (ArcGisTokenManager._oauth2Cache === undefined) {
+            ArcGisTokenManager._oauth2Cache = new Map();
+        }
+        ArcGisTokenManager._oauth2Cache.set(key, token);
+        ArcGisTokenManager.saveToBrowserStorage();
+    }
+    static loadFromBrowserStorage() {
+        var _a, _b;
+        if (ArcGisTokenManager._oauth2Cache === undefined) {
+            return;
+        }
+        const loadEntries = (json) => {
+            if (json && ArcGisTokenManager._oauth2Cache !== undefined) {
+                const tokens = JSON.parse(json);
+                if (tokens) {
+                    for (const [key, value] of Object.entries(tokens)) {
+                        ArcGisTokenManager._oauth2Cache.set(key, value);
+                    }
+                }
+            }
+        };
+        loadEntries((_a = window.sessionStorage.getItem(this._browserStorageKey)) !== null && _a !== void 0 ? _a : undefined);
+        loadEntries((_b = window.localStorage.getItem(this._browserStorageKey)) !== null && _b !== void 0 ? _b : undefined);
+    }
+    static saveToBrowserStorage() {
+        if (ArcGisTokenManager._oauth2Cache === undefined) {
+            return;
+        }
+        const sessionTokens = {};
+        const storageTokens = {};
+        ArcGisTokenManager._oauth2Cache.forEach((value, key) => {
+            // ignore the persist flag for now, and only save to session storage
+            // if (value.persist === true) {
+            //   storageTokens[key] = value;
+            // } else {
+            //   sessionTokens[key] = value;
+            // }
+            sessionTokens[key] = value;
+        });
+        window.sessionStorage.setItem(this._browserStorageKey, JSON.stringify(sessionTokens));
+        window.localStorage.setItem(this._browserStorageKey, JSON.stringify(storageTokens));
+    }
+}
+ArcGisTokenManager.tokenExpiryThreshold = 300000; // 5 minutes in milliseconds
+ArcGisTokenManager._cache = new Map();
+ArcGisTokenManager._browserStorageKey = "arcGisOAuth";
 //# sourceMappingURL=ArcGisTokenManager.js.map

package/lib/esm/ArcGis/ArcGisTokenManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisTokenManager.js","sourceRoot":"","sources":["../../../src/ArcGis/ArcGisTokenManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @packageDocumentation\r\n * @module Tiles\r\n */\r\n\r\nimport { MapLayerAccessToken } from \"@itwin/core-frontend\";\r\nimport { ArcGisGenerateTokenOptions, ArcGisOAuth2Token, ArcGisToken, ArcGisTokenGenerator } from \"./ArcGisTokenGenerator\";\r\n\r\n/** @internal */\r\ninterface ArcGisTokenProps {\r\n  [hostname: string]: ArcGisOAuth2Token;\r\n}\r\n\r\n/** @internal */\r\nexport class ArcGisTokenManager {\r\n  private static readonly tokenExpiryThreshold = 300000;  // 5 minutes in milliseconds\r\n  private static _cache = new Map<string, ArcGisToken>();\r\n  private static _oauth2Cache: Map<string, ArcGisOAuth2Token> | undefined;\r\n  private static _generator: ArcGisTokenGenerator | undefined;\r\n  private static readonly _browserStorageKey = \"arcGisOAuth\";\r\n\r\n  public static async getToken(arcGisRestServiceUrl: string, userName: string, password: string, options: ArcGisGenerateTokenOptions): Promise<ArcGisToken | undefined> {\r\n    if (!ArcGisTokenManager._generator)\r\n      ArcGisTokenManager._generator = new ArcGisTokenGenerator();\r\n\r\n    const tokenCacheKey = `${encodeURIComponent(userName)}@${arcGisRestServiceUrl}`;\r\n\r\n    // First check in the session cache\r\n    const cachedToken = ArcGisTokenManager._cache.get(tokenCacheKey);\r\n\r\n    // Check if token is in cached and is valid within the threshold, if not, generate a new token immediately.\r\n    if (cachedToken !== undefined && (cachedToken.expires - (+new Date()) > ArcGisTokenManager.tokenExpiryThreshold)) {\r\n      return cachedToken;\r\n    }\r\n\r\n    // Nothing in cache, generate a new token\r\n    const newToken = await ArcGisTokenManager._generator.generate(arcGisRestServiceUrl, userName, password, options);\r\n    if (newToken.token) {\r\n      const token = newToken as ArcGisToken;\r\n      ArcGisTokenManager._cache.set(tokenCacheKey, token);\r\n      return token;\r\n    }\r\n\r\n    return undefined;\r\n  }\r\n\r\n  public static invalidateToken(token: MapLayerAccessToken): boolean {\r\n\r\n    for (const [key, value] of ArcGisTokenManager._cache) {\r\n      if (value.token === token.token)\r\n        return ArcGisTokenManager._cache.delete(key);\r\n    }\r\n\r\n    return false;\r\n  }\r\n\r\n  public static getOAuth2Token(key: string): ArcGisOAuth2Token | undefined {\r\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\r\n      ArcGisTokenManager._oauth2Cache = new Map<string, ArcGisOAuth2Token>();\r\n      ArcGisTokenManager.loadFromBrowserStorage();\r\n    }\r\n\r\n    const cachedToken = ArcGisTokenManager._oauth2Cache.get(key);\r\n\r\n    // If cached token has expired (or about to expire), invalidate don't return it.\r\n    if (cachedToken !== undefined && (cachedToken.expiresAt - (+new Date()) < ArcGisTokenManager.tokenExpiryThreshold)) {\r\n      ArcGisTokenManager._oauth2Cache.delete(key);\r\n      return undefined;\r\n    }\r\n\r\n    return cachedToken;\r\n  }\r\n\r\n  public static invalidateOAuth2Token(token: MapLayerAccessToken) {\r\n\r\n    if (ArcGisTokenManager._oauth2Cache) {\r\n      for (const [key, value] of ArcGisTokenManager._oauth2Cache) {\r\n        if (value.token === token.token)\r\n          return ArcGisTokenManager._cache.delete(key);\r\n      }\r\n    }\r\n\r\n    return false;\r\n  }\r\n\r\n  public static setOAuth2Token(key: string, token: ArcGisOAuth2Token) {\r\n\r\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\r\n      ArcGisTokenManager._oauth2Cache = new Map<string, ArcGisOAuth2Token>();\r\n\r\n    }\r\n    ArcGisTokenManager._oauth2Cache.set(key, token);\r\n\r\n    ArcGisTokenManager.saveToBrowserStorage();\r\n  }\r\n\r\n  public static loadFromBrowserStorage() {\r\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\r\n      return;\r\n    }\r\n\r\n    const loadEntries = (json: string | undefined) => {\r\n      if (json && ArcGisTokenManager._oauth2Cache !== undefined) {\r\n        const tokens: ArcGisTokenProps | undefined = JSON.parse(json);\r\n        if (tokens) {\r\n          for (const [key, value] of Object.entries(tokens)) {\r\n            ArcGisTokenManager._oauth2Cache.set(key, value);\r\n          }\r\n        }\r\n      }\r\n    };\r\n\r\n    loadEntries(window.sessionStorage.getItem(this._browserStorageKey) ?? undefined);\r\n    loadEntries(window.localStorage.getItem(this._browserStorageKey) ?? undefined);\r\n  }\r\n\r\n  public static saveToBrowserStorage() {\r\n\r\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\r\n      return;\r\n    }\r\n    const sessionTokens: ArcGisTokenProps = {};\r\n    const storageTokens: ArcGisTokenProps = {};\r\n\r\n    ArcGisTokenManager._oauth2Cache.forEach((value: ArcGisOAuth2Token, key: string) => {\r\n      // ignore the persist flag for now, and only save to session storage\r\n      // if (value.persist === true) {\r\n      //   storageTokens[key] = value;\r\n      // } else {\r\n      //   sessionTokens[key] = value;\r\n      // }\r\n      sessionTokens[key] = value;\r\n    });\r\n    window.sessionStorage.setItem(this._browserStorageKey, JSON.stringify(sessionTokens));\r\n    window.localStorage.setItem(this._browserStorageKey, JSON.stringify(storageTokens));\r\n  }\r\n\r\n}\r\n"]}
+{"version":3,"file":"ArcGisTokenManager.js","sourceRoot":"","sources":["../../../src/ArcGis/ArcGisTokenManager.ts"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @packageDocumentation\n * @module Tiles\n */\n\nimport { MapLayerAccessToken } from \"@itwin/core-frontend\";\nimport { ArcGisGenerateTokenOptions, ArcGisOAuth2Token, ArcGisToken, ArcGisTokenGenerator } from \"./ArcGisTokenGenerator\";\n\n/** @internal */\ninterface ArcGisTokenProps {\n  [hostname: string]: ArcGisOAuth2Token;\n}\n\n/** @internal */\nexport class ArcGisTokenManager {\n  private static readonly tokenExpiryThreshold = 300000;  // 5 minutes in milliseconds\n  private static _cache = new Map<string, ArcGisToken>();\n  private static _oauth2Cache: Map<string, ArcGisOAuth2Token> | undefined;\n  private static _generator: ArcGisTokenGenerator | undefined;\n  private static readonly _browserStorageKey = \"arcGisOAuth\";\n\n  public static async getToken(arcGisRestServiceUrl: string, userName: string, password: string, options: ArcGisGenerateTokenOptions): Promise<ArcGisToken | undefined> {\n    if (!ArcGisTokenManager._generator)\n      ArcGisTokenManager._generator = new ArcGisTokenGenerator();\n\n    const tokenCacheKey = `${encodeURIComponent(userName)}@${arcGisRestServiceUrl}`;\n\n    // First check in the session cache\n    const cachedToken = ArcGisTokenManager._cache.get(tokenCacheKey);\n\n    // Check if token is in cached and is valid within the threshold, if not, generate a new token immediately.\n    if (cachedToken !== undefined && (cachedToken.expires - (+new Date()) > ArcGisTokenManager.tokenExpiryThreshold)) {\n      return cachedToken;\n    }\n\n    // Nothing in cache, generate a new token\n    const newToken = await ArcGisTokenManager._generator.generate(arcGisRestServiceUrl, userName, password, options);\n    if (newToken.token) {\n      const token = newToken as ArcGisToken;\n      ArcGisTokenManager._cache.set(tokenCacheKey, token);\n      return token;\n    }\n\n    return undefined;\n  }\n\n  public static invalidateToken(token: MapLayerAccessToken): boolean {\n\n    for (const [key, value] of ArcGisTokenManager._cache) {\n      if (value.token === token.token)\n        return ArcGisTokenManager._cache.delete(key);\n    }\n\n    return false;\n  }\n\n  public static getOAuth2Token(key: string): ArcGisOAuth2Token | undefined {\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\n      ArcGisTokenManager._oauth2Cache = new Map<string, ArcGisOAuth2Token>();\n      ArcGisTokenManager.loadFromBrowserStorage();\n    }\n\n    const cachedToken = ArcGisTokenManager._oauth2Cache.get(key);\n\n    // If cached token has expired (or about to expire), invalidate don't return it.\n    if (cachedToken !== undefined && (cachedToken.expiresAt - (+new Date()) < ArcGisTokenManager.tokenExpiryThreshold)) {\n      ArcGisTokenManager._oauth2Cache.delete(key);\n      return undefined;\n    }\n\n    return cachedToken;\n  }\n\n  public static invalidateOAuth2Token(token: MapLayerAccessToken) {\n\n    if (ArcGisTokenManager._oauth2Cache) {\n      for (const [key, value] of ArcGisTokenManager._oauth2Cache) {\n        if (value.token === token.token)\n          return ArcGisTokenManager._cache.delete(key);\n      }\n    }\n\n    return false;\n  }\n\n  public static setOAuth2Token(key: string, token: ArcGisOAuth2Token) {\n\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\n      ArcGisTokenManager._oauth2Cache = new Map<string, ArcGisOAuth2Token>();\n\n    }\n    ArcGisTokenManager._oauth2Cache.set(key, token);\n\n    ArcGisTokenManager.saveToBrowserStorage();\n  }\n\n  public static loadFromBrowserStorage() {\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\n      return;\n    }\n\n    const loadEntries = (json: string | undefined) => {\n      if (json && ArcGisTokenManager._oauth2Cache !== undefined) {\n        const tokens: ArcGisTokenProps | undefined = JSON.parse(json);\n        if (tokens) {\n          for (const [key, value] of Object.entries(tokens)) {\n            ArcGisTokenManager._oauth2Cache.set(key, value);\n          }\n        }\n      }\n    };\n\n    loadEntries(window.sessionStorage.getItem(this._browserStorageKey) ?? undefined);\n    loadEntries(window.localStorage.getItem(this._browserStorageKey) ?? undefined);\n  }\n\n  public static saveToBrowserStorage() {\n\n    if (ArcGisTokenManager._oauth2Cache === undefined) {\n      return;\n    }\n    const sessionTokens: ArcGisTokenProps = {};\n    const storageTokens: ArcGisTokenProps = {};\n\n    ArcGisTokenManager._oauth2Cache.forEach((value: ArcGisOAuth2Token, key: string) => {\n      // ignore the persist flag for now, and only save to session storage\n      // if (value.persist === true) {\n      //   storageTokens[key] = value;\n      // } else {\n      //   sessionTokens[key] = value;\n      // }\n      sessionTokens[key] = value;\n    });\n    window.sessionStorage.setItem(this._browserStorageKey, JSON.stringify(sessionTokens));\n    window.localStorage.setItem(this._browserStorageKey, JSON.stringify(storageTokens));\n  }\n\n}\n"]}

package/lib/esm/ArcGis/ArcGisUrl.d.ts

@@ -1,7 +1,7 @@
-/** @internal */
-export declare class ArcGisUrl {
-    static extractRestBaseUrl(url: URL): URL | undefined;
-    static getRestUrlFromGenerateTokenUrl(url: URL): Promise<URL | undefined>;
-    private static fetchJson;
-}
+/** @internal */
+export declare class ArcGisUrl {
+    static extractRestBaseUrl(url: URL): URL | undefined;
+    static getRestUrlFromGenerateTokenUrl(url: URL): Promise<URL | undefined>;
+    private static fetchJson;
+}
 //# sourceMappingURL=ArcGisUrl.d.ts.map

package/lib/esm/ArcGis/ArcGisUrl.js

@@ -1,46 +1,46 @@
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-/** @internal */
-export class ArcGisUrl {
-    // Extract the sub-url up to '/rest/'
-    static extractRestBaseUrl(url) {
-        const urlStr = url.toString();
-        const searchStr = "/rest/";
-        const restPos = urlStr.indexOf(searchStr);
-        return (restPos === -1 ? undefined : new URL(urlStr.substring(0, restPos + searchStr.length)));
-    }
-    static async getRestUrlFromGenerateTokenUrl(url) {
-        var _a;
-        const restUrl = ArcGisUrl.extractRestBaseUrl(url);
-        if (restUrl === undefined) {
-            return undefined;
-        }
-        // First attempt: derive the Oauth2 token URL from the 'tokenServicesUrl', exposed by the 'info request'
-        const infoUrl = new URL(`${restUrl.toString()}info`);
-        infoUrl.searchParams.append("f", "json");
-        let json;
-        try {
-            json = await ArcGisUrl.fetchJson(infoUrl);
-        }
-        catch {
-        }
-        const tokenServicesUrl = (_a = json === null || json === void 0 ? void 0 : json.authInfo) === null || _a === void 0 ? void 0 : _a.tokenServicesUrl;
-        if (tokenServicesUrl === undefined) {
-            return undefined;
-        }
-        return ArcGisUrl.extractRestBaseUrl(new URL(tokenServicesUrl));
-    }
-    static async fetchJson(url) {
-        let json;
-        try {
-            const response = await fetch(url.toString(), { method: "GET" });
-            json = await response.json();
-        }
-        catch {
-        }
-        return json;
-    }
-}
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+/** @internal */
+export class ArcGisUrl {
+    // Extract the sub-url up to '/rest/'
+    static extractRestBaseUrl(url) {
+        const urlStr = url.toString();
+        const searchStr = "/rest/";
+        const restPos = urlStr.indexOf(searchStr);
+        return (restPos === -1 ? undefined : new URL(urlStr.substring(0, restPos + searchStr.length)));
+    }
+    static async getRestUrlFromGenerateTokenUrl(url) {
+        var _a;
+        const restUrl = ArcGisUrl.extractRestBaseUrl(url);
+        if (restUrl === undefined) {
+            return undefined;
+        }
+        // First attempt: derive the Oauth2 token URL from the 'tokenServicesUrl', exposed by the 'info request'
+        const infoUrl = new URL(`${restUrl.toString()}info`);
+        infoUrl.searchParams.append("f", "json");
+        let json;
+        try {
+            json = await ArcGisUrl.fetchJson(infoUrl);
+        }
+        catch {
+        }
+        const tokenServicesUrl = (_a = json === null || json === void 0 ? void 0 : json.authInfo) === null || _a === void 0 ? void 0 : _a.tokenServicesUrl;
+        if (tokenServicesUrl === undefined) {
+            return undefined;
+        }
+        return ArcGisUrl.extractRestBaseUrl(new URL(tokenServicesUrl));
+    }
+    static async fetchJson(url) {
+        let json;
+        try {
+            const response = await fetch(url.toString(), { method: "GET" });
+            json = await response.json();
+        }
+        catch {
+        }
+        return json;
+    }
+}
 //# sourceMappingURL=ArcGisUrl.js.map

package/lib/esm/ArcGis/ArcGisUrl.js.map

@@ -1 +1 @@
-{"version":3,"file":"ArcGisUrl.js","sourceRoot":"","sources":["../../../src/ArcGis/ArcGisUrl.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,gBAAgB;AAChB,MAAM,OAAO,SAAS;IAEpB,qCAAqC;IAC9B,MAAM,CAAC,kBAAkB,CAAC,GAAQ;QACvC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1C,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAEjG,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,GAAQ;;QACzD,MAAM,OAAO,GAAG,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,SAAS,CAAC;SAClB;QAED,wGAAwG;QACxG,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACrD,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC;QACT,IAAI;YACF,IAAI,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;SAC3C;QAAC,MAAM;SAEP;QAED,MAAM,gBAAgB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,0CAAE,gBAAgB,CAAC;QAC1D,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,SAAS,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAQ;QACrC,IAAI,IAAI,CAAC;QACT,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAChE,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QAAC,MAAM;SACP;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\n/** @internal */\r\nexport class ArcGisUrl {\r\n\r\n  // Extract the sub-url up to '/rest/'\r\n  public static extractRestBaseUrl(url: URL): URL | undefined {\r\n    const urlStr = url.toString();\r\n    const searchStr = \"/rest/\";\r\n    const restPos = urlStr.indexOf(searchStr);\r\n    return (restPos === -1 ? undefined : new URL(urlStr.substring(0, restPos + searchStr.length)));\r\n\r\n  }\r\n\r\n  public static async getRestUrlFromGenerateTokenUrl(url: URL): Promise<URL | undefined> {\r\n    const restUrl = ArcGisUrl.extractRestBaseUrl(url);\r\n    if (restUrl === undefined) {\r\n      return undefined;\r\n    }\r\n\r\n    // First attempt: derive the Oauth2 token URL from the 'tokenServicesUrl', exposed by the 'info request'\r\n    const infoUrl = new URL(`${restUrl.toString()}info`);\r\n    infoUrl.searchParams.append(\"f\", \"json\");\r\n\r\n    let json;\r\n    try {\r\n      json = await ArcGisUrl.fetchJson(infoUrl);\r\n    } catch {\r\n\r\n    }\r\n\r\n    const tokenServicesUrl = json?.authInfo?.tokenServicesUrl;\r\n    if (tokenServicesUrl === undefined) {\r\n      return undefined;\r\n    }\r\n    return ArcGisUrl.extractRestBaseUrl(new URL(tokenServicesUrl));\r\n  }\r\n\r\n  private static async fetchJson(url: URL): Promise<any> {\r\n    let json;\r\n    try {\r\n      const response = await fetch(url.toString(), { method: \"GET\" });\r\n      json = await response.json();\r\n    } catch {\r\n    }\r\n    return json;\r\n  }\r\n}\r\n"]}
+{"version":3,"file":"ArcGisUrl.js","sourceRoot":"","sources":["../../../src/ArcGis/ArcGisUrl.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,gBAAgB;AAChB,MAAM,OAAO,SAAS;IAEpB,qCAAqC;IAC9B,MAAM,CAAC,kBAAkB,CAAC,GAAQ;QACvC,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC1C,OAAO,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAEjG,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,8BAA8B,CAAC,GAAQ;;QACzD,MAAM,OAAO,GAAG,SAAS,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAClD,IAAI,OAAO,KAAK,SAAS,EAAE;YACzB,OAAO,SAAS,CAAC;SAClB;QAED,wGAAwG;QACxG,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACrD,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC;QACT,IAAI;YACF,IAAI,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;SAC3C;QAAC,MAAM;SAEP;QAED,MAAM,gBAAgB,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,QAAQ,0CAAE,gBAAgB,CAAC;QAC1D,IAAI,gBAAgB,KAAK,SAAS,EAAE;YAClC,OAAO,SAAS,CAAC;SAClB;QACD,OAAO,SAAS,CAAC,kBAAkB,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;IACjE,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,GAAQ;QACrC,IAAI,IAAI,CAAC;QACT,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAChE,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;SAC9B;QAAC,MAAM;SACP;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\n/** @internal */\nexport class ArcGisUrl {\n\n  // Extract the sub-url up to '/rest/'\n  public static extractRestBaseUrl(url: URL): URL | undefined {\n    const urlStr = url.toString();\n    const searchStr = \"/rest/\";\n    const restPos = urlStr.indexOf(searchStr);\n    return (restPos === -1 ? undefined : new URL(urlStr.substring(0, restPos + searchStr.length)));\n\n  }\n\n  public static async getRestUrlFromGenerateTokenUrl(url: URL): Promise<URL | undefined> {\n    const restUrl = ArcGisUrl.extractRestBaseUrl(url);\n    if (restUrl === undefined) {\n      return undefined;\n    }\n\n    // First attempt: derive the Oauth2 token URL from the 'tokenServicesUrl', exposed by the 'info request'\n    const infoUrl = new URL(`${restUrl.toString()}info`);\n    infoUrl.searchParams.append(\"f\", \"json\");\n\n    let json;\n    try {\n      json = await ArcGisUrl.fetchJson(infoUrl);\n    } catch {\n\n    }\n\n    const tokenServicesUrl = json?.authInfo?.tokenServicesUrl;\n    if (tokenServicesUrl === undefined) {\n      return undefined;\n    }\n    return ArcGisUrl.extractRestBaseUrl(new URL(tokenServicesUrl));\n  }\n\n  private static async fetchJson(url: URL): Promise<any> {\n    let json;\n    try {\n      const response = await fetch(url.toString(), { method: \"GET\" });\n      json = await response.json();\n    } catch {\n    }\n    return json;\n  }\n}\n"]}

package/lib/esm/map-layers-auth.d.ts

@@ -1,6 +1,6 @@
-export * from "./ArcGis/ArcGisOAuth2Endpoint";
-export * from "./ArcGis/ArcGisUrl";
-export * from "./ArcGis/ArcGisAccessClient";
-export * from "./ArcGis/ArcGisTokenGenerator";
-export * from "./ArcGis/ArcGisTokenManager";
+export * from "./ArcGis/ArcGisOAuth2Endpoint";
+export * from "./ArcGis/ArcGisUrl";
+export * from "./ArcGis/ArcGisAccessClient";
+export * from "./ArcGis/ArcGisTokenGenerator";
+export * from "./ArcGis/ArcGisTokenManager";
 //# sourceMappingURL=map-layers-auth.d.ts.map

package/lib/esm/map-layers-auth.js

@@ -1,10 +1,10 @@
-/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-export * from "./ArcGis/ArcGisOAuth2Endpoint";
-export * from "./ArcGis/ArcGisUrl";
-export * from "./ArcGis/ArcGisAccessClient";
-export * from "./ArcGis/ArcGisTokenGenerator";
-export * from "./ArcGis/ArcGisTokenManager";
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+export * from "./ArcGis/ArcGisOAuth2Endpoint";
+export * from "./ArcGis/ArcGisUrl";
+export * from "./ArcGis/ArcGisAccessClient";
+export * from "./ArcGis/ArcGisTokenGenerator";
+export * from "./ArcGis/ArcGisTokenManager";
 //# sourceMappingURL=map-layers-auth.js.map

package/lib/esm/map-layers-auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"map-layers-auth.js","sourceRoot":"","sources":["../../src/map-layers-auth.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\r\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\r\n* See LICENSE.md in the project root for license terms and full copyright notice.\r\n*--------------------------------------------------------------------------------------------*/\r\nexport * from \"./ArcGis/ArcGisOAuth2Endpoint\";\r\nexport * from \"./ArcGis/ArcGisUrl\";\r\nexport * from \"./ArcGis/ArcGisAccessClient\";\r\nexport * from \"./ArcGis/ArcGisTokenGenerator\";\r\nexport * from \"./ArcGis/ArcGisTokenManager\";\r\n"]}
+{"version":3,"file":"map-layers-auth.js","sourceRoot":"","sources":["../../src/map-layers-auth.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oBAAoB,CAAC;AACnC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nexport * from \"./ArcGis/ArcGisOAuth2Endpoint\";\nexport * from \"./ArcGis/ArcGisUrl\";\nexport * from \"./ArcGis/ArcGisAccessClient\";\nexport * from \"./ArcGis/ArcGisTokenGenerator\";\nexport * from \"./ArcGis/ArcGisTokenManager\";\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/map-layers-auth",
-  "version": "3.4.0-dev.8",
+  "version": "3.5.0-dev.4",
   "description": "Extension that adds a Map Layers Widget",
   "main": "lib/cjs/map-layers-auth.js",
   "module": "lib/esm/map-layers-auth.js",
@@ -21,11 +21,11 @@
     "url": "http://www.bentley.com"
   },
   "devDependencies": {
-    "@itwin/build-tools": "3.4.0-dev.8",
-    "@itwin/core-bentley": "3.4.0-dev.8",
-    "@itwin/core-common": "3.4.0-dev.8",
-    "@itwin/core-frontend": "3.4.0-dev.8",
-    "@itwin/eslint-plugin": "3.4.0-dev.8",
+    "@itwin/build-tools": "3.5.0-dev.4",
+    "@itwin/core-bentley": "3.5.0-dev.4",
+    "@itwin/core-common": "3.5.0-dev.4",
+    "@itwin/core-frontend": "3.5.0-dev.4",
+    "@itwin/eslint-plugin": "3.5.0-dev.4",
     "@types/chai": "4.3.1",
     "@types/mocha": "^8.2.2",
     "@types/sinon": "^9.0.0",
@@ -43,7 +43,7 @@
     "typescript": "~4.4.0"
   },
   "peerDependencies": {
-    "@itwin/core-bentley": "3.4.0-dev.8"
+    "@itwin/core-bentley": "3.5.0-dev.4"
   },
   "nyc": {
     "extends": "./node_modules/@itwin/build-tools/.nycrc",
@@ -88,5 +88,5 @@
     "test": "mocha \"./lib/cjs/test/**/*.test.js\"",
     "rebuild": "npm run -s clean && npm run -s build"
   },
-  "readme": "# @itwin/map-layers-auth\r\n\r\nCopyright © Bentley Systems, Incorporated. All rights reserved. See LICENSE.md for license terms and full copyright notice.\r\n\r\n## Description\r\n\r\nThe __@itwin/map-layers-auth__ package contains classes for enabling various authentification methods, such as OAuth2.\r\n\r\n## ArcGIS OAuth2 suport\r\n\r\nTo enable the ArcGIS OAuth2 suport, an 'ArcGisAccessClient' object needs to be created and registered in the MapLayerFormatRegistry from __@itwin/imodeljs-frontend__ for the 'ArcGIS' format.\r\n\r\nAlso the following configuration will be required: \r\n\r\n1. __Callback URL__\\\r\nHosting application needs implement its own callback page, and set its URL on the create `ArcGisAccessClient` object.\\\r\nFollowing code demonstrates how this can be implemented as a simple React hook:\r\n```\r\nimport * as React from \"react\";\r\nexport function ArcGisOauthRedirect() {\r\n  const completeLogin = () => {\r\n    if (window.opener) {\r\n      const opener = (window.opener);\r\n      if (opener?.arcGisOAuth2Callback) {\r\n        opener.arcGisOAuth2Callback(window.location);\r\n      }\r\n    }\r\n  };\r\n  React.useEffect(() => {\r\n    completeLogin();\r\n  }, []);\r\n}\r\n```\r\n\r\n2. __Client IDs__\\\r\nThe hosting application must be registered in either the ArcGIS Online server (cloud offering) or an ArcGIS enterprise server (on-premise). The registered application must then provide it's associated clientID and redirectUri to the `ArcGgisAccessClient` object.  The ui-test-app application provides a complete sample configuration. \r\nThe maplayers widget has also been updated to support OAuth2: if needed, a popup window will be displayed to trigger the external OAuth process with the remote ArcGIS server. When the process completes, the focus returns to the map-layers widget and layer is ready to be added/displayed.\\\r\n\\\r\nMore details on how to configure the ArcGis Server can be found in the [ESRI documentation](https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/)\\\r\n\\\r\n`ArcGisAccessClient` initialization example:\r\n```ts\r\n  const enterpriseClientIds = [{\r\n      serviceBaseUrl: SampleAppIModelApp.testAppConfiguration.arcGisEnterpriseBaseUrl,\r\n      clientId: SampleAppIModelApp.testAppConfiguration?.arcGisEnterpriseClientId,\r\n    }];\r\n  const accessClient = new ArcGisAccessClient();\r\n  const initStatus = accessClient.initialize({\r\n    redirectUri: \"http://localhost:3000/esri-oauth2-callback\",\r\n    clientIds: {\r\n      arcgisOnlineClientId: SampleAppIModelApp?.testAppConfiguration?.arcGisOnlineClientId,\r\n      enterpriseClientIds,\r\n    }});\r\n  IModelApp.mapLayerFormatRegistry.setAccessClient(\"ArcGIS\", accessClient);\r\n```\r\n\r\n\r\n"
+  "readme": "# @itwin/map-layers-auth\r\n\r\nCopyright © Bentley Systems, Incorporated. All rights reserved. See LICENSE.md for license terms and full copyright notice.\r\n\r\n## Description\r\n\r\nThe __@itwin/map-layers-auth__ package contains classes for enabling various authentification methods, such as OAuth2.\r\n\r\n## ArcGIS OAuth2 support\r\n\r\nTo enable the ArcGIS OAuth2 support, an 'ArcGisAccessClient' object needs to be created and registered in the MapLayerFormatRegistry from __@itwin/imodeljs-frontend__ for the 'ArcGIS' format.\r\n\r\nAlso the following configuration will be required:\r\n\r\n1. __Callback URL__\\\r\nHosting application needs to implement its own callback page, and sets its corresponding public URL on the  `ArcGisAccessClient` object.\\\r\nFollowing code demonstrates how a callback page can be implemented as a simple React hook:\r\n\r\n```\r\nimport * as React from \"react\";\r\nexport function ArcGisOauthRedirect() {\r\n  const completeLogin = () => {\r\n    if (window.opener) {\r\n      const opener = (window.opener);\r\n      if (opener?.arcGisOAuth2Callback) {\r\n        opener.arcGisOAuth2Callback(window.location);\r\n      }\r\n    }\r\n  };\r\n  React.useEffect(() => {\r\n    completeLogin();\r\n  }, []);\r\n}\r\n```\r\n\r\n1. __Client IDs__\\\r\nThe hosting application must be registered in either the ArcGIS Online server (cloud offering) or in ArcGIS enterprise server (on-premise). The registered application must then provide its associated clientID and redirectUri to the `ArcGisAccessClient` object.  The ui-test-app application provides a complete sample configuration.\r\nThe map-layers widget has also been updated to support OAuth2: if needed, a popup window will be displayed to trigger the external OAuth process with the remote ArcGIS server. When the process completes, the focus returns to the map-layers widget and layer is ready to be added/displayed.\\\r\n\\\r\nMore details on how to configure the ArcGis Server can be found in the [ESRI documentation](https://developers.arcgis.com/documentation/mapping-apis-and-services/security/tutorials/register-your-application/)\\\r\n\\\r\n`ArcGisAccessClient` initialization example:\r\n\r\n```ts\r\n  const enterpriseClientIds = [{\r\n      serviceBaseUrl: SampleAppIModelApp.testAppConfiguration.arcGisEnterpriseBaseUrl,\r\n      clientId: SampleAppIModelApp.testAppConfiguration?.arcGisEnterpriseClientId,\r\n    }];\r\n  const accessClient = new ArcGisAccessClient();\r\n  const initStatus = accessClient.initialize({\r\n    redirectUri: \"http://localhost:3000/esri-oauth2-callback\",\r\n    clientIds: {\r\n      arcgisOnlineClientId: SampleAppIModelApp?.testAppConfiguration?.arcGisOnlineClientId,\r\n      enterpriseClientIds,\r\n    }});\r\n  IModelApp.mapLayerFormatRegistry.setAccessClient(\"ArcGIS\", accessClient);\r\n```\r\n"
 }