@opengeoweb/authentication 14.1.0 → 14.2.1

package/index.esm.js

@@ -1,41 +1,32 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import * as React from 'react';
-import React__default, { useRef, useEffect } from 'react';
 import axios from 'axios';
+import React, { useRef, useEffect, useState } from 'react';
 import { Navigate, Link } from 'react-router-dom';
 import { sessionStorageProvider, useIsMounted, SHARED_NAMESPACE, AlertBanner, useDebounce } from '@opengeoweb/shared';
-import { ThemeWrapper } from '@opengeoweb/theme';
 import { useTranslation, Trans } from 'react-i18next';
+import { ThemeWrapper } from '@opengeoweb/theme';
 import 'i18next';
 import { Box, LinearProgress, FormGroup, FormLabel, FormControlLabel, Radio } from '@mui/material';
 import { useDispatch } from 'react-redux';
 import { snackbarTypes, snackbarActions } from '@opengeoweb/snackbar';
 
 var en$1 = {
-	"auth-logout-go-back-to-home-page": "Go back to the <1>Home Page</1>",
-	"auth-logout-you-are-logged-out": "You are logged out.",
-	"auth-role-title": "Role",
-	"auth-role-message-assigned": "Role {{role}} has been assigned"
+	"api-role-title-user": "User",
+	"api-role-title-preset-admin": "Preset-admin"
 };
 var fi$1 = {
-	"auth-logout-go-back-to-home-page": "Palaa takaisin <1>Kotisivulle</1>",
-	"auth-logout-you-are-logged-out": "Olet kirjautunut ulos.",
-	"auth-role-title": "Rooli",
-	"auth-role-message-assigned": "Rooli {{role}} on annettu"
+	"api-role-title-user": "Käyttäjä",
+	"api-role-title-preset-admin": "Preset-pääkäyttäjä"
 };
 var no$1 = {
-	"auth-logout-go-back-to-home-page": "Gå tilbake til <1>Hjemmesiden</1>",
-	"auth-logout-you-are-logged-out": "Du er logget ut",
-	"auth-role-title": "Rolle",
-	"auth-role-message-assigned": "Rolle {{role}} har blitt tildelt"
+	"api-role-title-user": "Bruker",
+	"api-role-title-preset-admin": "Preset-admin"
 };
 var nl$1 = {
-	"auth-logout-go-back-to-home-page": "Ga terug naar de <1>Startpagina</1>",
-	"auth-logout-you-are-logged-out": "Je bent uitgelogd.",
-	"auth-role-title": "Rol",
-	"auth-role-message-assigned": "Rol {{role}} is geactiveerd"
+	"api-role-title-user": "Gebruiker",
+	"api-role-title-preset-admin": "Preset-beheerder"
 };
-var authTranslations = {
+var apiTranslations = {
 	en: en$1,
 	fi: fi$1,
 	no: no$1,
@@ -43,22 +34,30 @@ var authTranslations = {
 };
 
 var en = {
-	"api-role-title-user": "User",
-	"api-role-title-preset-admin": "Preset-admin"
+	"auth-logout-go-back-to-home-page": "Go back to the <1>Home Page</1>",
+	"auth-logout-you-are-logged-out": "You are logged out.",
+	"auth-role-title": "Role",
+	"auth-role-message-assigned": "Role {{role}} has been assigned"
 };
 var fi = {
-	"api-role-title-user": "Käyttäjä",
-	"api-role-title-preset-admin": "Preset-pääkäyttäjä"
+	"auth-logout-go-back-to-home-page": "Palaa takaisin <1>Kotisivulle</1>",
+	"auth-logout-you-are-logged-out": "Olet kirjautunut ulos.",
+	"auth-role-title": "Rooli",
+	"auth-role-message-assigned": "Rooli {{role}} on annettu"
 };
 var no = {
-	"api-role-title-user": "Bruker",
-	"api-role-title-preset-admin": "Preset-admin"
+	"auth-logout-go-back-to-home-page": "Gå tilbake til <1>Hjemmesiden</1>",
+	"auth-logout-you-are-logged-out": "Du er logget ut",
+	"auth-role-title": "Rolle",
+	"auth-role-message-assigned": "Rolle {{role}} har blitt tildelt"
 };
 var nl = {
-	"api-role-title-user": "Gebruiker",
-	"api-role-title-preset-admin": "Preset-beheerder"
+	"auth-logout-go-back-to-home-page": "Ga terug naar de <1>Startpagina</1>",
+	"auth-logout-you-are-logged-out": "Je bent uitgelogd.",
+	"auth-role-title": "Rol",
+	"auth-role-message-assigned": "Rol {{role}} is geactiveerd"
 };
-var apiTranslations = {
+var authTranslations = {
 	en: en,
 	fi: fi,
 	no: no,
@@ -824,7 +823,7 @@ var getAuthConfig = function getAuthConfig(_configUrls) {
     GW_AUTH_ROLE_CLAIM_VALUE_PRESETS_ADMIN: GW_AUTH_ROLE_CLAIM_VALUE_PRESETS_ADMIN
   };
 };
-var AuthenticationContext = /*#__PURE__*/React__default.createContext({
+var AuthenticationContext = /*#__PURE__*/React.createContext({
   isLoggedIn: null,
   onLogin: null,
   auth: null,
@@ -839,10 +838,10 @@ var setAuthChangeListener = function setAuthChangeListener(listener) {
 };
 var useAuthenticationDefaultProps = function useAuthenticationDefaultProps() {
   var _auth$roles$, _auth$roles;
-  var _React$useState = React__default.useState(false),
+  var _React$useState = React.useState(false),
     isLoggedIn = _React$useState[0],
     setIsLoggedIn = _React$useState[1];
-  var _React$useState2 = React__default.useState(false),
+  var _React$useState2 = React.useState(false),
     hasConnectionIssue = _React$useState2[0],
     setHasConnectionIssue = _React$useState2[1];
   var emptyCredentials = {
@@ -853,24 +852,29 @@ var useAuthenticationDefaultProps = function useAuthenticationDefaultProps() {
     expires_at: 0,
     has_connection_issue: false
   };
-  var _React$useState3 = React__default.useState(Object.assign({}, emptyCredentials)),
+  var _React$useState3 = React.useState(Object.assign({}, emptyCredentials)),
     auth = _React$useState3[0],
     setAuth = _React$useState3[1];
-  var onSetAuth = React__default.useCallback(function (newAuth) {
+  // TODO clean this up.
+  // hotfix revert to ref. There are parts of the state down the tree that rely on ref to work.
+  var authRef = React.useRef(auth).current;
+  var onSetAuth = React.useCallback(function (newAuth) {
     if (newAuth) {
       setAuth(function (prevAuth) {
         return Object.assign({}, prevAuth, newAuth);
       });
+      Object.assign(authRef, newAuth);
       if (newAuth.has_connection_issue !== undefined && hasConnectionIssue !== newAuth.has_connection_issue) {
         setHasConnectionIssue(newAuth.has_connection_issue);
       }
     } else {
       setAuth(Object.assign({}, emptyCredentials));
+      Object.assign(authRef, Object.assign({}, emptyCredentials));
     }
   },
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [hasConnectionIssue]);
-  var _React$useState4 = React__default.useState((_auth$roles$ = (_auth$roles = auth.roles) == null ? void 0 : _auth$roles[0]) != null ? _auth$roles$ : GEOWEB_ROLE_USER),
+  var _React$useState4 = React.useState((_auth$roles$ = (_auth$roles = auth.roles) == null ? void 0 : _auth$roles[0]) != null ? _auth$roles$ : GEOWEB_ROLE_USER),
     currentRole = _React$useState4[0],
     setCurrentRole = _React$useState4[1];
   useEffect(function () {
@@ -879,7 +883,7 @@ var useAuthenticationDefaultProps = function useAuthenticationDefaultProps() {
   return {
     isLoggedIn: isLoggedIn,
     onLogin: setIsLoggedIn,
-    auth: isLoggedIn ? auth : null,
+    auth: isLoggedIn ? authRef : null,
     onSetAuth: onSetAuth,
     sessionStorageProvider: sessionStorageProvider,
     currentRole: currentRole,
@@ -903,7 +907,7 @@ var AuthenticationProvider = function AuthenticationProvider(_ref2) {
   var authConfig = configURLS;
   // Checks the token expiration time regularly and renews it before it expires.
   var interval = useRef();
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     interval.current = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var currentTime, timeInSecondsLeftBeforeExpiration;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -915,7 +919,7 @@ var AuthenticationProvider = function AuthenticationProvider(_ref2) {
             }
             currentTime = getCurrentTimeInSeconds();
             timeInSecondsLeftBeforeExpiration = auth.expires_at ? auth.expires_at - currentTime : 0;
-            if (!(timeInSecondsLeftBeforeExpiration < 0)) {
+            if (!(timeInSecondsLeftBeforeExpiration < 60)) {
               _context2.next = 6;
               break;
             }
@@ -942,7 +946,7 @@ var AuthenticationProvider = function AuthenticationProvider(_ref2) {
       clearInterval(interval.current);
     };
   }, [auth, configURLS.GW_APP_URL, configURLS.GW_AUTH_CLIENT_ID, configURLS.GW_AUTH_TOKEN_URL, onSetAuth, configURLS, onLogin]);
-  var contextValue = React__default.useMemo(function () {
+  var contextValue = React.useMemo(function () {
     return {
       isLoggedIn: isLoggedIn,
       onLogin: onLogin,
@@ -960,7 +964,7 @@ var AuthenticationProvider = function AuthenticationProvider(_ref2) {
   });
 };
 var useAuthenticationContext = function useAuthenticationContext() {
-  return React__default.useContext(AuthenticationContext);
+  return React.useContext(AuthenticationContext);
 };
 
 var axiosInstance = axios.create({
@@ -973,13 +977,13 @@ var HandleOAuth2Code = function HandleOAuth2Code() {
     isLoggedIn = _useAuthenticationCon.isLoggedIn,
     onLogin = _useAuthenticationCon.onLogin,
     sessionStorageProvider = _useAuthenticationCon.sessionStorageProvider;
-  var _React$useState = React__default.useState(null),
+  var _React$useState = React.useState(null),
     error = _React$useState[0],
     setError = _React$useState[1];
   var _useIsMounted = useIsMounted(),
     isMounted = _useIsMounted.isMounted;
-  var loginInProgress = React__default.useRef(false);
-  var authenticate = React__default.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var loginInProgress = React.useRef(false);
+  var authenticate = React.useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _Object$fromEntries, code, state, isStateRequired, isPkceRequired, payload, useDefaultContentType, data, config, res, newAuth;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -1061,9 +1065,10 @@ var HandleOAuth2Code = function HandleOAuth2Code() {
           if (isMounted.current) {
             if (_context.t0 instanceof Error) {
               setError(function () {
+                var _error$stack;
                 return {
                   message: _context.t0.message,
-                  stack: _context.t0.stack || 'Error in HandleOAuth2Code'
+                  stack: (_error$stack = _context.t0.stack) != null ? _error$stack : 'Error in HandleOAuth2Code'
                 };
               });
             }
@@ -1080,7 +1085,7 @@ var HandleOAuth2Code = function HandleOAuth2Code() {
       }
     }, _callee, null, [[15, 23]]);
   })), [authConfig, isMounted, onLogin, onSetAuth, sessionStorageProvider]);
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     var authenticateWithLock = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -1111,17 +1116,17 @@ var HandleOAuth2Code = function HandleOAuth2Code() {
   }, [authenticate, isLoggedIn]);
   return jsxs(Fragment, {
     children: [error ? jsx(Navigate, {
-      to: "/error",
+      replace: true,
       state: {
         error: {
           message: error.message,
           stack: error.stack
         }
       },
-      replace: true
+      to: "/error"
     }) : null, isLoggedIn ? jsx(Navigate, {
-      to: sessionStorageProvider.getCallbackUrl(),
-      replace: true
+      replace: true,
+      to: sessionStorageProvider.getCallbackUrl()
     }) : null]
   });
 };
@@ -1167,7 +1172,7 @@ var getCurrentUrlLocation = function getCurrentUrlLocation(url, appUrl) {
 var OAuth2Login = function OAuth2Login() {
   var _useAuthenticationCon = useAuthenticationContext(),
     authConfig = _useAuthenticationCon.authConfig;
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     var callbackUrl = getCurrentUrlLocation(sessionStorageProvider.getCallbackUrl(), authConfig.GW_APP_URL);
     sessionStorageProvider.setCallbackUrl(callbackUrl);
     window.location.assign(authConfig.GW_AUTH_LOGIN_URL);
@@ -1206,12 +1211,12 @@ var OAuth2Logout = function OAuth2Logout() {
     isLoggedIn = _useAuthenticationCon.isLoggedIn,
     onLogin = _useAuthenticationCon.onLogin,
     sessionStorageProvider = _useAuthenticationCon.sessionStorageProvider;
-  var _React$useState = React__default.useState(true),
+  var _React$useState = React.useState(true),
     showAlert = _React$useState[0],
     setShowAlert = _React$useState[1];
   var _useAuthenticationTra = useAuthenticationTranslation(),
     t = _useAuthenticationTra.t;
-  React__default.useEffect(function () {
+  React.useEffect(function () {
     if (isLoggedIn) {
       setShowAlert(false);
       onSetAuth(null);
@@ -1222,8 +1227,6 @@ var OAuth2Logout = function OAuth2Logout() {
   }, [isLoggedIn, onSetAuth, onLogin, sessionStorageProvider, authConfig.GW_AUTH_LOGOUT_URL]);
   return showAlert ? jsx(ThemeWrapper, {
     children: jsx(AlertBanner, {
-      severity: "info",
-      title: t('auth-logout-you-are-logged-out'),
       info: jsx("p", {
         children: jsxs(Trans, {
           i18nKey: "auth-logout-go-back-to-home-page",
@@ -1233,7 +1236,9 @@ var OAuth2Logout = function OAuth2Logout() {
             children: "Home Page"
           })]
         })
-      })
+      }),
+      severity: "info",
+      title: t('auth-logout-you-are-logged-out')
     })
   }) : null;
 };
@@ -1255,8 +1260,8 @@ var UserMenuRoles = function UserMenuRoles(_ref) {
         right: 0
       },
       children: jsx(LinearProgress, {
-        "data-testid": "loading-bar",
-        color: "secondary"
+        color: "secondary",
+        "data-testid": "loading-bar"
       })
     }) : null, jsxs(FormGroup, {
       children: [jsx(FormLabel, {
@@ -1271,8 +1276,8 @@ var UserMenuRoles = function UserMenuRoles(_ref) {
       }), roles == null ? void 0 : roles.map(function (role) {
         return jsx(FormControlLabel, {
           control: jsx(Radio, {
-            disabled: isLoading,
-            checked: currentRole === role.name
+            checked: currentRole === role.name,
+            disabled: isLoading
           }),
           label: t(role.title),
           onChange: function onChange() {
@@ -1291,10 +1296,10 @@ var UserMenuRolesConnect = function UserMenuRolesConnect(_ref) {
     _ref$isAdmin = _ref.isAdmin,
     isAdmin = _ref$isAdmin === void 0 ? false : _ref$isAdmin;
   var defaultRole = isAdmin ? GEOWEB_ROLE_PRESETS_ADMIN.name : GEOWEB_ROLE_USER.name;
-  var _React$useState = React__default.useState(false),
+  var _React$useState = React.useState(false),
     isLoading = _React$useState[0],
     setIsLoading = _React$useState[1];
-  var _React$useState2 = React__default.useState(defaultRole),
+  var _React$useState2 = React.useState(defaultRole),
     currentRole = _React$useState2[0],
     setCurrentRole = _React$useState2[1];
   var dispatch = useDispatch();
@@ -1338,10 +1343,10 @@ var UserMenuRolesConnect = function UserMenuRolesConnect(_ref) {
     });
   };
   return jsx(UserMenuRoles, {
-    onChangeRole: onChangeRole,
-    roles: roles,
     currentRole: currentRole,
-    isLoading: isLoading
+    isLoading: isLoading,
+    onChangeRole: onChangeRole,
+    roles: roles
   });
 };
 
@@ -1362,7 +1367,7 @@ var ApiProvider = function ApiProvider(_ref) {
     name = _ref.name,
     apiModuleProps = _objectWithoutPropertiesLoose(_ref, _excluded);
   var handleNewApi = React.useCallback(function () {
-    var newApi = createApi == null ? void 0 : createApi(apiModuleProps);
+    var newApi = createApi(apiModuleProps);
     if (name) {
       registerApi(name, newApi);
     }
@@ -1397,24 +1402,25 @@ var generateRandomId = function generateRandomId() {
 var useApi = function useApi(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 apiCall,
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
 params, callbacks) {
   var _useIsMounted = useIsMounted(),
     isMounted = _useIsMounted.isMounted;
-  var _React$useState = React.useState(generateRandomId()),
-    id = _React$useState[0];
-  var _React$useState2 = React.useState(true),
-    isLoading = _React$useState2[0],
-    setIsloading = _React$useState2[1];
-  var _React$useState3 = React.useState(null),
-    error = _React$useState3[0],
-    setError = _React$useState3[1];
-  var _React$useState4 = React.useState(null),
-    result = _React$useState4[0],
-    setResult = _React$useState4[1];
+  // eslint-disable-next-line react/hook-use-state
+  var _useState = useState(generateRandomId()),
+    id = _useState[0];
+  var _useState2 = useState(true),
+    isLoading = _useState2[0],
+    setIsLoading = _useState2[1];
+  var _useState3 = useState(null),
+    error = _useState3[0],
+    setError = _useState3[1];
+  var _useState4 = useState(null),
+    result = _useState4[0],
+    setResult = _useState4[1];
   var debouncedParams = useDebounce(JSON.stringify(params), 300);
   // trick so that we don't have to include this in the useEffect dependency array (as it is likely that callbacks changes on every render)
-  var callbacksRef = React.useRef();
+  var callbacksRef = useRef();
   callbacksRef.current = callbacks;
   var handleError = function handleError(newError) {
     if (isMounted.current) {
@@ -1431,7 +1437,7 @@ params, callbacks) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setIsloading(true);
+            setIsLoading(true);
             setError(null);
             _context.prev = 2;
             _context.next = 5;
@@ -1455,7 +1461,7 @@ params, callbacks) {
             }
           case 12:
             _context.prev = 12;
-            setIsloading(false);
+            setIsLoading(false);
             return _context.finish(12);
           case 15:
           case "end":
@@ -1467,7 +1473,7 @@ params, callbacks) {
       return _ref.apply(this, arguments);
     };
   }();
-  React.useEffect(function () {
+  useEffect(function () {
     fetchApiData(params)["catch"](function (newError) {
       handleError(newError);
     });
@@ -1475,7 +1481,7 @@ params, callbacks) {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [debouncedParams]);
   var clearResults = function clearResults() {
-    setIsloading(true);
+    setIsLoading(true);
     setResult(null);
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/authentication",
-  "version": "14.1.0",
+  "version": "14.2.1",
   "description": "GeoWeb authentication library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -10,11 +10,11 @@
   "dependencies": {
     "axios": "^1.7.7",
     "react-router-dom": "^6.23.1",
-    "@opengeoweb/shared": "14.1.0",
-    "@opengeoweb/theme": "14.1.0",
+    "@opengeoweb/shared": "14.2.1",
+    "@opengeoweb/theme": "14.2.1",
     "i18next": "^25.0.1",
     "react-i18next": "^15.1.1",
-    "@opengeoweb/snackbar": "14.1.0",
+    "@opengeoweb/snackbar": "14.2.1",
     "react-redux": "^9.2.0",
     "@reduxjs/toolkit": "^2.6.1",
     "@mui/material": "^7.0.1"

package/src/index.d.ts

@@ -1,5 +1,5 @@
-import authTranslations from '../locales/authentication.json';
 import apiTranslations from '../locales/api.json';
+import authTranslations from '../locales/authentication.json';
 export { default as Code } from './lib/components/pages/Code';
 export { default as Login } from './lib/components/pages/Login';
 export { default as Logout } from './lib/components/pages/Logout';

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

@@ -1,5 +1,5 @@
-import * as React from 'react';
-import { ApiModule, CreateApiFn } from './types';
+import React from 'react';
+import type { ApiModule, CreateApiFn } from './types';
 interface ApiContextState<ApiType> {
     api: ApiType;
 }

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

@@ -1,3 +1,3 @@
 export * from './ApiContext';
 export * from './utils';
-export * from './types';
+export type * from './types';

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

@@ -28,7 +28,7 @@ export interface ApiModule {
 export interface CreateApiProps extends ApiModule {
     timeout?: number;
 }
-export type CreateApiFn = (props: CreateApiProps) => void;
+export type CreateApiFn = (props: CreateApiProps) => unknown;
 export interface Role {
     name: string;
     title: string;

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

@@ -1,5 +1,5 @@
-import * as React from 'react';
-import { Credentials } from '../ApiContext/types';
+import React from 'react';
+import type { Credentials } from '../ApiContext/types';
 interface AuthenticationRenderTestComponentProps {
     auth: Credentials | null;
     newAuth: Credentials;

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

@@ -1,5 +1,5 @@
+import type { Store } from '@reduxjs/toolkit';
 import React from 'react';
-import { Store } from '@reduxjs/toolkit';
 interface AuthTranslationWrapperProps {
     children?: React.ReactNode;
 }

package/src/lib/components/apiHooks/useApi.d.ts

@@ -1,4 +1,4 @@
-import { ConfigType } from '@opengeoweb/shared';
+import type { ConfigType } from '@opengeoweb/shared';
 export type ApiParams = string | ConfigType | Record<string, string | undefined> | null;
 interface BaseApiHookProps {
     fetchApiData?: (params: ApiParams) => Promise<void>;

package/src/lib/utils/i18n.d.ts

@@ -1,5 +1,5 @@
 import i18n from 'i18next';
-import { UseTranslationResponse } from 'react-i18next';
+import type { UseTranslationResponse } from 'react-i18next';
 export declare const AUTH_NAMESPACE = "auth";
 export declare const initAuthTestI18n: () => void;
 export declare const useAuthenticationTranslation: () => UseTranslationResponse<typeof AUTH_NAMESPACE, typeof i18n>;