@itwin/map-layers-auth 3.4.6 → 3.4.7

package/lib/esm/ArcGis/ArcGisAccessClient.js

@@ -1,306 +1,306 @@
-/*---------------------------------------------------------------------------------------------
-* 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 { assert, BeEvent } from "@itwin/core-bentley";
-import { ArcGisTokenClientType } from "./ArcGisTokenGenerator";
-import { ArcGisOAuth2Endpoint, ArcGisOAuth2EndpointType } from "./ArcGisOAuth2Endpoint";
-import { ArcGisTokenManager } from "./ArcGisTokenManager";
-import { ArcGisUrl } from "./ArcGisUrl";
-/** @beta */
-export class ArcGisAccessClient {
-    constructor() {
-        this.onOAuthProcessEnd = new BeEvent();
-        // Derive the Oauth URL from a typical MapLayerURL
-        // i.e. 	  https://hostname/server/rest/services/NewYork/NewYork3857/MapServer
-        //      =>  https://hostname/portal/sharing/oauth2/authorize
-        this._oauthAuthorizeEndPointsCache = new Map();
-        this._oauthTokenEndPointsCache = new Map();
-    }
-    initialize(oAuthConfig) {
-        if (oAuthConfig) {
-            this._redirectUri = oAuthConfig.redirectUri;
-            this._expiration = oAuthConfig.tokenExpiration;
-            this._clientIds = oAuthConfig.clientIds;
-            this.initOauthCallbackFunction();
-        }
-        return true;
-    }
-    initOauthCallbackFunction() {
-        window.arcGisOAuth2Callback = (redirectLocation) => {
-            var _a, _b, _c, _d;
-            let eventSuccess = false;
-            let stateData;
-            if (redirectLocation && redirectLocation.hash.length > 0) {
-                const locationHash = redirectLocation.hash;
-                const hashParams = new URLSearchParams(locationHash.substring(1));
-                const token = (_a = hashParams.get("access_token")) !== null && _a !== void 0 ? _a : undefined;
-                const expiresInStr = (_b = hashParams.get("expires_in")) !== null && _b !== void 0 ? _b : undefined;
-                const userName = (_c = hashParams.get("username")) !== null && _c !== void 0 ? _c : undefined;
-                const ssl = hashParams.get("ssl") === "true";
-                const stateStr = (_d = hashParams.get("state")) !== null && _d !== void 0 ? _d : undefined;
-                const persist = hashParams.get("persist") === "true";
-                if (token !== undefined && expiresInStr !== undefined && userName !== undefined && ssl !== undefined && stateStr !== undefined) {
-                    let endpointOrigin;
-                    try {
-                        const state = JSON.parse(stateStr);
-                        stateData = state === null || state === void 0 ? void 0 : state.customData;
-                        endpointOrigin = state === null || state === void 0 ? void 0 : state.endpointOrigin;
-                    }
-                    catch {
-                    }
-                    const expiresIn = Number(expiresInStr);
-                    const expiresAt = (expiresIn * 1000) + (+new Date()); // Converts the token expiration delay (seconds) into a timestamp (UNIX time)
-                    if (endpointOrigin !== undefined) {
-                        ArcGisTokenManager.setOAuth2Token(endpointOrigin, { token, expiresAt, ssl, userName, persist });
-                        eventSuccess = true;
-                    }
-                }
-            }
-            this.onOAuthProcessEnd.raiseEvent(eventSuccess, stateData);
-        };
-    }
-    unInitialize() {
-        this._redirectUri = undefined;
-        this._expiration = undefined;
-        window.arcGisOAuth2Callback = undefined;
-    }
-    async getAccessToken(params) {
-        // First lookup Oauth2 tokens, otherwise check try "legacy tokens" if credentials were provided
-        try {
-            const oauth2Token = await this.getOAuthTokenForMapLayerUrl(params.mapLayerUrl.toString());
-            if (oauth2Token)
-                return oauth2Token;
-            if (params.userName && params.password) {
-                return await ArcGisTokenManager.getToken(params.mapLayerUrl.toString(), params.userName, params.password, { client: ArcGisTokenClientType.referer });
-            }
-        }
-        catch {
-        }
-        return undefined;
-    }
-    async getTokenServiceEndPoint(mapLayerUrl) {
-        let tokenEndpoint;
-        try {
-            tokenEndpoint = await this.getOAuth2Endpoint(mapLayerUrl, ArcGisOAuth2EndpointType.Authorize);
-            if (tokenEndpoint) {
-            }
-        }
-        catch { }
-        return tokenEndpoint;
-    }
-    invalidateToken(token) {
-        let found = ArcGisTokenManager.invalidateToken(token);
-        if (!found) {
-            found = ArcGisTokenManager.invalidateOAuth2Token(token);
-        }
-        return found;
-    }
-    get redirectUri() {
-        return this._redirectUri;
-    }
-    getMatchingEnterpriseClientId(url) {
-        const clientIds = this.arcGisEnterpriseClientIds;
-        if (!clientIds) {
-            return undefined;
-        }
-        let clientId;
-        let defaultClientId;
-        for (const entry of clientIds) {
-            if (entry.serviceBaseUrl === "") {
-                defaultClientId = entry.clientId;
-            }
-            else {
-                if (url.toLowerCase().startsWith(entry.serviceBaseUrl)) {
-                    clientId = entry.clientId;
-                }
-            }
-        }
-        // If we could not find a match with serviceBaseUrl, and a default clientId
-        // was specified (i.e empty url), then use default clientId
-        if (clientId === undefined && defaultClientId !== undefined) {
-            clientId = defaultClientId;
-        }
-        return clientId;
-    }
-    get expiration() {
-        return this._expiration;
-    }
-    get arcGisOnlineClientId() {
-        var _a;
-        return (_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.arcgisOnlineClientId;
-    }
-    set arcGisOnlineClientId(clientId) {
-        if (this._clientIds === undefined) {
-            this._clientIds = { arcgisOnlineClientId: clientId };
-        }
-        this._clientIds.arcgisOnlineClientId = clientId;
-    }
-    get arcGisEnterpriseClientIds() {
-        var _a;
-        return (_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.enterpriseClientIds;
-    }
-    setEnterpriseClientId(serviceBaseUrl, clientId) {
-        var _a;
-        if ((_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.enterpriseClientIds) {
-            const foundIdx = this._clientIds.enterpriseClientIds.findIndex((entry) => entry.serviceBaseUrl === serviceBaseUrl);
-            if (foundIdx !== -1) {
-                this._clientIds.enterpriseClientIds[foundIdx].clientId = clientId;
-            }
-            else {
-                this._clientIds.enterpriseClientIds.push({ serviceBaseUrl, clientId });
-            }
-        }
-        else {
-            if (this._clientIds === undefined) {
-                this._clientIds = {};
-            }
-            this._clientIds.enterpriseClientIds = [{ serviceBaseUrl, clientId }];
-        }
-    }
-    removeEnterpriseClientId(clientId) {
-        var _a, _b, _c;
-        if ((_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.enterpriseClientIds) {
-            this._clientIds.enterpriseClientIds = (_c = (_b = this._clientIds) === null || _b === void 0 ? void 0 : _b.enterpriseClientIds) === null || _c === void 0 ? void 0 : _c.filter((item) => item.serviceBaseUrl !== clientId.serviceBaseUrl);
-        }
-    }
-    /// //////////
-    /** @internal */
-    async getOAuthTokenForMapLayerUrl(mapLayerUrl) {
-        try {
-            const oauthEndpoint = await this.getOAuth2Endpoint(mapLayerUrl, ArcGisOAuth2EndpointType.Authorize);
-            if (oauthEndpoint !== undefined) {
-                const oauthEndpointUrl = new URL(oauthEndpoint.getUrl());
-                return ArcGisTokenManager.getOAuth2Token(oauthEndpointUrl.origin);
-            }
-        }
-        catch { }
-        return undefined;
-    }
-    /**
-    * Test if Oauth2 endpoint is accessible and has an associated appId
-    * @return true/false if validation succeeded, undefined if validation could not be performed (i.e CORS/network error)
-    * @internal
-    */
-    async validateOAuth2Endpoint(endpointUrl) {
-        // Check if we got a matching appId for that endpoint, otherwise its not worth going further
-        if (undefined === this.getMatchingEnterpriseClientId(endpointUrl)) {
-            return false;
-        }
-        let status;
-        try {
-            const data = await fetch(endpointUrl, { method: "GET" });
-            status = data.status;
-        }
-        catch (error) {
-            // fetch() throws when there is a CORS error, so in that case
-            // we cannot confirm if the oauth2 endpoint is valid or not, we return undefined
-            return undefined;
-        }
-        return status === 400; // Oauth2 API returns 400 (Bad Request) when there are missing parameters
-    }
-    /**
-   * Get OAuth2 endpoint that must be cause to get the Oauth2 token
-   * @internal
-   */
-    async getOAuth2Endpoint(url, endpoint) {
-        // Return from cache if available
-        const cachedEndpoint = (endpoint === ArcGisOAuth2EndpointType.Authorize ? this._oauthAuthorizeEndPointsCache.get(url) : this._oauthTokenEndPointsCache.get(url));
-        if (cachedEndpoint !== undefined) {
-            return cachedEndpoint;
-        }
-        const cacheResult = (obj) => {
-            if (endpoint === ArcGisOAuth2EndpointType.Authorize) {
-                this._oauthAuthorizeEndPointsCache.set(url, obj);
-            }
-            else {
-                this._oauthTokenEndPointsCache.set(url, obj);
-            }
-        };
-        const endpointStr = (endpoint === ArcGisOAuth2EndpointType.Authorize ? "authorize" : "token");
-        const urlObj = new URL(url);
-        if (urlObj.hostname.toLowerCase().endsWith("arcgis.com")) {
-            // ArcGIS Online (fixed)
-            // Doc: https://developers.arcgis.com/documentation/mapping-apis-and-services/security/oauth-2.0/
-            if (this.arcGisOnlineClientId === undefined) {
-                return undefined;
-            }
-            const oauth2Url = `https://www.arcgis.com/sharing/rest/oauth2/${endpointStr}`;
-            return new ArcGisOAuth2Endpoint(url, this.constructLoginUrl(oauth2Url, true), true);
-        }
-        else {
-            // First attempt: derive the Oauth2 token URL from the 'tokenServicesUrl', exposed by the 'info request'
-            let restUrlFromTokenService;
-            try {
-                restUrlFromTokenService = await ArcGisUrl.getRestUrlFromGenerateTokenUrl(urlObj);
-            }
-            catch { }
-            if (restUrlFromTokenService !== undefined) {
-                // Validate the URL we just composed
-                try {
-                    const oauth2Url = `${restUrlFromTokenService.toString()}oauth2/${endpointStr}`;
-                    const valid = await this.validateOAuth2Endpoint(oauth2Url);
-                    // We assume undefined means CORS error, that shouldn't prevent popup from displaying the login page.
-                    if (valid === undefined || valid) {
-                        const oauthEndpoint = new ArcGisOAuth2Endpoint(oauth2Url, this.constructLoginUrl(oauth2Url, false), false);
-                        cacheResult(oauthEndpoint);
-                        return oauthEndpoint;
-                    }
-                }
-                catch { }
-            }
-            // If reach this point, that means we could not derive the token endpoint from 'tokenServicesUrl', lets try something else.
-            // ArcGIS Enterprise Format https://<host>:<port>/<subdirectory>/sharing/rest/oauth2/authorize
-            const regExMatch = url.match(new RegExp(/([^&\/]+)\/rest\/services\/.*/, "i"));
-            if (regExMatch !== null && regExMatch.length >= 2) {
-                const subdirectory = regExMatch[1];
-                const port = (urlObj.port !== "80" && urlObj.port !== "443") ? `:${urlObj.port}` : "";
-                const newUrlObj = new URL(`${urlObj.protocol}//${urlObj.hostname}${port}/${subdirectory}/sharing/rest/oauth2/${endpointStr}`);
-                // Check again the URL we just composed
-                try {
-                    const newUrl = newUrlObj.toString();
-                    if (await this.validateOAuth2Endpoint(newUrl)) {
-                        const oauthEndpoint = new ArcGisOAuth2Endpoint(newUrl, this.constructLoginUrl(newUrl, false), false);
-                        cacheResult(oauthEndpoint);
-                        return oauthEndpoint;
-                    }
-                }
-                catch { }
-            }
-        }
-        return undefined; // we could not find any valid oauth2 endpoint
-    }
-    /**
-   * Construct the complete Authorize url to starts the Oauth process
-   * @internal
-   */
-    constructLoginUrl(url, isArcgisOnline) {
-        const urlObj = new URL(url);
-        // Set the client id
-        if (isArcgisOnline) {
-            const clientId = this.arcGisOnlineClientId;
-            assert(clientId !== undefined);
-            if (clientId !== undefined) {
-                urlObj.searchParams.set("client_id", clientId);
-            }
-        }
-        else {
-            const clientId = this.getMatchingEnterpriseClientId(url);
-            assert(clientId !== undefined);
-            if (undefined !== clientId) {
-                urlObj.searchParams.set("client_id", clientId);
-            }
-        }
-        urlObj.searchParams.set("response_type", "token");
-        if (this.expiration !== undefined) {
-            urlObj.searchParams.set("expiration", `${this.expiration}`);
-        }
-        if (this.redirectUri)
-            urlObj.searchParams.set("redirect_uri", this.redirectUri);
-        return urlObj.toString();
-    }
-}
+/*---------------------------------------------------------------------------------------------
+* 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 { assert, BeEvent } from "@itwin/core-bentley";
+import { ArcGisTokenClientType } from "./ArcGisTokenGenerator";
+import { ArcGisOAuth2Endpoint, ArcGisOAuth2EndpointType } from "./ArcGisOAuth2Endpoint";
+import { ArcGisTokenManager } from "./ArcGisTokenManager";
+import { ArcGisUrl } from "./ArcGisUrl";
+/** @beta */
+export class ArcGisAccessClient {
+    constructor() {
+        this.onOAuthProcessEnd = new BeEvent();
+        // Derive the Oauth URL from a typical MapLayerURL
+        // i.e. 	  https://hostname/server/rest/services/NewYork/NewYork3857/MapServer
+        //      =>  https://hostname/portal/sharing/oauth2/authorize
+        this._oauthAuthorizeEndPointsCache = new Map();
+        this._oauthTokenEndPointsCache = new Map();
+    }
+    initialize(oAuthConfig) {
+        if (oAuthConfig) {
+            this._redirectUri = oAuthConfig.redirectUri;
+            this._expiration = oAuthConfig.tokenExpiration;
+            this._clientIds = oAuthConfig.clientIds;
+            this.initOauthCallbackFunction();
+        }
+        return true;
+    }
+    initOauthCallbackFunction() {
+        window.arcGisOAuth2Callback = (redirectLocation) => {
+            var _a, _b, _c, _d;
+            let eventSuccess = false;
+            let stateData;
+            if (redirectLocation && redirectLocation.hash.length > 0) {
+                const locationHash = redirectLocation.hash;
+                const hashParams = new URLSearchParams(locationHash.substring(1));
+                const token = (_a = hashParams.get("access_token")) !== null && _a !== void 0 ? _a : undefined;
+                const expiresInStr = (_b = hashParams.get("expires_in")) !== null && _b !== void 0 ? _b : undefined;
+                const userName = (_c = hashParams.get("username")) !== null && _c !== void 0 ? _c : undefined;
+                const ssl = hashParams.get("ssl") === "true";
+                const stateStr = (_d = hashParams.get("state")) !== null && _d !== void 0 ? _d : undefined;
+                const persist = hashParams.get("persist") === "true";
+                if (token !== undefined && expiresInStr !== undefined && userName !== undefined && ssl !== undefined && stateStr !== undefined) {
+                    let endpointOrigin;
+                    try {
+                        const state = JSON.parse(stateStr);
+                        stateData = state === null || state === void 0 ? void 0 : state.customData;
+                        endpointOrigin = state === null || state === void 0 ? void 0 : state.endpointOrigin;
+                    }
+                    catch {
+                    }
+                    const expiresIn = Number(expiresInStr);
+                    const expiresAt = (expiresIn * 1000) + (+new Date()); // Converts the token expiration delay (seconds) into a timestamp (UNIX time)
+                    if (endpointOrigin !== undefined) {
+                        ArcGisTokenManager.setOAuth2Token(endpointOrigin, { token, expiresAt, ssl, userName, persist });
+                        eventSuccess = true;
+                    }
+                }
+            }
+            this.onOAuthProcessEnd.raiseEvent(eventSuccess, stateData);
+        };
+    }
+    unInitialize() {
+        this._redirectUri = undefined;
+        this._expiration = undefined;
+        window.arcGisOAuth2Callback = undefined;
+    }
+    async getAccessToken(params) {
+        // First lookup Oauth2 tokens, otherwise check try "legacy tokens" if credentials were provided
+        try {
+            const oauth2Token = await this.getOAuthTokenForMapLayerUrl(params.mapLayerUrl.toString());
+            if (oauth2Token)
+                return oauth2Token;
+            if (params.userName && params.password) {
+                return await ArcGisTokenManager.getToken(params.mapLayerUrl.toString(), params.userName, params.password, { client: ArcGisTokenClientType.referer });
+            }
+        }
+        catch {
+        }
+        return undefined;
+    }
+    async getTokenServiceEndPoint(mapLayerUrl) {
+        let tokenEndpoint;
+        try {
+            tokenEndpoint = await this.getOAuth2Endpoint(mapLayerUrl, ArcGisOAuth2EndpointType.Authorize);
+            if (tokenEndpoint) {
+            }
+        }
+        catch { }
+        return tokenEndpoint;
+    }
+    invalidateToken(token) {
+        let found = ArcGisTokenManager.invalidateToken(token);
+        if (!found) {
+            found = ArcGisTokenManager.invalidateOAuth2Token(token);
+        }
+        return found;
+    }
+    get redirectUri() {
+        return this._redirectUri;
+    }
+    getMatchingEnterpriseClientId(url) {
+        const clientIds = this.arcGisEnterpriseClientIds;
+        if (!clientIds) {
+            return undefined;
+        }
+        let clientId;
+        let defaultClientId;
+        for (const entry of clientIds) {
+            if (entry.serviceBaseUrl === "") {
+                defaultClientId = entry.clientId;
+            }
+            else {
+                if (url.toLowerCase().startsWith(entry.serviceBaseUrl)) {
+                    clientId = entry.clientId;
+                }
+            }
+        }
+        // If we could not find a match with serviceBaseUrl, and a default clientId
+        // was specified (i.e empty url), then use default clientId
+        if (clientId === undefined && defaultClientId !== undefined) {
+            clientId = defaultClientId;
+        }
+        return clientId;
+    }
+    get expiration() {
+        return this._expiration;
+    }
+    get arcGisOnlineClientId() {
+        var _a;
+        return (_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.arcgisOnlineClientId;
+    }
+    set arcGisOnlineClientId(clientId) {
+        if (this._clientIds === undefined) {
+            this._clientIds = { arcgisOnlineClientId: clientId };
+        }
+        this._clientIds.arcgisOnlineClientId = clientId;
+    }
+    get arcGisEnterpriseClientIds() {
+        var _a;
+        return (_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.enterpriseClientIds;
+    }
+    setEnterpriseClientId(serviceBaseUrl, clientId) {
+        var _a;
+        if ((_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.enterpriseClientIds) {
+            const foundIdx = this._clientIds.enterpriseClientIds.findIndex((entry) => entry.serviceBaseUrl === serviceBaseUrl);
+            if (foundIdx !== -1) {
+                this._clientIds.enterpriseClientIds[foundIdx].clientId = clientId;
+            }
+            else {
+                this._clientIds.enterpriseClientIds.push({ serviceBaseUrl, clientId });
+            }
+        }
+        else {
+            if (this._clientIds === undefined) {
+                this._clientIds = {};
+            }
+            this._clientIds.enterpriseClientIds = [{ serviceBaseUrl, clientId }];
+        }
+    }
+    removeEnterpriseClientId(clientId) {
+        var _a, _b, _c;
+        if ((_a = this._clientIds) === null || _a === void 0 ? void 0 : _a.enterpriseClientIds) {
+            this._clientIds.enterpriseClientIds = (_c = (_b = this._clientIds) === null || _b === void 0 ? void 0 : _b.enterpriseClientIds) === null || _c === void 0 ? void 0 : _c.filter((item) => item.serviceBaseUrl !== clientId.serviceBaseUrl);
+        }
+    }
+    /// //////////
+    /** @internal */
+    async getOAuthTokenForMapLayerUrl(mapLayerUrl) {
+        try {
+            const oauthEndpoint = await this.getOAuth2Endpoint(mapLayerUrl, ArcGisOAuth2EndpointType.Authorize);
+            if (oauthEndpoint !== undefined) {
+                const oauthEndpointUrl = new URL(oauthEndpoint.getUrl());
+                return ArcGisTokenManager.getOAuth2Token(oauthEndpointUrl.origin);
+            }
+        }
+        catch { }
+        return undefined;
+    }
+    /**
+    * Test if Oauth2 endpoint is accessible and has an associated appId
+    * @return true/false if validation succeeded, undefined if validation could not be performed (i.e CORS/network error)
+    * @internal
+    */
+    async validateOAuth2Endpoint(endpointUrl) {
+        // Check if we got a matching appId for that endpoint, otherwise its not worth going further
+        if (undefined === this.getMatchingEnterpriseClientId(endpointUrl)) {
+            return false;
+        }
+        let status;
+        try {
+            const data = await fetch(endpointUrl, { method: "GET" });
+            status = data.status;
+        }
+        catch (error) {
+            // fetch() throws when there is a CORS error, so in that case
+            // we cannot confirm if the oauth2 endpoint is valid or not, we return undefined
+            return undefined;
+        }
+        return status === 400; // Oauth2 API returns 400 (Bad Request) when there are missing parameters
+    }
+    /**
+   * Get OAuth2 endpoint that must be cause to get the Oauth2 token
+   * @internal
+   */
+    async getOAuth2Endpoint(url, endpoint) {
+        // Return from cache if available
+        const cachedEndpoint = (endpoint === ArcGisOAuth2EndpointType.Authorize ? this._oauthAuthorizeEndPointsCache.get(url) : this._oauthTokenEndPointsCache.get(url));
+        if (cachedEndpoint !== undefined) {
+            return cachedEndpoint;
+        }
+        const cacheResult = (obj) => {
+            if (endpoint === ArcGisOAuth2EndpointType.Authorize) {
+                this._oauthAuthorizeEndPointsCache.set(url, obj);
+            }
+            else {
+                this._oauthTokenEndPointsCache.set(url, obj);
+            }
+        };
+        const endpointStr = (endpoint === ArcGisOAuth2EndpointType.Authorize ? "authorize" : "token");
+        const urlObj = new URL(url);
+        if (urlObj.hostname.toLowerCase().endsWith("arcgis.com")) {
+            // ArcGIS Online (fixed)
+            // Doc: https://developers.arcgis.com/documentation/mapping-apis-and-services/security/oauth-2.0/
+            if (this.arcGisOnlineClientId === undefined) {
+                return undefined;
+            }
+            const oauth2Url = `https://www.arcgis.com/sharing/rest/oauth2/${endpointStr}`;
+            return new ArcGisOAuth2Endpoint(url, this.constructLoginUrl(oauth2Url, true), true);
+        }
+        else {
+            // First attempt: derive the Oauth2 token URL from the 'tokenServicesUrl', exposed by the 'info request'
+            let restUrlFromTokenService;
+            try {
+                restUrlFromTokenService = await ArcGisUrl.getRestUrlFromGenerateTokenUrl(urlObj);
+            }
+            catch { }
+            if (restUrlFromTokenService !== undefined) {
+                // Validate the URL we just composed
+                try {
+                    const oauth2Url = `${restUrlFromTokenService.toString()}oauth2/${endpointStr}`;
+                    const valid = await this.validateOAuth2Endpoint(oauth2Url);
+                    // We assume undefined means CORS error, that shouldn't prevent popup from displaying the login page.
+                    if (valid === undefined || valid) {
+                        const oauthEndpoint = new ArcGisOAuth2Endpoint(oauth2Url, this.constructLoginUrl(oauth2Url, false), false);
+                        cacheResult(oauthEndpoint);
+                        return oauthEndpoint;
+                    }
+                }
+                catch { }
+            }
+            // If reach this point, that means we could not derive the token endpoint from 'tokenServicesUrl', lets try something else.
+            // ArcGIS Enterprise Format https://<host>:<port>/<subdirectory>/sharing/rest/oauth2/authorize
+            const regExMatch = url.match(new RegExp(/([^&\/]+)\/rest\/services\/.*/, "i"));
+            if (regExMatch !== null && regExMatch.length >= 2) {
+                const subdirectory = regExMatch[1];
+                const port = (urlObj.port !== "80" && urlObj.port !== "443") ? `:${urlObj.port}` : "";
+                const newUrlObj = new URL(`${urlObj.protocol}//${urlObj.hostname}${port}/${subdirectory}/sharing/rest/oauth2/${endpointStr}`);
+                // Check again the URL we just composed
+                try {
+                    const newUrl = newUrlObj.toString();
+                    if (await this.validateOAuth2Endpoint(newUrl)) {
+                        const oauthEndpoint = new ArcGisOAuth2Endpoint(newUrl, this.constructLoginUrl(newUrl, false), false);
+                        cacheResult(oauthEndpoint);
+                        return oauthEndpoint;
+                    }
+                }
+                catch { }
+            }
+        }
+        return undefined; // we could not find any valid oauth2 endpoint
+    }
+    /**
+   * Construct the complete Authorize url to starts the Oauth process
+   * @internal
+   */
+    constructLoginUrl(url, isArcgisOnline) {
+        const urlObj = new URL(url);
+        // Set the client id
+        if (isArcgisOnline) {
+            const clientId = this.arcGisOnlineClientId;
+            assert(clientId !== undefined);
+            if (clientId !== undefined) {
+                urlObj.searchParams.set("client_id", clientId);
+            }
+        }
+        else {
+            const clientId = this.getMatchingEnterpriseClientId(url);
+            assert(clientId !== undefined);
+            if (undefined !== clientId) {
+                urlObj.searchParams.set("client_id", clientId);
+            }
+        }
+        urlObj.searchParams.set("response_type", "token");
+        if (this.expiration !== undefined) {
+            urlObj.searchParams.set("expiration", `${this.expiration}`);
+        }
+        if (this.redirectUri)
+            urlObj.searchParams.set("redirect_uri", this.redirectUri);
+        return urlObj.toString();
+    }
+}
 //# sourceMappingURL=ArcGisAccessClient.js.map