@minimaltech/ra-core-infra 0.0.3-6 → 0.0.3-7

package/dist/ui/hooks/index.d.ts

@@ -7,6 +7,7 @@ export * from './use-copy-to-clipboard';
 export * from './use-debounce';
 export * from './use-document-title';
 export * from './use-injectable';
+export * from './use-logout';
 export * from './use-sizer';
 export * from './use-translate';
 export * from './use-window-dimensions';

package/dist/ui/hooks/index.js

@@ -7,6 +7,7 @@ export * from './use-copy-to-clipboard';
 export * from './use-debounce';
 export * from './use-document-title';
 export * from './use-injectable';
+export * from './use-logout';
 export * from './use-sizer';
 export * from './use-translate';
 export * from './use-window-dimensions';

package/dist/ui/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ui/hooks/index.tsx"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AAExB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/ui/hooks/index.tsx"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AAExB,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,eAAe,CAAC;AAC9B,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,yBAAyB,CAAC"}

package/dist/ui/hooks/use-logout.d.ts

@@ -0,0 +1,3 @@
+export declare const useLogout: () => TLogout;
+type TLogout = (params?: any, redirectTo?: string | false, redirectToCurrentLocationAfterLogin?: boolean) => Promise<any>;
+export {};

package/dist/ui/hooks/use-logout.js

@@ -0,0 +1,74 @@
+import React from 'react';
+import { useQueryClient } from '@tanstack/react-query';
+import { removeDoubleSlashes, useAuthProvider, useBasename } from 'ra-core';
+import { useLocation, useNavigate } from 'react-router-dom';
+const defaultAuthParams = {
+    loginUrl: '/login',
+    afterLoginUrl: '/',
+};
+export const useLogout = () => {
+    const authProvider = useAuthProvider();
+    const queryClient = useQueryClient();
+    const navigate = useNavigate();
+    const navigateRef = React.useRef(navigate);
+    const location = useLocation();
+    const locationRef = React.useRef(location);
+    const basename = useBasename();
+    const loginUrl = removeDoubleSlashes(`${basename}/${defaultAuthParams.loginUrl}`);
+    React.useEffect(() => {
+        locationRef.current = location;
+        navigateRef.current = navigate;
+    }, [location, navigate]);
+    const logout = React.useCallback((params = {}, redirectFromCaller, redirectToCurrentLocationAfterLogin = true) => {
+        if (authProvider) {
+            return authProvider.logout(params).then(redirectFromLogout => {
+                if (redirectFromLogout === false || redirectFromCaller === false) {
+                    queryClient.clear();
+                    return;
+                }
+                const finalRedirectTo = redirectFromCaller || redirectFromLogout || loginUrl;
+                if (finalRedirectTo?.startsWith('http')) {
+                    queryClient.clear();
+                    window.location.href = finalRedirectTo;
+                    return finalRedirectTo;
+                }
+                const redirectToParts = finalRedirectTo.split('?');
+                const newLocation = {
+                    pathname: redirectToParts[0],
+                };
+                let newLocationOptions = {};
+                if (redirectToCurrentLocationAfterLogin &&
+                    locationRef.current &&
+                    locationRef.current.pathname) {
+                    newLocationOptions = {
+                        state: {
+                            nextPathname: locationRef.current.pathname,
+                            nextSearch: locationRef.current.search,
+                        },
+                    };
+                }
+                if (redirectToParts[1]) {
+                    newLocation.search = redirectToParts[1];
+                }
+                setTimeout(() => {
+                    navigateRef.current(newLocation, newLocationOptions);
+                    queryClient.clear();
+                }, 0);
+                return redirectFromLogout;
+            });
+        }
+        else {
+            navigateRef.current({
+                pathname: loginUrl,
+            }, {
+                state: {
+                    nextPathname: locationRef.current && locationRef.current.pathname,
+                },
+            });
+            queryClient.clear();
+            return Promise.resolve();
+        }
+    }, [authProvider, loginUrl, queryClient]);
+    return logout;
+};
+//# sourceMappingURL=use-logout.js.map

package/dist/ui/hooks/use-logout.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-logout.js","sourceRoot":"","sources":["../../../src/ui/hooks/use-logout.ts"],"names":[],"mappings":"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"}

package/dist/utilities/error.utility.d.ts

@@ -2,11 +2,13 @@ export declare class ApplicationError extends Error {
     statusCode: number;
     messageCode?: string;
     payload?: any;
+    messageArgs?: any;
     constructor(opts: {
         statusCode?: number;
         messageCode?: string;
         message: string;
         payload?: any;
+        messageArgs?: any;
     });
 }
 export declare const getError: (opts: {
@@ -14,5 +16,6 @@ export declare const getError: (opts: {
     messageCode?: string;
     message: string;
     payload?: any;
+    messageArgs?: any;
 }) => ApplicationError;
 export declare const getClientError: (e: unknown) => ApplicationError;

package/dist/utilities/error.utility.js

@@ -2,12 +2,14 @@ export class ApplicationError extends Error {
     statusCode;
     messageCode;
     payload;
+    messageArgs;
     constructor(opts) {
-        const { message, messageCode, statusCode = 400, payload } = opts;
+        const { message, messageCode, statusCode = 400, payload, messageArgs } = opts;
         super(message);
         this.statusCode = statusCode;
         this.messageCode = messageCode;
         this.payload = payload;
+        this.messageArgs = messageArgs;
     }
 }
 export const getError = (opts) => {
@@ -17,8 +19,10 @@ export const getError = (opts) => {
 export const getClientError = (e) => {
     if (e instanceof ApplicationError) {
         return new ApplicationError({
+            statusCode: e.statusCode,
             messageCode: e?.messageCode ?? e.message,
             message: e.message,
+            messageArgs: e.messageArgs,
         });
     }
     if (e instanceof Error) {

package/dist/utilities/error.utility.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.utility.js","sourceRoot":"","sources":["../../src/utilities/error.utility.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,UAAU,CAAS;IACnB,WAAW,CAAU;IACrB,OAAO,CAAO;IAEd,YAAY,IAAmF;QAC7F,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,GAAG,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACjE,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAKxB,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,EAAE;IAC3C,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;QAClC,OAAO,IAAI,gBAAgB,CAAC;YAC1B,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC,OAAO;YACxC,OAAO,EAAE,CAAC,CAAC,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,IAAI,gBAAgB,CAAC;YAC1B,WAAW,EAAE,CAAC,CAAC,OAAO;YACtB,OAAO,EAAE,CAAC,CAAC,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,gBAAgB,CAAC;QAC1B,WAAW,EAAE,GAAG,CAAC,EAAE;QACnB,OAAO,EAAE,GAAG,CAAC,EAAE;KAChB,CAAC,CAAC;AACL,CAAC,CAAC"}
+{"version":3,"file":"error.utility.js","sourceRoot":"","sources":["../../src/utilities/error.utility.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,UAAU,CAAS;IACnB,WAAW,CAAU;IACrB,OAAO,CAAO;IAId,WAAW,CAAO;IAElB,YAAY,IAMX;QACC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,GAAG,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QAC9E,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,IAMxB,EAAE,EAAE;IACH,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAU,EAAE,EAAE;IAC3C,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;QAClC,OAAO,IAAI,gBAAgB,CAAC;YAC1B,UAAU,EAAE,CAAC,CAAC,UAAU;YACxB,WAAW,EAAE,CAAC,EAAE,WAAW,IAAI,CAAC,CAAC,OAAO;YACxC,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,WAAW,EAAE,CAAC,CAAC,WAAW;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;QACvB,OAAO,IAAI,gBAAgB,CAAC;YAC1B,WAAW,EAAE,CAAC,CAAC,OAAO;YACtB,OAAO,EAAE,CAAC,CAAC,OAAO;SACnB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,IAAI,gBAAgB,CAAC;QAC1B,WAAW,EAAE,GAAG,CAAC,EAAE;QACnB,OAAO,EAAE,GAAG,CAAC,EAAE;KAChB,CAAC,CAAC;AACL,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minimaltech/ra-core-infra",
-  "version": "0.0.3-6",
+  "version": "0.0.3-7",
   "description": "Minimal Technology - ReactJS Core Infrastructure",
   "keywords": [
     "web",
@@ -78,6 +78,7 @@
   },
   "dependencies": {
     "@reduxjs/toolkit": "^2.9.1",
+    "@tanstack/react-query": "^5.99.0",
     "ra-i18n-polyglot": "^5.12.1",
     "react-router-dom": "^7.9.4"
   },