@opengeoweb/authentication 9.26.0 → 9.27.0

package/index.esm.js

@@ -6951,7 +6951,8 @@ const refreshAccessTokenAndSetAuthContext = ({
   auth,
   onSetAuth,
   config,
-  timeout: _timeout2 = DEFAULT_TIMEOUT
+  timeout: _timeout2 = DEFAULT_TIMEOUT,
+  configURLS
 }) => __awaiter(void 0, void 0, void 0, function* () {
   try {
     const refreshedToken = yield refreshAccessToken({
@@ -6959,11 +6960,15 @@ const refreshAccessTokenAndSetAuthContext = ({
       config,
       timeout: _timeout2
     });
-    const newAuth = makeCredentialsFromTokenResponse(refreshedToken);
+    const newAuth = makeCredentialsFromTokenResponse(refreshedToken, configURLS);
     // Cognito does not send a new refresh token, but gitlab does. Set it here into the auth context.
     if (!newAuth.refresh_token || newAuth.refresh_token.length === 0) {
       newAuth.refresh_token = auth.refresh_token;
     }
+    // If the prop for the role config is not set, keep the roles of the current auth context.
+    if (!configURLS) {
+      newAuth.roles = auth.roles;
+    }
     onSetAuth(newAuth);
   } catch (e) {
     onSetAuth(Object.assign(Object.assign({}, auth), {
@@ -7158,7 +7163,8 @@ const AuthenticationContext = /*#__PURE__*/React__default.createContext({
   auth: null,
   onSetAuth: null,
   authConfig: null,
-  sessionStorageProvider: null
+  sessionStorageProvider: null,
+  currentRole: null
 });
 const useAuthenticationDefaultProps = () => {
   const [isLoggedIn, onLogin] = React__default.useState(false);
@@ -7188,12 +7194,15 @@ const useAuthenticationDefaultProps = () => {
     }
   };
   const sessionStorageProvider = getSessionStorageProvider();
+  const [currentRole, setCurrentRole] = React__default.useState(auth.roles && auth.roles[0] || GEOWEB_ROLE_USER);
   return {
     isLoggedIn,
     onLogin,
     auth: isLoggedIn ? auth : null,
     onSetAuth,
-    sessionStorageProvider
+    sessionStorageProvider,
+    currentRole,
+    setCurrentRole
   };
 };
 const AuthenticationProvider = ({
@@ -7207,7 +7216,9 @@ const AuthenticationProvider = ({
     onLogin,
     auth,
     onSetAuth,
-    sessionStorageProvider
+    sessionStorageProvider,
+    currentRole,
+    setCurrentRole
   } = value || defaultValues;
   const authConfig = _configURLS;
   const interval = useRef();
@@ -7224,7 +7235,8 @@ const AuthenticationProvider = ({
               authTokenURL: _configURLS.GW_AUTH_TOKEN_URL,
               appURL: _configURLS.GW_APP_URL,
               authClientId: _configURLS.GW_AUTH_CLIENT_ID
-            }
+            },
+            configURLS: _configURLS
           });
         }
       }
@@ -7232,15 +7244,17 @@ const AuthenticationProvider = ({
     return () => {
       clearInterval(interval.current);
     };
-  }, [auth, _configURLS.GW_APP_URL, _configURLS.GW_AUTH_CLIENT_ID, _configURLS.GW_AUTH_TOKEN_URL, onSetAuth]);
+  }, [auth, _configURLS.GW_APP_URL, _configURLS.GW_AUTH_CLIENT_ID, _configURLS.GW_AUTH_TOKEN_URL, onSetAuth, _configURLS]);
   const contextValue = React__default.useMemo(() => ({
     isLoggedIn,
     onLogin,
     auth,
     onSetAuth,
     authConfig,
-    sessionStorageProvider
-  }), [isLoggedIn, onLogin, auth, onSetAuth, authConfig, sessionStorageProvider]);
+    sessionStorageProvider,
+    currentRole,
+    setCurrentRole
+  }), [isLoggedIn, onLogin, auth, onSetAuth, authConfig, sessionStorageProvider, currentRole, setCurrentRole]);
   return jsx(AuthenticationContext.Provider, Object.assign({
     value: contextValue
   }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/authentication",
-  "version": "9.26.0",
+  "version": "9.27.0",
   "description": "GeoWeb authentication library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,13 +14,15 @@
     "@opengeoweb/theme": "*",
     "i18next": "^23.11.5",
     "react-i18next": "^14.1.2",
-    "@opengeoweb/snackbar": "9.26.0",
+    "@opengeoweb/snackbar": "9.27.0",
     "react-redux": "^8.1.3",
     "@reduxjs/toolkit": "^1.9.7",
     "@mui/material": "^5.16.0"
   },
   "peerDependencies": {
-    "react": "18"
+    "react": "18",
+    "@emotion/react": "*",
+    "@emotion/styled": "*"
   },
   "module": "./index.esm.js",
   "type": "module",

package/src/lib/components/ApiContext/utils.d.ts

@@ -17,7 +17,9 @@ export declare const GEOWEB_ROLE_USER: Role;
  */
 export declare const makeCredentialsFromTokenResponse: (tokenResponse: AxiosResponse, authConfig?: ConfigType) => Credentials;
 export declare const refreshAccessToken: ({ auth, config: { authTokenURL, authClientId, appURL }, timeout, }: CreateApiProps) => Promise<AxiosResponse>;
-export declare const refreshAccessTokenAndSetAuthContext: ({ auth, onSetAuth, config, timeout, }: CreateApiProps) => Promise<void>;
+export declare const refreshAccessTokenAndSetAuthContext: ({ auth, onSetAuth, config, timeout, configURLS, }: CreateApiProps & {
+    configURLS?: ConfigType | undefined;
+}) => Promise<void>;
 export declare const createApiInstance: ({ auth, onSetAuth, config: { baseURL, authTokenURL, authClientId, appURL }, timeout, }: CreateApiProps) => AxiosInstance;
 export declare const createNonAuthApiInstance: ({ config: { baseURL }, timeout, }: CreateApiProps) => AxiosInstance;
 export declare const fakeApiRequest: (signal?: AbortController) => Promise<void>;

package/src/lib/components/AuthenticationContext/types.d.ts

@@ -1,5 +1,5 @@
 import { SessionStorageProvider } from '../../utils/session';
-import { Credentials } from '../ApiContext/types';
+import { Credentials, Role } from '../ApiContext/types';
 export interface AuthenticationConfig {
     GW_AUTH_LOGIN_URL: string;
     GW_AUTH_LOGOUT_URL: string;
@@ -16,6 +16,8 @@ export interface AuthenticationDefaultStateProps {
     auth: Credentials | null;
     onSetAuth: (auth: Credentials) => void;
     sessionStorageProvider: SessionStorageProvider;
+    currentRole?: Role;
+    setCurrentRole?: (newRole: Role) => void;
 }
 export interface AuthenticationContextProps extends AuthenticationDefaultStateProps {
     authConfig: AuthenticationConfig;