@opengeoweb/authentication 9.17.0 → 9.19.0

package/index.esm.js

@@ -2,7 +2,7 @@ import React, { useRef } from 'react';
 import axios from 'axios';
 import { Navigate, useLocation, Link } from 'react-router-dom';
 import { useIsMounted, AlertBanner } from '@opengeoweb/shared';
-import { KEEP_ALIVE_POLLER_IN_SECONDS, MILLISECOND_TO_SECOND, getCurrentTimeInSeconds, refreshAccessTokenAndSetAuthContext, makeCredentialsFromTokenResponse } from '@opengeoweb/api';
+import { KEEP_ALIVE_POLLER_IN_SECONDS, MILLISECOND_TO_SECOND, getCurrentTimeInSeconds, refreshAccessTokenAndSetAuthContext, makeCredentialsFromTokenResponse, GEOWEB_ROLE_USER } from '@opengeoweb/api';
 import { ThemeWrapper } from '@opengeoweb/theme';
 import { useTranslation, Trans } from 'react-i18next';
 import 'i18next';
@@ -355,10 +355,10 @@ var SHARED = '__core-js_shared__';
 var store$3 = sharedStore.exports = globalThis$1[SHARED] || defineGlobalProperty$2(SHARED, {});
 
 (store$3.versions || (store$3.versions = [])).push({
-  version: '3.36.1',
+  version: '3.37.1',
   mode: 'global',
   copyright: '© 2014-2024 Denis Pushkarev (zloirock.ru)',
-  license: 'https://github.com/zloirock/core-js/blob/v3.36.1/LICENSE',
+  license: 'https://github.com/zloirock/core-js/blob/v3.37.1/LICENSE',
   source: 'https://github.com/zloirock/core-js'
 });
 
@@ -5570,7 +5570,9 @@ const authConfigKeys = {
   GW_AUTH_TOKEN_URL: null,
   GW_APP_URL: null,
   GW_BE_VERSION_BASE_URL: null,
-  GW_AUTH_CLIENT_ID: null
+  GW_AUTH_CLIENT_ID: null,
+  GW_AUTH_ROLE_CLAIM_NAME: null,
+  GW_AUTH_ROLE_CLAIM_VALUE_PRESETS_ADMIN: null
 };
 const getRandomString = () => {
   const array = new Uint32Array(8);
@@ -5594,7 +5596,9 @@ const getAuthConfig = _configUrls => {
     GW_AUTH_TOKEN_URL,
     GW_APP_URL,
     GW_BE_VERSION_BASE_URL,
-    GW_AUTH_CLIENT_ID
+    GW_AUTH_CLIENT_ID,
+    GW_AUTH_ROLE_CLAIM_NAME,
+    GW_AUTH_ROLE_CLAIM_VALUE_PRESETS_ADMIN
   } = _configUrls;
   const sessionStorageProvider = getSessionStorageProvider();
   const loginUrl = replaceTemplateKeys(GW_AUTH_LOGIN_URL, GW_AUTH_CLIENT_ID, GW_APP_URL, sessionStorageProvider.getOauthState(), sessionStorageProvider.getOauthCodeChallenge());
@@ -5605,7 +5609,9 @@ const getAuthConfig = _configUrls => {
     GW_AUTH_TOKEN_URL,
     GW_APP_URL,
     GW_BE_VERSION_BASE_URL,
-    GW_AUTH_CLIENT_ID
+    GW_AUTH_CLIENT_ID,
+    GW_AUTH_ROLE_CLAIM_NAME,
+    GW_AUTH_ROLE_CLAIM_VALUE_PRESETS_ADMIN
   };
 };
 const AuthenticationContext = /*#__PURE__*/React.createContext({
@@ -5621,6 +5627,7 @@ const useAuthenticationDefaultProps = () => {
   const [hasConnectionIssue, setHasConnectionIssue] = React.useState(false);
   const emptyCredentials = {
     username: '',
+    roles: [],
     token: '',
     refresh_token: '',
     expires_at: 0,
@@ -5762,7 +5769,7 @@ const HandleOAuth2Code = () => {
     };
     try {
       const res = yield axiosInstance.post(authConfig.GW_AUTH_TOKEN_URL, data, config);
-      const newAuth = makeCredentialsFromTokenResponse(res);
+      const newAuth = makeCredentialsFromTokenResponse(res, authConfig);
       if (isMounted.current) {
         onSetAuth(newAuth);
         onLogin(true);
@@ -5939,7 +5946,7 @@ const UserMenuRoles = ({
       color: 'geowebColors.typographyAndIcons.text',
       opacity: 1
     }
-  }, t('auth-role-title')), roles.map(role => ( /*#__PURE__*/React.createElement(FormControlLabel, {
+  }, t('auth-role-title')), roles && roles.map(role => ( /*#__PURE__*/React.createElement(FormControlLabel, {
     control: /*#__PURE__*/React.createElement(Radio, {
       disabled: isLoading,
       checked: _currentRole === role.name
@@ -6699,18 +6706,12 @@ $({ target: 'Promise', stat: true, forced: FORCED_PROMISE_CONSTRUCTOR }, {
   }
 });
 
-const roles = [{
-  name: 'preset-admin',
-  title: 'Preset-admin'
-}, {
-  name: 'user',
-  title: 'User'
-}];
 const UserMenuRolesConnect = ({
-  temporaryOnChangeRoleForDemo: _temporaryOnChangeRoleForDemo = () => {}
+  temporaryOnChangeRoleForDemo: _temporaryOnChangeRoleForDemo = () => {},
+  roles
 }) => {
   const [isLoading, setIsLoading] = React.useState(false);
-  const [currentRole, setCurrentRole] = React.useState(roles[1].name);
+  const [currentRole, setCurrentRole] = React.useState(GEOWEB_ROLE_USER.name);
   const dispatch = useDispatch();
   const {
     t
@@ -6772,4 +6773,4 @@ const RequireAuth = ({
   }));
 };
 
-export { AUTH_NAMESPACE, AuthenticationContext, AuthenticationProvider, HandleOAuth2Code as Code, OAuth2Login as Login, OAuth2Logout as Logout, RequireAuth, SessionStorageKey, UserMenuRoles, UserMenuRolesConnect, authTranslations, getAuthConfig, getCodeChallenge, getCurrentUrlLocation, getRandomString, getSessionStorageProvider, roles, useAuthenticationContext, useAuthenticationDefaultProps };
+export { AUTH_NAMESPACE, AuthenticationContext, AuthenticationProvider, HandleOAuth2Code as Code, OAuth2Login as Login, OAuth2Logout as Logout, RequireAuth, SessionStorageKey, UserMenuRoles, UserMenuRolesConnect, authTranslations, getAuthConfig, getCodeChallenge, getCurrentUrlLocation, getRandomString, getSessionStorageProvider, useAuthenticationContext, useAuthenticationDefaultProps };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/authentication",
-  "version": "9.17.0",
+  "version": "9.19.0",
   "description": "GeoWeb authentication library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -15,7 +15,7 @@
     "@opengeoweb/theme": "*",
     "i18next": "^23.7.11",
     "react-i18next": "^13.5.0",
-    "@opengeoweb/snackbar": "9.17.0",
+    "@opengeoweb/snackbar": "9.19.0",
     "react-redux": "^8.1.3",
     "@reduxjs/toolkit": "^1.9.7",
     "@mui/material": "~5.15.11"

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

@@ -4,6 +4,8 @@ export interface AuthenticationConfig {
     GW_AUTH_LOGIN_URL: string;
     GW_AUTH_LOGOUT_URL: string;
     GW_AUTH_TOKEN_URL: string;
+    GW_AUTH_ROLE_CLAIM_NAME?: string;
+    GW_AUTH_ROLE_CLAIM_VALUE_PRESETS_ADMIN?: string;
     GW_APP_URL: string;
     GW_BE_VERSION_BASE_URL?: string;
     GW_AUTH_CLIENT_ID: string;

package/src/lib/components/UserMenuRoles/UserMenuRoles.d.ts

@@ -4,7 +4,7 @@ export interface Role {
     title: string;
 }
 export declare const UserMenuRoles: React.FC<{
-    roles: Role[];
+    roles?: Role[];
     currentRole?: string;
     onChangeRole: (role: Role) => void;
     isLoading: boolean;

package/src/lib/components/UserMenuRoles/UserMenuRolesConnect.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Role } from './UserMenuRoles';
-export declare const roles: Role[];
 export declare const UserMenuRolesConnect: React.FC<{
     temporaryOnChangeRoleForDemo?: (role: Role) => void;
+    roles?: Role[];
 }>;