@licklist/design 0.78.5-dev.38 → 0.78.5-dev.39

package/dist/auth/Authorizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Authorizer.d.ts","sourceRoot":"","sources":["../../src/auth/Authorizer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAoC,MAAM,OAAO,CAAA;AASnE,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAA;CACnC;AAED,iBAAS,UAAU,CAAC,KAAK,EAAE,eAAe,2CAqFzC;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"version":3,"file":"Authorizer.d.ts","sourceRoot":"","sources":["../../src/auth/Authorizer.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAwD,MAAM,OAAO,CAAA;AAYvF,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,EAAE,CAAA;CACnC;AAID,iBAAS,UAAU,CAAC,KAAK,EAAE,eAAe,2CAyGzC;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}

package/dist/auth/Authorizer.js

@@ -1,11 +1,13 @@
 import { jsx, Fragment } from 'react/jsx-runtime';
-import { useState, useCallback, useEffect } from 'react';
+import { useContext, useRef, useState, useCallback, useEffect } from 'react';
 import { useLocation, useNavigate, matchPath } from 'react-router-dom';
 import useUser from '@licklist/plugins/dist/context/user/hooks/useUser';
 import { MATCH_ROUTE_PATTERNS, ROUTES } from '@licklist/core/dist/Config';
 import useAuthApi from '@licklist/plugins/dist/hooks/Api/useAuthApi';
 import useAuth from '@licklist/plugins/dist/context/user/hooks/useAuth';
 import RouteService from '@licklist/plugins/dist/services/Route/RouteService';
+import StorageContext from '@licklist/plugins/dist/context/app/StorageContext';
+import JsonService from '@licklist/plugins/dist/services/Json/JsonService';
 import { BlockLoader } from '../static/loader/BlockLoader.js';
 
 function _array_like_to_array(arr, len) {
@@ -66,11 +68,14 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
+var AUTH_CONTEXT_KEY = 'auth';
 function Authorizer(props) {
     var children = props.children;
     var auth = useAuth();
     var user = useUser();
     var useProfile = useAuthApi().useProfile;
+    var storage = useContext(StorageContext);
+    var isLoggingOut = useRef(false);
     var pathname = useLocation().pathname;
     var navigate = useNavigate();
     // This will re-fetch user's profile
@@ -85,6 +90,32 @@ function Authorizer(props) {
             return matched.pathname;
         });
     }, []);
+    // Check auth on every route change - if storage was cleared, logout immediately
+    useEffect(function() {
+        if (isLoggingOut.current) return;
+        var storedAuth = storage.get(AUTH_CONTEXT_KEY);
+        var parsedAuth = storedAuth ? JsonService.decode(storedAuth) : null;
+        // If we have auth in memory but not in storage, session was cleared
+        if (auth.secrets !== null && !parsedAuth) {
+            isLoggingOut.current = true;
+            auth.setSecrets(null);
+            user.setProfile(null);
+            var route = RouteService.getCurrentRoute();
+            navigate([
+                ROUTES.LOGIN_PAGE,
+                "returnUrl=".concat(escape(route))
+            ].join('?'), {
+                replace: true
+            });
+        }
+    }, [
+        pathname,
+        auth.secrets,
+        storage,
+        navigate,
+        auth,
+        user
+    ]);
     useEffect(function() {
         if (profile.isLoading || profile.isFetching) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.78.5-dev.38",
+  "version": "0.78.5-dev.39",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/bookedit-licklist/licklist_design.git"

package/src/auth/Authorizer.tsx

@@ -1,21 +1,28 @@
-import { ReactNode, useEffect, useState, useCallback } from 'react'
+import { ReactNode, useEffect, useState, useCallback, useContext, useRef } from 'react'
 import { matchPath, useLocation, useNavigate } from 'react-router-dom'
 import useUser from '@licklist/plugins/dist/context/user/hooks/useUser'
 import { ROUTES, MATCH_ROUTE_PATTERNS } from '@licklist/core/dist/Config'
 import useAuthApi from '@licklist/plugins/dist/hooks/Api/useAuthApi'
 import useAuth from '@licklist/plugins/dist/context/user/hooks/useAuth'
 import RouteService from '@licklist/plugins/dist/services/Route/RouteService'
+import StorageContext from '@licklist/plugins/dist/context/app/StorageContext'
+import JsonService from '@licklist/plugins/dist/services/Json/JsonService'
+import { IAuth } from '@licklist/plugins/dist/types/context/user/IAuth'
 import { BlockLoader } from '../static/loader/BlockLoader'
 
 export interface AuthorizerProps {
   children?: ReactNode | ReactNode[]
 }
 
+const AUTH_CONTEXT_KEY = 'auth'
+
 function Authorizer(props: AuthorizerProps) {
   const { children } = props
   const auth = useAuth()
   const user = useUser()
   const { useProfile } = useAuthApi()
+  const storage = useContext(StorageContext)
+  const isLoggingOut = useRef(false)
 
   const { pathname } = useLocation()
   const navigate = useNavigate()
@@ -41,6 +48,24 @@ function Authorizer(props: AuthorizerProps) {
     [],
   )
 
+  // Check auth on every route change - if storage was cleared, logout immediately
+  useEffect(() => {
+    if (isLoggingOut.current) return
+
+    const storedAuth = storage.get(AUTH_CONTEXT_KEY)
+    const parsedAuth = storedAuth ? JsonService.decode<IAuth>(storedAuth) : null
+
+    // If we have auth in memory but not in storage, session was cleared
+    if (auth.secrets !== null && !parsedAuth) {
+      isLoggingOut.current = true
+      auth.setSecrets(null)
+      user.setProfile(null)
+
+      const route = RouteService.getCurrentRoute()
+      navigate([ROUTES.LOGIN_PAGE, `returnUrl=${escape(route)}`].join('?'), { replace: true })
+    }
+  }, [pathname, auth.secrets, storage, navigate, auth, user])
+
   useEffect(() => {
     if (profile.isLoading || profile.isFetching) {
       return