@esri/solutions-components 5.1.0-next.48 → 5.1.0-next.49

package/dist/chunks/Auth.js

@@ -1,26 +1,39 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-import * as o from "@esri/solution-common";
-import a from "@arcgis/core/identity/IdentityManager.js";
-import h from "@arcgis/core/identity/OAuthInfo.js";
-import c from "@arcgis/core/portal/Portal.js";
-import { x as p } from "./helpers.js";
-class S {
-  constructor(t, e, r, s) {
-    this._credential = void 0, this._isEnterprise = !1, this._locale = "en", this._portalSubset = void 0, this._portalUserSubset = void 0, this._arcGISOnlineReachable = !0, this._searchArcGISOnlineEnabled = !0, this._signInParam = void 0, this._clientId = t ?? "", this._locale = r ?? "en", this._portalUrl = e ?? "https://www.arcgis.com", this._portalRestUrl = this._portalUrl + "/sharing/rest", this._portalUrl = location.origin.endsWith(".arcgis.com") ? window.location.origin : this._portalUrl, this._signInParam = s;
-    const i = new h({
+import * as common from "@esri/solution-common";
+import IdentityManager from "@arcgis/core/identity/IdentityManager.js";
+import OAuthInfo from "@arcgis/core/identity/OAuthInfo.js";
+import M from "@arcgis/core/portal/Portal.js";
+import { x as getAnonymousPortalUrl } from "./helpers.js";
+class Auth {
+  constructor(clientId, portalURL, locale, signInParam) {
+    this._credential = void 0;
+    this._isEnterprise = false;
+    this._locale = "en";
+    this._portalSubset = void 0;
+    this._portalUserSubset = void 0;
+    this._arcGISOnlineReachable = true;
+    this._searchArcGISOnlineEnabled = true;
+    this._signInParam = void 0;
+    this._clientId = clientId ?? "";
+    this._locale = locale ?? "en";
+    this._portalUrl = portalURL ?? "https://www.arcgis.com";
+    this._portalRestUrl = this._portalUrl + "/sharing/rest";
+    this._portalUrl = location.origin.endsWith(".arcgis.com") ? window.location.origin : this._portalUrl;
+    this._signInParam = signInParam;
+    const info = new OAuthInfo({
       appId: this._clientId,
       locale: this._locale,
-      popup: !1,
+      popup: false,
       // inline redirects don't require any additional app configuration
       portalUrl: this._portalUrl,
-      preserveUrlHash: !0
+      preserveUrlHash: true
     });
     try {
-      a.registerOAuthInfos([i]);
-    } catch (n) {
-      console.log(n);
+      IdentityManager.registerOAuthInfos([info]);
+    } catch (error) {
+      console.log(error);
     }
-    this._portal = new c({ url: this._portalUrl });
+    this._portal = new M({ url: this._portalUrl });
   }
   get Credential() {
     return this._credential;
@@ -50,8 +63,11 @@ class S {
     return this._portalUserSubset;
   }
   get PortalUserPrivileges() {
-    let t = [];
-    return this._portalUserSubset?.privileges && (t = this._portalUserSubset.privileges), t;
+    let privileges = [];
+    if (this._portalUserSubset?.privileges) {
+      privileges = this._portalUserSubset.privileges;
+    }
+    return privileges;
   }
   get SignInParam() {
     return this._signInParam;
@@ -63,8 +79,12 @@ class S {
     return this.PortalUserPrivileges.includes("portal:admin:updateItems");
   }
   get CanUseAI() {
-    const t = this._portalSubset?.orgSettings, e = this.PortalUserPrivileges.includes("portal:user:useAIAssistants");
-    return t?.aiAssistantsEnabled ? t.aiAssistantsEnabled && !t.blockBetaApps && e : !1;
+    const orgSettings = this._portalSubset?.orgSettings;
+    const hasPrivilege = this.PortalUserPrivileges.includes("portal:user:useAIAssistants");
+    if (orgSettings?.aiAssistantsEnabled) {
+      return orgSettings.aiAssistantsEnabled && !orgSettings.blockBetaApps && hasPrivilege;
+    }
+    return false;
   }
   get CanViewOrg() {
     return this.PortalUserPrivileges.includes("portal:admin:viewItems");
@@ -73,25 +93,33 @@ class S {
     return this._searchArcGISOnlineEnabled && this._arcGISOnlineReachable;
   }
   /** Checks if the ArcGIS Online group is reachable for Enterprise portals. */
-  async checkArcGISOnlineReachability(t) {
-    if (this._isEnterprise && this._searchArcGISOnlineEnabled && t) {
-      const r = `${p(this._portalUrl)}/sharing/rest`, s = new o.UserSession({});
+  async checkArcGISOnlineReachability(agoBasedEnterpriseSolutionsGroupId) {
+    if (this._isEnterprise && this._searchArcGISOnlineEnabled && agoBasedEnterpriseSolutionsGroupId) {
+      const agolPortalUrl = getAnonymousPortalUrl(this._portalUrl);
+      const agolRestUrl = `${agolPortalUrl}/sharing/rest`;
+      const anonAgolSession = new common.UserSession({});
       try {
-        await o.searchItems({
-          q: `group:${t} type:Solution`,
+        await common.searchItems({
+          q: `group:${agoBasedEnterpriseSolutionsGroupId} type:Solution`,
           num: 1,
           start: 1,
-          authentication: s,
-          portal: r
-        }), this._arcGISOnlineReachable = !0;
-      } catch (i) {
-        this._arcGISOnlineReachable = !1, console.warn("ArcGIS Online solutions group not reachable:", i);
+          authentication: anonAgolSession,
+          portal: agolRestUrl
+        });
+        this._arcGISOnlineReachable = true;
+      } catch (error) {
+        this._arcGISOnlineReachable = false;
+        console.warn("ArcGIS Online solutions group not reachable:", error);
       }
     }
   }
   get RestUserSession() {
-    const t = a.findServerInfo(this._portalRestUrl), e = this._credential ? o.UserSession.fromCredential(this._credential, t) : this._isEnterprise ? new o.UserSession({}) : new o.UserSession({ portal: this._portalRestUrl });
-    return e.portal = this.PortalSubset?.restUrl ? this.PortalSubset?.restUrl : e.portal, e.clientId = this._credential?._oAuthCred?.appId, e._refreshToken = this._credential?._oAuthCred?.refreshToken, e;
+    const serverInfo = IdentityManager.findServerInfo(this._portalRestUrl);
+    const userSession = this._credential ? common.UserSession.fromCredential(this._credential, serverInfo) : this._isEnterprise ? new common.UserSession({}) : new common.UserSession({ portal: this._portalRestUrl });
+    userSession.portal = this.PortalSubset?.restUrl ? this.PortalSubset?.restUrl : userSession.portal;
+    userSession.clientId = this._credential?._oAuthCred?.appId;
+    userSession._refreshToken = this._credential?._oAuthCred?.refreshToken;
+    return userSession;
   }
   /**
    * Initializes the Auth object. This method must be called before any other Auth methods.
@@ -99,16 +127,19 @@ class S {
    *
    * @returns Promise that resolves with the initialized Auth object
    */
-  async initialize(t = !1, e) {
+  async initialize(isEnterprise = false, agoBasedEnterpriseSolutionsGroupId) {
     try {
-      await this._init(t, e);
-    } catch {
+      await this._init(isEnterprise, agoBasedEnterpriseSolutionsGroupId);
+    } catch (err) {
       this.destroy();
     }
     return this;
   }
   destroy() {
-    this._credential = void 0, this._portalSubset = void 0, this._portalUserSubset = void 0, a.destroyCredentials();
+    this._credential = void 0;
+    this._portalSubset = void 0;
+    this._portalUserSubset = void 0;
+    IdentityManager.destroyCredentials();
   }
   /**
    * Signs into app and refreshes the window.location or switches to the supplied URL.
@@ -116,19 +147,26 @@ class S {
    * @param signInParamValue If supplied, the parameter `signInParam` with the supplied value
    * will be added to the redirect uri's search params
    */
-  async signIn(t = "") {
-    a.setOAuthRedirectionHandler((e) => {
-      const r = e.authorizeParams.redirect_uri;
-      if (t.length > 0) {
-        const s = r.split("?"), i = s[0];
-        let n = "";
-        const l = new URLSearchParams(s[1] || "");
-        l.append("signInParam", t), n = "?" + l.toString(), e.authorizeParams.redirect_uri = i + n;
+  async signIn(signInParamValue = "") {
+    IdentityManager.setOAuthRedirectionHandler((info) => {
+      const redirectUri = info.authorizeParams.redirect_uri;
+      if (signInParamValue.length > 0) {
+        const redirectUriParts = redirectUri.split("?");
+        const redirectOriginPath = redirectUriParts[0];
+        let redirectSearch = "";
+        const redirectSearchParams = new URLSearchParams(redirectUriParts[1] || "");
+        redirectSearchParams.append("signInParam", signInParamValue);
+        redirectSearch = "?" + redirectSearchParams.toString();
+        info.authorizeParams.redirect_uri = redirectOriginPath + redirectSearch;
       }
-      window.location.href = e.authorizeUrl + "?" + this._objectToQuery(e.authorizeParams);
-    }), await a.getCredential((this._portalSubset?.portalUrl ?? this._portalUrl) + "/sharing").then(
-      (e) => {
-        e && window.location.reload();
+      window.location.href = info.authorizeUrl + "?" + this._objectToQuery(info.authorizeParams);
+      return;
+    });
+    await IdentityManager.getCredential((this._portalSubset?.portalUrl ?? this._portalUrl) + "/sharing").then(
+      (credential) => {
+        if (credential) {
+          window.location.reload();
+        }
       }
     );
   }
@@ -142,18 +180,23 @@ class S {
    *  on the resources page they should stay on that page
    */
   signOut() {
-    const t = window.location.href, e = /[\/]\b([0-9A-Fa-f]){32}\b/g;
-    let r = t.match(e) ? t.replace(e, "") : t;
-    const i = `${this._portal?.restUrl ?? this._portalUrl + "/sharing/rest"}/oauth2/signout?client_id=${this._clientId}&redirect_uri=${encodeURIComponent(r)}`;
-    this.destroy(), window.location.replace(i);
+    const href = window.location.href;
+    const idRegEx = /[\/]\b([0-9A-Fa-f]){32}\b/g;
+    let redirectUrl = href.match(idRegEx) ? href.replace(idRegEx, "") : href;
+    const restUrl = this._portal?.restUrl ?? this._portalUrl + "/sharing/rest";
+    const signOutUrl = `${restUrl}/oauth2/signout?client_id=${this._clientId}&redirect_uri=${encodeURIComponent(redirectUrl)}`;
+    this.destroy();
+    window.location.replace(signOutUrl);
   }
   /**
    * Refreshes the user session token
    */
   refreshSession() {
-    const t = this.RestUserSession;
-    if (!(!t || !this.IsSignedIn))
-      return t.exchangeRefreshToken();
+    const userSession = this.RestUserSession;
+    if (!userSession || !this.IsSignedIn) {
+      return void 0;
+    }
+    return userSession.exchangeRefreshToken();
   }
   // ---------------------------------------------------------------------------------------------------------------- //
   /**
@@ -163,29 +206,48 @@ class S {
    * @param portalCustomBaseUrl The custom base URL for the portal.
    * @returns
    */
-  _getOrgUrl(t, e, r) {
-    return e && r ? window.location.protocol + "//" + e.toLowerCase() + "." + r : t;
+  _getOrgUrl(portalUrl, portalUrlKey, portalCustomBaseUrl) {
+    if (portalUrlKey && portalCustomBaseUrl) {
+      return window.location.protocol + "//" + portalUrlKey.toLowerCase() + "." + portalCustomBaseUrl;
+    } else {
+      return portalUrl;
+    }
   }
   /**
    * Initializes the Auth object. This method must be called before any other Auth methods.
    * If the user is not authorized to use the app, the page will be redirected to an error page.
    * @returns Promise that resolves with the initialized Auth object
    */
-  async _init(t = !1, e) {
+  async _init(isEnterprise = false, agoBasedEnterpriseSolutionsGroupId) {
     try {
-      this._credential = await a.checkSignInStatus(this._portalUrl + "/sharing");
-    } catch (s) {
-      console.log(s);
+      this._credential = await IdentityManager.checkSignInStatus(this._portalUrl + "/sharing");
+    } catch (error) {
+      console.log(error);
     }
     try {
-      const s = await a.checkAppAccess(this._portalUrl + "/sharing", this._clientId);
-      (typeof s.valid < "u" && !s.valid || s.viewOnlyUserTypeApp) && window.location.replace(`error.html?error=blocked&locale=${this._locale}`), this._credential = s.credential;
-    } catch (s) {
-      s.name;
+      const response = await IdentityManager.checkAppAccess(this._portalUrl + "/sharing", this._clientId);
+      if (typeof response.valid !== "undefined" && !response.valid || response.viewOnlyUserTypeApp) {
+        window.location.replace(`error.html?error=blocked&locale=${this._locale}`);
+      }
+      this._credential = response.credential;
+    } catch (err) {
+      if (err.name !== "identity-manager:not-authenticated") ;
     }
-    this._searchArcGISOnlineEnabled = await this._checkSearchArcGISOnlineEnabled(t, this._portal.restUrl), this._portal.authMode = t ? "immediate" : "auto", await this._portal.load();
-    const r = this._credential ? await o.getOrganizationSettings(this.RestUserSession) : {};
-    return this._isEnterprise = this._portal.isPortal, await this.checkArcGISOnlineReachability(e), this._portalSubset = {
+    this._searchArcGISOnlineEnabled = await this._checkSearchArcGISOnlineEnabled(isEnterprise, this._portal.restUrl);
+    this._portal.authMode = isEnterprise ? "immediate" : "auto";
+    await this._portal.load();
+    console.log("&&&&&&&");
+    if (this._credential && !this._credential.token) {
+      await this._credential?.refreshToken();
+      if (this._credential.expires) {
+        const newDate = new Date(this._credential.expires);
+        this.RestUserSession.updateToken(this._credential.token, newDate);
+      }
+    }
+    const orgSettings = this._credential ? await common.getOrganizationSettings(this.RestUserSession) : {};
+    this._isEnterprise = this._portal.isPortal;
+    await this.checkArcGISOnlineReachability(agoBasedEnterpriseSolutionsGroupId);
+    this._portalSubset = {
       name: this._portal.name ?? "",
       id: this._portal.id ?? "",
       restUrl: this._portal.restUrl ?? "",
@@ -194,11 +256,12 @@ class S {
       hostName: this._portal.portalHostname ?? "",
       orgUrl: this._getOrgUrl(this._portal.url, this._portal.urlKey ?? "", this._portal.customBaseUrl ?? ""),
       locationTrackingEnabled: this._portal.helperServices.hasOwnProperty("locationTracking"),
-      hubPremiumEnabled: this._portal.portalProperties?.hub?.enabled || !1,
+      hubPremiumEnabled: this._portal.portalProperties?.hub?.enabled || false,
       workflowURL: this._portal.helperServices?.workflowManager?.url ?? this._portal.url,
       isReadOnly: this._portal.isReadOnly,
-      orgSettings: r
-    }, this._portalUserSubset = {
+      orgSettings
+    };
+    this._portalUserSubset = {
       fullName: this._portal.user?.fullName ?? "",
       username: this._portal.user?.username ?? "",
       culture: this._portal.user?.culture?.toLowerCase() || "en",
@@ -207,23 +270,38 @@ class S {
       privileges: this._portal.user.privileges,
       role: this._portal.user?.role ?? "",
       roleId: this._portal.user?.roleId ?? void 0
-    }, this._isEnterprise && this._portalSubset && (this._portalSubset.workflowURL = await o.getWorkflowEnterpriseServerRootURL(
-      this._portal.restUrl,
-      this.RestUserSession || new o.UserSession({})
-    )), this._portal?.user?.roleId && this._portalUserSubset && (this._portalUserSubset.roleId = this._portal.user.roleId), this;
+    };
+    if (this._isEnterprise && this._portalSubset) {
+      this._portalSubset.workflowURL = await common.getWorkflowEnterpriseServerRootURL(
+        this._portal.restUrl,
+        this.RestUserSession || new common.UserSession({})
+      );
+    }
+    if (this._portal?.user?.roleId && this._portalUserSubset) {
+      this._portalUserSubset.roleId = this._portal.user.roleId;
+    }
+    return this;
   }
-  async _checkSearchArcGISOnlineEnabled(t, e) {
-    if (t)
+  async _checkSearchArcGISOnlineEnabled(isEnterprise, portalRestUrl) {
+    if (isEnterprise) {
       try {
-        const r = `${e}/portals/self/settings`, s = await o.request(r, {
-          authentication: this._credential ? this.RestUserSession : void 0
+        const portalSettingsUrl = `${portalRestUrl}/portals/self/settings`;
+        const refAuth = this._credential ? this.RestUserSession : void 0;
+        const portalSettings = await common.request(portalSettingsUrl, {
+          authentication: refAuth
         });
-        return s?.portalConfigProperties?.searchArcGISOnlineEnabled !== void 0 ? s.portalConfigProperties.searchArcGISOnlineEnabled : !1;
-      } catch (r) {
-        return console.warn("Failed to fetch portal settings:", r), !1;
+        if (portalSettings?.portalConfigProperties?.searchArcGISOnlineEnabled !== void 0) {
+          return portalSettings.portalConfigProperties.searchArcGISOnlineEnabled;
+        } else {
+          return false;
+        }
+      } catch (error) {
+        console.warn("Failed to fetch portal settings:", error);
+        return false;
       }
-    else
-      return !0;
+    } else {
+      return true;
+    }
   }
   /**
    * Checks if an object is serializable.
@@ -231,8 +309,8 @@ class S {
    * This function checks if the object has a `toJSON` method, which is a
    * @returns Boolean indicating whether the object is serializable.
    */
-  _isSerializable(t) {
-    return t && typeof t == "object" && "toJSON" in t && typeof t.toJSON == "function";
+  _isSerializable(obj) {
+    return obj && typeof obj === "object" && "toJSON" in obj && typeof obj.toJSON === "function";
   }
   /**
    * Converts a hashmap of query parameters to a query string. Following formatting rules applies:
@@ -267,16 +345,38 @@ class S {
    *
    * Copied from function exported in arcgis-js-api but not added to JSAPI.
    */
-  _objectToQuery(t, e) {
-    return t ? e && typeof e == "function" ? Object.keys(t).map((r) => encodeURIComponent(r) + "=" + encodeURIComponent(e(r, t[r]))).join("&") : Object.keys(t).map((r) => {
-      const s = t[r];
-      if (s == null)
+  _objectToQuery(queryParameters, replacers) {
+    if (!queryParameters) {
+      return "";
+    }
+    if (replacers && typeof replacers === "function") {
+      return Object.keys(queryParameters).map((key) => encodeURIComponent(key) + "=" + encodeURIComponent(replacers(key, queryParameters[key]))).join("&");
+    }
+    return Object.keys(queryParameters).map((key) => {
+      const value = queryParameters[key];
+      if (value == void 0) {
         return "";
-      const i = encodeURIComponent(r) + "=", n = e && e[r];
-      return n ? i + encodeURIComponent(n(s)) : Array.isArray(s) ? s.map((l) => this._isSerializable(l) ? i + encodeURIComponent(JSON.stringify(l)) : i + encodeURIComponent(l)).join("&") : this._isSerializable(s) ? i + encodeURIComponent(JSON.stringify(s)) : i + encodeURIComponent(s);
-    }).filter((r) => r).join("&") : "";
+      }
+      const assign = encodeURIComponent(key) + "=";
+      const replacer = replacers && replacers[key];
+      if (replacer) {
+        return assign + encodeURIComponent(replacer(value));
+      }
+      if (Array.isArray(value)) {
+        return value.map((child) => {
+          if (this._isSerializable(child)) {
+            return assign + encodeURIComponent(JSON.stringify(child));
+          }
+          return assign + encodeURIComponent(child);
+        }).join("&");
+      }
+      if (this._isSerializable(value)) {
+        return assign + encodeURIComponent(JSON.stringify(value));
+      }
+      return assign + encodeURIComponent(value);
+    }).filter((value) => value).join("&");
   }
 }
 export {
-  S as A
+  Auth as A
 };

package/dist/chunks/_commonjsHelpers.js

@@ -1,7 +1,7 @@
 /* COPYRIGHT Esri - https://js.arcgis.com/5.1/LICENSE.txt */
-function e(t) {
-  return t && t.__esModule && Object.prototype.hasOwnProperty.call(t, "default") ? t.default : t;
+function getDefaultExportFromCjs(x) {
+  return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
 export {
-  e as g
+  getDefaultExportFromCjs as g
 };