@licklist/design 0.78.5-dev.36 → 0.78.5-dev.37

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,2CAiFzC;AAED,OAAO,EAAE,UAAU,EAAE,CAAA"}
+{"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"}

package/dist/auth/Authorizer.js

@@ -1,6 +1,6 @@
 import { jsx, Fragment } from 'react/jsx-runtime';
 import { useState, useCallback, useEffect } from 'react';
-import { useLocation, matchPath } from 'react-router-dom';
+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';
@@ -72,6 +72,7 @@ function Authorizer(props) {
     var user = useUser();
     var useProfile = useAuthApi().useProfile;
     var pathname = useLocation().pathname;
+    var navigate = useNavigate();
     // This will re-fetch user's profile
     var profile = useProfile();
     var _useState = _sliced_to_array(useState(false), 2), isValidated = _useState[0], setIsValidated = _useState[1];
@@ -94,7 +95,7 @@ function Authorizer(props) {
             });
             return;
         }
-        if ([
+        var publicRoutes = [
             ROUTES.LOGIN_PAGE,
             ROUTES.REGISTER_PAGE,
             ROUTES.PRIVACY_PAGE,
@@ -104,26 +105,29 @@ function Authorizer(props) {
             ROUTES.FORGOT_PASSWORD,
             ROUTES.SSO_LOGIN,
             ROUTES.MAINTENANCE_PAGE
-        ].concat(_to_consumable_array(matchedPathPatternUrls())).includes(pathname)) {
-            setIsValidated(function() {
-                return true;
-            });
+        ].concat(_to_consumable_array(matchedPathPatternUrls()));
+        // If we're on a public route (e.g. /login), mark as validated and never redirect
+        if (publicRoutes.includes(pathname)) {
+            setIsValidated(true);
             return;
         }
         var route = RouteService.getCurrentRoute();
-        RouteService.redirectTo([
-            ROUTES.MAINTENANCE_PAGE,
+        navigate([
+            ROUTES.LOGIN_PAGE,
             "returnUrl=".concat(escape(route))
-        ].join('?'));
+        ].join('?'), {
+            replace: true
+        });
     }, [
         auth.secrets,
         user.profile,
         profile.data,
-        matchedPathPatternUrls,
         profile.isError,
         profile.isLoading,
         profile.isFetching,
-        pathname
+        pathname,
+        matchedPathPatternUrls,
+        navigate
     ]);
     if (profile.isFetching || profile.isLoading || !isValidated) return /*#__PURE__*/ jsx(BlockLoader, {});
     return /*#__PURE__*/ jsx(Fragment, {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@licklist/design",
-  "version": "0.78.5-dev.36",
+  "version": "0.78.5-dev.37",
   "repository": {
     "type": "git",
-    "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"
+    "url": "git+ssh://git@bitbucket.org/bookedit-licklist/licklist_design.git"
   },
   "author": "Yaroslav Havryliv",
   "license": "MIT",
   "type": "module",
-  "homepage": "https://bitbucket.org/artelogicsoft/licklist_design#readme",
+  "homepage": "https://bitbucket.org/bookedit-licklist/licklist_design#readme",
   "description": "",
   "scripts": {
     "start": "storybook dev -p 9009",

package/src/auth/Authorizer.tsx

@@ -1,5 +1,5 @@
 import { ReactNode, useEffect, useState, useCallback } from 'react'
-import { matchPath, useLocation } from 'react-router-dom'
+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'
@@ -18,6 +18,7 @@ function Authorizer(props: AuthorizerProps) {
   const { useProfile } = useAuthApi()
 
   const { pathname } = useLocation()
+  const navigate = useNavigate()
 
   // This will re-fetch user's profile
   const profile = useProfile()
@@ -54,38 +55,41 @@ function Authorizer(props: AuthorizerProps) {
       return
     }
 
-    if (
-      [
-        ROUTES.LOGIN_PAGE,
-        ROUTES.REGISTER_PAGE,
-        ROUTES.PRIVACY_PAGE,
-        ROUTES.TERMS_PAGE,
-        ROUTES.PRIVACY_FACTS_PAGE,
-        ROUTES.CHANGE_PASSWORD,
-        ROUTES.FORGOT_PASSWORD,
-        ROUTES.SSO_LOGIN,
-        ROUTES.MAINTENANCE_PAGE,
-        ...matchedPathPatternUrls(),
-      ].includes(pathname)
-    ) {
-      setIsValidated(() => true)
+    const publicRoutes = [
+      ROUTES.LOGIN_PAGE,
+      ROUTES.REGISTER_PAGE,
+      ROUTES.PRIVACY_PAGE,
+      ROUTES.TERMS_PAGE,
+      ROUTES.PRIVACY_FACTS_PAGE,
+      ROUTES.CHANGE_PASSWORD,
+      ROUTES.FORGOT_PASSWORD,
+      ROUTES.SSO_LOGIN,
+      ROUTES.MAINTENANCE_PAGE,
+      ...matchedPathPatternUrls(),
+    ]
+
+    // If we're on a public route (e.g. /login), mark as validated and never redirect
+    if (publicRoutes.includes(pathname)) {
+      setIsValidated(true)
       return
     }
 
     const route = RouteService.getCurrentRoute()
 
-    RouteService.redirectTo(
-      [ROUTES.MAINTENANCE_PAGE, `returnUrl=${escape(route)}`].join('?'),
+    navigate(
+      [ROUTES.LOGIN_PAGE, `returnUrl=${escape(route)}`].join('?'),
+      { replace: true },
     )
   }, [
     auth.secrets,
     user.profile,
     profile.data,
-    matchedPathPatternUrls,
     profile.isError,
     profile.isLoading,
     profile.isFetching,
     pathname,
+    matchedPathPatternUrls,
+    navigate,
   ])
 
   if (profile.isFetching || profile.isLoading || !isValidated)