@arkitektbedriftene/fe-lib 7.2.0 → 7.3.1

package/dist/oidc/AuthManager.d.ts

@@ -22,7 +22,8 @@ export type ImpersonationData = {
 export declare class AuthManager {
     private userManager;
     private storageKey;
-    constructor(settings: UserManagerSettings);
+    private meEndpoint;
+    constructor(settings: UserManagerSettings, meEndpoint: string);
     /**
      * Get impersonation user from localStorage
      */
@@ -43,7 +44,7 @@ export declare class AuthManager {
     /**
      * Set impersonation with access token
      */
-    setImpersonation(accessToken: string): void;
+    setImpersonation(accessToken: string): Promise<void>;
     /**
      * Clear impersonation and return to normal user
      */
@@ -51,5 +52,5 @@ export declare class AuthManager {
     /**
      * Handle impersonation callback from URL parameters
      */
-    handleImpersonationCallback(urlStr: string): void;
+    handleImpersonationCallback(urlStr: string): Promise<void>;
 }

package/dist/oidc.es.js

@@ -1,79 +1,80 @@
-var v = Object.defineProperty;
-var R = (t, e, r) => e in t ? v(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var g = (t, e, r) => R(t, typeof e != "symbol" ? e + "" : e, r);
+var E = Object.defineProperty;
+var v = (t, e, n) => e in t ? E(t, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : t[e] = n;
+var f = (t, e, n) => v(t, typeof e != "symbol" ? e + "" : e, n);
 import { jsx as w } from "react/jsx-runtime";
-import { createContext as I, useContext as k, useMemo as U, useEffect as f, useState as L, useRef as x, useCallback as d } from "react";
-import { UserManager as P } from "oidc-client-ts";
+import { createContext as I, useContext as U, useMemo as k, useEffect as h, useState as R, useRef as x, useCallback as m } from "react";
+import { UserManager as L } from "oidc-client-ts";
 export * from "oidc-client-ts";
-import T from "use-local-storage-state";
-import { jwtDecode as y } from "jwt-decode";
-const E = I(
+import P from "use-local-storage-state";
+import { jwtDecode as T } from "jwt-decode";
+const y = I(
   null
 ), b = () => {
-  const t = k(E);
+  const t = U(y);
   if (!t)
     throw new Error(
       "useImpersonationContext must be used within a ImpersonationContextProvider"
     );
   return t;
-}, V = ({
+}, q = ({
   children: t
 }) => {
-  const [e, r] = T("impersonationState", {
+  const [e, n] = P("impersonationState", {
     defaultValue: {}
-  }), n = U(() => ({
+  }), s = k(() => ({
     accessToken: e == null ? void 0 : e.accessToken,
     userInfo: e == null ? void 0 : e.userInfo,
     setImpersonation: (o, i) => {
-      r({ accessToken: o, userInfo: i });
+      n({ accessToken: o, userInfo: i });
     }
   }), []);
-  return /* @__PURE__ */ w(E.Provider, { value: n, children: t });
-}, q = (t) => {
+  return /* @__PURE__ */ w(y.Provider, { value: s, children: t });
+}, V = (t) => {
   const { setImpersonation: e } = b();
-  f(() => {
-    const { search: r } = window.location, n = new URLSearchParams(r).get(
+  h(() => {
+    const { search: n } = window.location, s = new URLSearchParams(n).get(
       "impersonateAccessToken"
     );
-    if (n && e) {
-      const o = y(n);
-      e(n, o), t();
+    if (s && e) {
+      const o = T(s);
+      e(s, o), t();
     }
   }, []);
 };
 function B(t) {
-  return JSON.parse(t).map((n) => {
+  return JSON.parse(t).map((s) => {
     const [
       o,
       i,
       u,
       a,
       l
-    ] = n.split("|"), m = a.split(",");
+    ] = s.split("|"), d = a.split(",");
     return {
       CustomerExternalId: o,
       CustomerFirmId: i,
       CustomerFirmName: u,
-      CustomerUserRoles: m,
+      CustomerUserRoles: d,
       CustomerUserIsAdmin: l === "True" || l === "1"
     };
   });
 }
-const G = [
+const $ = [
   "97",
   "131",
   "132",
   "141"
-], H = [
+], G = [
   "3"
-], Q = [
+], H = [
   "0"
 ];
-class W {
-  constructor(e) {
-    g(this, "userManager");
-    g(this, "storageKey", "impersonationState");
-    this.userManager = new P(e);
+class Q {
+  constructor(e, n) {
+    f(this, "userManager");
+    f(this, "storageKey", "impersonationState");
+    f(this, "meEndpoint");
+    this.userManager = new L(e), this.meEndpoint = n;
   }
   /**
    * Get impersonation user from localStorage
@@ -82,11 +83,11 @@ class W {
     try {
       const e = localStorage.getItem(this.storageKey);
       if (e) {
-        const r = JSON.parse(e);
-        if (r.impersonationToken && r.impersonatedUser) {
-          if (Math.floor(Date.now() / 1e3) >= r.impersonatedUser.exp)
+        const n = JSON.parse(e);
+        if (n.impersonationToken && n.impersonatedUser) {
+          if (Math.floor(Date.now() / 1e3) >= n.impersonatedUser.exp)
             throw new Error("Impersonation token has expired");
-          return r;
+          return n;
         }
       }
     } catch (e) {
@@ -105,10 +106,10 @@ class W {
         profile: e.impersonatedUser,
         impersonating: !0
       };
-    const r = await this.userManager.getUser();
-    return !r || r.expired ? null : {
-      access_token: r.access_token,
-      profile: r.profile,
+    const n = await this.userManager.getUser();
+    return !n || n.expired ? null : {
+      access_token: n.access_token,
+      profile: n.profile,
       impersonating: !1
     };
   }
@@ -132,15 +133,20 @@ class W {
   /**
    * Set impersonation with access token
    */
-  setImpersonation(e) {
+  async setImpersonation(e) {
     try {
-      const n = {
-        impersonatedUser: y(e),
+      const o = {
+        impersonatedUser: await (await fetch(this.meEndpoint, {
+          headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${e}`
+          }
+        })).json(),
         impersonationToken: e
       };
-      localStorage.setItem(this.storageKey, JSON.stringify(n));
-    } catch (r) {
-      console.error("Failed to decode impersonation token:", r);
+      localStorage.setItem(this.storageKey, JSON.stringify(o));
+    } catch (n) {
+      console.error("Failed to set impersonation token:", n);
     }
   }
   /**
@@ -152,48 +158,48 @@ class W {
   /**
    * Handle impersonation callback from URL parameters
    */
-  handleImpersonationCallback(e) {
-    const n = new URL(e).searchParams.get("impersonateAccessToken");
-    if (!n)
+  async handleImpersonationCallback(e) {
+    const s = new URL(e).searchParams.get("impersonateAccessToken");
+    if (!s)
       throw new Error("Missing url param 'impersonateAccessToken'");
-    this.setImpersonation(n);
+    return this.setImpersonation(s);
   }
 }
 const O = ({
   userManager: t,
   context: e,
-  children: r
+  children: n
 }) => {
-  const [n, o] = L({
+  const [s, o] = R({
     user: null,
     isLoading: !0,
     isAuthenticated: !1,
     isError: !1,
     error: null
   }), i = x(!1);
-  f(() => {
+  h(() => {
     i.current || (i.current = !0, (async () => {
       try {
-        const s = await t.getUser();
+        const r = await t.getUser();
         o({
-          user: s,
+          user: r,
           isLoading: !1,
-          isAuthenticated: s ? !s.expired : !1,
+          isAuthenticated: r ? !r.expired : !1,
           isError: !1,
           error: null
         });
-      } catch (s) {
+      } catch (r) {
         o({
           user: null,
           isLoading: !1,
           isAuthenticated: !1,
           isError: !0,
-          error: s instanceof Error ? s : new Error("Unknown error during auth")
+          error: r instanceof Error ? r : new Error("Unknown error during auth")
         });
       }
     })());
-  }, [t]), f(() => {
-    const s = (p) => {
+  }, [t]), h(() => {
+    const r = (p) => {
       o({
         user: p,
         isLoading: !1,
@@ -202,10 +208,10 @@ const O = ({
         error: null
       });
     };
-    t.events.addUserLoaded(s);
+    t.events.addUserLoaded(r);
     const c = () => {
       o({
-        ...n,
+        ...s,
         user: null,
         isAuthenticated: !1
       });
@@ -213,41 +219,41 @@ const O = ({
     t.events.addUserUnloaded(c);
     const S = (p) => {
       o({
-        ...n,
+        ...s,
         isLoading: !1,
         isError: !0,
         error: p
       });
     };
     return t.events.addSilentRenewError(S), () => {
-      t.events.removeUserLoaded(s), t.events.removeUserUnloaded(c), t.events.removeSilentRenewError(S);
+      t.events.removeUserLoaded(r), t.events.removeUserUnloaded(c), t.events.removeSilentRenewError(S);
     };
   }, [t]);
-  const u = d(async () => {
-    const s = await t.signinCallback();
+  const u = m(async () => {
+    const r = await t.signinCallback();
     return o({
-      user: s ?? null,
+      user: r ?? null,
       isLoading: !1,
-      isAuthenticated: s ? !s.expired : !1,
+      isAuthenticated: r ? !r.expired : !1,
       isError: !1,
       error: null
-    }), s ?? void 0;
-  }, [t]), a = d(
-    async (s) => {
+    }), r ?? void 0;
+  }, [t]), a = m(
+    async (r) => {
       try {
-        await t.signinRedirect(s);
+        await t.signinRedirect(r);
       } catch (c) {
         console.error(c);
       }
     },
     [t]
-  ), l = d(
-    async (s) => await t.signinPopup(s),
+  ), l = m(
+    async (r) => await t.signinPopup(r),
     [t]
-  ), m = d(
-    async (s) => {
+  ), d = m(
+    async (r) => {
       try {
-        return await t.signinSilent(s);
+        return await t.signinSilent(r);
       } catch (c) {
         return o({
           user: null,
@@ -259,36 +265,36 @@ const O = ({
       }
     },
     [t]
-  ), h = d(
-    async (s) => {
+  ), g = m(
+    async (r) => {
       try {
-        await t.signoutRedirect(s);
+        await t.signoutRedirect(r);
       } catch (c) {
         console.error(c);
       }
     },
     [t]
-  ), C = U(
+  ), C = k(
     () => ({
-      state: n,
+      state: s,
       handleSigninCallback: u,
       redirectToSignin: a,
-      signinSilent: m,
+      signinSilent: d,
       signinPopup: l,
-      logout: h
+      logout: g
     }),
     [
-      n,
+      s,
       u,
       a,
-      m,
+      d,
       l,
-      h
+      g
     ]
   );
-  return /* @__PURE__ */ w(e.Provider, { value: C, children: r });
+  return /* @__PURE__ */ w(e.Provider, { value: C, children: n });
 }, A = (t) => {
-  const e = k(t);
+  const e = U(t);
   if (!e)
     throw new Error("useAuthContext must be used within an AuthProvider");
   return e;
@@ -296,15 +302,15 @@ const O = ({
   const { state: e } = A(t);
   return e;
 }, K = (t, e) => {
-  const { state: r, handleSigninCallback: n } = A(t), o = x(!1);
-  return f(() => {
-    o.current || (o.current = !0, n().then(
+  const { state: n, handleSigninCallback: s } = A(t), o = x(!1);
+  return h(() => {
+    o.current || (o.current = !0, s().then(
       (i) => new Promise(
         (u) => setTimeout(() => u(i), 0)
       )
     ).then((i) => e == null ? void 0 : e(i)));
-  }, [n]), r;
-}, X = (t) => {
+  }, [s]), n;
+}, W = (t) => {
   const e = I(null);
   return {
     AuthContext: e,
@@ -319,13 +325,13 @@ const O = ({
   };
 };
 export {
-  W as AuthManager,
-  V as ImpersonationContextProvider,
-  G as ROLESAdminInCompany,
-  Q as ROLESAnsatt,
-  H as ROLESMAKSAdministrator,
-  X as createAuthContext,
+  Q as AuthManager,
+  q as ImpersonationContextProvider,
+  $ as ROLESAdminInCompany,
+  H as ROLESAnsatt,
+  G as ROLESMAKSAdministrator,
+  W as createAuthContext,
   B as parseUserProfileFCString,
-  q as useImpersonationCallback,
+  V as useImpersonationCallback,
   b as useImpersonationContext
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkitektbedriftene/fe-lib",
-  "version": "7.2.0",
+  "version": "7.3.1",
   "type": "module",
   "exports": {
     "./oidc": {