@refinedev/core 4.46.0 → 4.46.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +109 -0
- package/dist/definitions/helpers/flatten-object-keys/index.d.ts.map +1 -1
- package/dist/esm/index.js +6 -6
- package/dist/esm/index.js.map +1 -1
- package/dist/hooks/accessControl/useCan/index.d.ts.map +1 -1
- package/dist/hooks/auditLog/useLogList/index.d.ts.map +1 -1
- package/dist/hooks/auth/useOnError/index.d.ts.map +1 -1
- package/dist/hooks/data/useCreate.d.ts.map +1 -1
- package/dist/hooks/data/useCreateMany.d.ts.map +1 -1
- package/dist/hooks/data/useDelete.d.ts.map +1 -1
- package/dist/hooks/data/useDeleteMany.d.ts.map +1 -1
- package/dist/hooks/data/useInfiniteList.d.ts.map +1 -1
- package/dist/hooks/data/useList.d.ts.map +1 -1
- package/dist/hooks/data/useMany.d.ts.map +1 -1
- package/dist/hooks/data/useOne.d.ts.map +1 -1
- package/dist/hooks/data/useUpdate.d.ts.map +1 -1
- package/dist/hooks/data/useUpdateMany.d.ts.map +1 -1
- package/dist/hooks/router/use-go/index.d.ts +2 -0
- package/dist/hooks/router/use-go/index.d.ts.map +1 -1
- package/dist/hooks/useMeta/index.d.ts +2 -0
- package/dist/hooks/useMeta/index.d.ts.map +1 -1
- package/dist/iife/index.js +6 -6
- package/dist/iife/index.js.map +1 -1
- package/dist/index.js +6 -6
- package/dist/index.js.map +1 -1
- package/dist/interfaces/auth.d.ts +6 -6
- package/dist/interfaces/auth.d.ts.map +1 -1
- package/dist/interfaces/metaData/graphqlQueryOptions.d.ts +6 -0
- package/dist/interfaces/metaData/graphqlQueryOptions.d.ts.map +1 -0
- package/dist/interfaces/metaData/metaQuery.d.ts +2 -1
- package/dist/interfaces/metaData/metaQuery.d.ts.map +1 -1
- package/package.json +2 -1
- package/src/definitions/helpers/flatten-object-keys/index.ts +2 -0
- package/src/hooks/accessControl/useCan/index.ts +10 -12
- package/src/hooks/auditLog/useLogList/index.ts +10 -12
- package/src/hooks/auth/useForgotPassword/index.ts +51 -54
- package/src/hooks/auth/useGetIdentity/index.ts +23 -26
- package/src/hooks/auth/useIsAuthenticated/index.ts +20 -20
- package/src/hooks/auth/useLogin/index.ts +33 -35
- package/src/hooks/auth/useLogout/index.ts +32 -34
- package/src/hooks/auth/useOnError/index.ts +29 -33
- package/src/hooks/auth/usePermissions/index.ts +19 -22
- package/src/hooks/auth/useRegister/index.ts +60 -66
- package/src/hooks/auth/useUpdatePassword/index.ts +51 -54
- package/src/hooks/data/useCreate.ts +115 -117
- package/src/hooks/data/useCreateMany.ts +113 -118
- package/src/hooks/data/useDelete.ts +212 -223
- package/src/hooks/data/useDeleteMany.ts +230 -244
- package/src/hooks/data/useInfiniteList.ts +36 -42
- package/src/hooks/data/useList.ts +56 -62
- package/src/hooks/data/useMany.ts +36 -37
- package/src/hooks/data/useOne.ts +54 -55
- package/src/hooks/data/useUpdate.ts +288 -311
- package/src/hooks/data/useUpdateMany.ts +294 -320
- package/src/hooks/menu/useMenu.tsx +1 -1
- package/src/hooks/router/use-go/index.tsx +3 -0
- package/src/interfaces/auth.tsx +6 -6
- package/src/interfaces/metaData/graphqlQueryOptions.ts +6 -0
- package/src/interfaces/metaData/metaQuery.ts +3 -1
|
@@ -39,12 +39,6 @@ export declare type AuthPageProps<TWrapperProps extends {} = Record<keyof any, u
|
|
|
39
39
|
* @optional
|
|
40
40
|
*/
|
|
41
41
|
providers?: OAuthProvider[];
|
|
42
|
-
/**
|
|
43
|
-
* @description Render a redirect to login page button node. If set to false, login button will not be rendered.
|
|
44
|
-
* @default `"/login"`
|
|
45
|
-
* @optional
|
|
46
|
-
*/
|
|
47
|
-
loginLink?: React.ReactNode;
|
|
48
42
|
/**
|
|
49
43
|
* @description Render a redirect to register page button node. If set to false, register button will not be rendered.
|
|
50
44
|
* @default `"/register"`
|
|
@@ -78,6 +72,12 @@ export declare type AuthPageProps<TWrapperProps extends {} = Record<keyof any, u
|
|
|
78
72
|
* @optional
|
|
79
73
|
*/
|
|
80
74
|
providers?: OAuthProvider[];
|
|
75
|
+
/**
|
|
76
|
+
* @description Render a redirect to login page button node. If set to false, login button will not be rendered.
|
|
77
|
+
* @default `"/login"`
|
|
78
|
+
* @optional
|
|
79
|
+
*/
|
|
80
|
+
loginLink?: React.ReactNode;
|
|
81
81
|
/**
|
|
82
82
|
* @description Can be used to hide the form components
|
|
83
83
|
* @optional
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/interfaces/auth.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAC;AAEjD,oBAAY,aAAa,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,uBAAuB;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;GAEG;AACH,oBAAY,aAAa,CACrB,aAAa,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,EACrD,aAAa,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,EACrD,UAAU,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,GAAG,EAAE,OAAO,CAAC,IAClD,CACE,iBAAiB,CAAC;IACd;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;;OAIG;IACH,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC;IAC5B;;;;OAIG;IACH,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/interfaces/auth.tsx"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphqlQueryOptions.d.ts","sourceRoot":"","sources":["../../../src/interfaces/metaData/graphqlQueryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,oBAAY,mBAAmB,GAAG;IAC9B,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,WAAW,CAAC,EAAE,YAAY,CAAC;CAC9B,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { QueryFunctionContext } from "@tanstack/react-query";
|
|
2
2
|
import { QueryBuilderOptions } from "./queryBuilderOptions";
|
|
3
|
+
import { GraphQLQueryOptions } from "./graphqlQueryOptions";
|
|
3
4
|
export declare type MetaQuery = {
|
|
4
5
|
[k: string]: any;
|
|
5
6
|
queryContext?: Omit<QueryFunctionContext, "meta">;
|
|
6
|
-
} & QueryBuilderOptions;
|
|
7
|
+
} & QueryBuilderOptions & GraphQLQueryOptions;
|
|
7
8
|
//# sourceMappingURL=metaQuery.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metaQuery.d.ts","sourceRoot":"","sources":["../../../src/interfaces/metaData/metaQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,oBAAY,SAAS,GAAG;IACpB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;CACrD,GAAG,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"metaQuery.d.ts","sourceRoot":"","sources":["../../../src/interfaces/metaData/metaQuery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,oBAAY,SAAS,GAAG;IACpB,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;CACrD,GAAG,mBAAmB,GACnB,mBAAmB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@refinedev/core",
|
|
3
|
-
"version": "4.46.
|
|
3
|
+
"version": "4.46.2",
|
|
4
4
|
"description": "refine is a React-based framework for building internal tools, rapidly. It ships with Ant Design System, an enterprise-level UI toolkit.",
|
|
5
5
|
"private": false,
|
|
6
6
|
"sideEffects": false,
|
|
@@ -35,6 +35,7 @@
|
|
|
35
35
|
"@types/react-dom": "^18.0.0",
|
|
36
36
|
"@types/react-router-dom": "^5.1.8",
|
|
37
37
|
"@types/testing-library__jest-dom": "^5.14.3",
|
|
38
|
+
"graphql": "^15.6.1",
|
|
38
39
|
"identity-obj-proxy": "^3.0.0",
|
|
39
40
|
"jest": "^29.3.1",
|
|
40
41
|
"jest-environment-jsdom": "^29.3.1",
|
|
@@ -28,6 +28,8 @@ export const flattenObjectKeys = (obj: any, prefix = "") => {
|
|
|
28
28
|
flattenObjectKeys(obj[key], currentPrefix + key),
|
|
29
29
|
);
|
|
30
30
|
}
|
|
31
|
+
// Even if it's a nested object, it should be treated as a key as well
|
|
32
|
+
acc[currentPrefix + key] = obj[key];
|
|
31
33
|
} else {
|
|
32
34
|
acc[currentPrefix + key] = obj[key];
|
|
33
35
|
}
|
|
@@ -45,8 +45,8 @@ export const useCan = ({
|
|
|
45
45
|
const sanitizedResource = sanitizeResource(_resource);
|
|
46
46
|
|
|
47
47
|
/* eslint-enable @typescript-eslint/no-unused-vars */
|
|
48
|
-
const queryResponse = useQuery<CanReturnType>(
|
|
49
|
-
keys()
|
|
48
|
+
const queryResponse = useQuery<CanReturnType>({
|
|
49
|
+
queryKey: keys()
|
|
50
50
|
.access()
|
|
51
51
|
.resource(resource)
|
|
52
52
|
.action(action)
|
|
@@ -56,22 +56,20 @@ export const useCan = ({
|
|
|
56
56
|
})
|
|
57
57
|
.get(preferLegacyKeys),
|
|
58
58
|
// Enabled check for `can` is enough to be sure that it's defined in the query function but TS is not smart enough to know that.
|
|
59
|
-
() =>
|
|
59
|
+
queryFn: () =>
|
|
60
60
|
can?.({
|
|
61
61
|
action,
|
|
62
62
|
resource,
|
|
63
63
|
params: { ...paramsRest, resource: sanitizedResource },
|
|
64
64
|
}) ?? Promise.resolve({ can: true }),
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
meta
|
|
69
|
-
|
|
70
|
-
...getXRay("useCan", preferLegacyKeys),
|
|
71
|
-
},
|
|
72
|
-
retry: false,
|
|
65
|
+
enabled: typeof can !== "undefined",
|
|
66
|
+
...queryOptions,
|
|
67
|
+
meta: {
|
|
68
|
+
...queryOptions?.meta,
|
|
69
|
+
...getXRay("useCan", preferLegacyKeys),
|
|
73
70
|
},
|
|
74
|
-
|
|
71
|
+
retry: false,
|
|
72
|
+
});
|
|
75
73
|
|
|
76
74
|
return typeof can === "undefined"
|
|
77
75
|
? ({ data: { can: true } } as typeof queryResponse)
|
|
@@ -44,14 +44,14 @@ export const useLogList = <
|
|
|
44
44
|
const { get } = useContext(AuditLogContext);
|
|
45
45
|
const { keys, preferLegacyKeys } = useKeys();
|
|
46
46
|
|
|
47
|
-
const queryResponse = useQuery<TQueryFnData, TError, TData>(
|
|
48
|
-
keys()
|
|
47
|
+
const queryResponse = useQuery<TQueryFnData, TError, TData>({
|
|
48
|
+
queryKey: keys()
|
|
49
49
|
.audit()
|
|
50
50
|
.resource(resource)
|
|
51
51
|
.action("list")
|
|
52
52
|
.params(meta)
|
|
53
53
|
.get(preferLegacyKeys),
|
|
54
|
-
() =>
|
|
54
|
+
queryFn: () =>
|
|
55
55
|
get?.({
|
|
56
56
|
resource,
|
|
57
57
|
action,
|
|
@@ -59,16 +59,14 @@ export const useLogList = <
|
|
|
59
59
|
meta,
|
|
60
60
|
metaData,
|
|
61
61
|
}) ?? Promise.resolve([]),
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
meta
|
|
67
|
-
|
|
68
|
-
...getXRay("useLogList", preferLegacyKeys),
|
|
69
|
-
},
|
|
62
|
+
enabled: typeof get !== "undefined",
|
|
63
|
+
...queryOptions,
|
|
64
|
+
retry: false,
|
|
65
|
+
meta: {
|
|
66
|
+
...queryOptions?.meta,
|
|
67
|
+
...getXRay("useLogList", preferLegacyKeys),
|
|
70
68
|
},
|
|
71
|
-
);
|
|
69
|
+
});
|
|
72
70
|
|
|
73
71
|
return queryResponse;
|
|
74
72
|
};
|
|
@@ -121,76 +121,73 @@ export function useForgotPassword<TVariables = {}>({
|
|
|
121
121
|
Error | RefineError,
|
|
122
122
|
TVariables,
|
|
123
123
|
unknown
|
|
124
|
-
>(
|
|
125
|
-
keys()
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
124
|
+
>({
|
|
125
|
+
mutationKey: keys()
|
|
126
|
+
.auth()
|
|
127
|
+
.action("forgotPassword")
|
|
128
|
+
.get(preferLegacyKeys),
|
|
129
|
+
mutationFn: forgotPasswordFromContext,
|
|
130
|
+
onSuccess: ({ success, redirectTo, error }) => {
|
|
131
|
+
if (success) {
|
|
132
|
+
close?.("forgot-password-error");
|
|
133
|
+
}
|
|
132
134
|
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
135
|
+
if (error || !success) {
|
|
136
|
+
open?.(buildNotification(error));
|
|
137
|
+
}
|
|
136
138
|
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
}
|
|
139
|
+
if (redirectTo) {
|
|
140
|
+
if (routerType === "legacy") {
|
|
141
|
+
replace(redirectTo);
|
|
142
|
+
} else {
|
|
143
|
+
go({ to: redirectTo, type: "replace" });
|
|
143
144
|
}
|
|
144
|
-
}
|
|
145
|
-
onError: (error: any) => {
|
|
146
|
-
open?.(buildNotification(error));
|
|
147
|
-
},
|
|
148
|
-
...(v3LegacyAuthProviderCompatible === true ? {} : mutationOptions),
|
|
149
|
-
meta: {
|
|
150
|
-
...(v3LegacyAuthProviderCompatible === true
|
|
151
|
-
? {}
|
|
152
|
-
: mutationOptions?.meta),
|
|
153
|
-
...getXRay("useForgotPassword", preferLegacyKeys),
|
|
154
|
-
},
|
|
145
|
+
}
|
|
155
146
|
},
|
|
156
|
-
|
|
147
|
+
onError: (error: any) => {
|
|
148
|
+
open?.(buildNotification(error));
|
|
149
|
+
},
|
|
150
|
+
...(v3LegacyAuthProviderCompatible === true ? {} : mutationOptions),
|
|
151
|
+
meta: {
|
|
152
|
+
...(v3LegacyAuthProviderCompatible === true
|
|
153
|
+
? {}
|
|
154
|
+
: mutationOptions?.meta),
|
|
155
|
+
...getXRay("useForgotPassword", preferLegacyKeys),
|
|
156
|
+
},
|
|
157
|
+
});
|
|
157
158
|
|
|
158
159
|
const v3LegacyAuthProviderCompatibleMutation = useMutation<
|
|
159
160
|
TForgotPasswordData,
|
|
160
161
|
Error | RefineError,
|
|
161
162
|
TVariables,
|
|
162
163
|
unknown
|
|
163
|
-
>(
|
|
164
|
-
[
|
|
164
|
+
>({
|
|
165
|
+
mutationKey: [
|
|
165
166
|
...keys().auth().action("forgotPassword").get(preferLegacyKeys),
|
|
166
167
|
"v3LegacyAuthProviderCompatible",
|
|
167
168
|
],
|
|
168
|
-
v3LegacyAuthProviderCompatibleForgotPasswordFromContext,
|
|
169
|
-
{
|
|
170
|
-
|
|
171
|
-
if (redirectPathFromAuth
|
|
172
|
-
if (
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
go({ to: redirectPathFromAuth, type: "replace" });
|
|
177
|
-
}
|
|
169
|
+
mutationFn: v3LegacyAuthProviderCompatibleForgotPasswordFromContext,
|
|
170
|
+
onSuccess: (redirectPathFromAuth) => {
|
|
171
|
+
if (redirectPathFromAuth !== false) {
|
|
172
|
+
if (redirectPathFromAuth) {
|
|
173
|
+
if (routerType === "legacy") {
|
|
174
|
+
replace(redirectPathFromAuth);
|
|
175
|
+
} else {
|
|
176
|
+
go({ to: redirectPathFromAuth, type: "replace" });
|
|
178
177
|
}
|
|
179
178
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
...getXRay("useForgotPassword", preferLegacyKeys),
|
|
191
|
-
},
|
|
179
|
+
}
|
|
180
|
+
close?.("forgot-password-error");
|
|
181
|
+
},
|
|
182
|
+
onError: (error: any) => {
|
|
183
|
+
open?.(buildNotification(error));
|
|
184
|
+
},
|
|
185
|
+
...(v3LegacyAuthProviderCompatible ? mutationOptions : {}),
|
|
186
|
+
meta: {
|
|
187
|
+
...(v3LegacyAuthProviderCompatible ? mutationOptions?.meta : {}),
|
|
188
|
+
...getXRay("useForgotPassword", preferLegacyKeys),
|
|
192
189
|
},
|
|
193
|
-
);
|
|
190
|
+
});
|
|
194
191
|
|
|
195
192
|
return v3LegacyAuthProviderCompatible
|
|
196
193
|
? v3LegacyAuthProviderCompatibleMutation
|
|
@@ -68,41 +68,38 @@ export function useGetIdentity<TData = any>({
|
|
|
68
68
|
const { getIdentity } = useAuthBindingsContext();
|
|
69
69
|
const { keys, preferLegacyKeys } = useKeys();
|
|
70
70
|
|
|
71
|
-
const queryResponse = useQuery<TData>(
|
|
72
|
-
keys().auth().action("identity").get(preferLegacyKeys),
|
|
71
|
+
const queryResponse = useQuery<TData>({
|
|
72
|
+
queryKey: keys().auth().action("identity").get(preferLegacyKeys),
|
|
73
73
|
// Enabled check for `getIdentity` is enough to be sure that it's defined in the query function but TS is not smart enough to know that.
|
|
74
|
-
|
|
74
|
+
queryFn:
|
|
75
|
+
(getIdentity as (params?: unknown) => Promise<TData>) ??
|
|
75
76
|
(() => Promise.resolve({})),
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
...getXRay("useGetIdentity", preferLegacyKeys),
|
|
85
|
-
},
|
|
77
|
+
enabled: !v3LegacyAuthProviderCompatible && !!getIdentity,
|
|
78
|
+
retry: false,
|
|
79
|
+
...(v3LegacyAuthProviderCompatible === true ? {} : queryOptions),
|
|
80
|
+
meta: {
|
|
81
|
+
...(v3LegacyAuthProviderCompatible === true
|
|
82
|
+
? {}
|
|
83
|
+
: queryOptions?.meta),
|
|
84
|
+
...getXRay("useGetIdentity", preferLegacyKeys),
|
|
86
85
|
},
|
|
87
|
-
);
|
|
86
|
+
});
|
|
88
87
|
|
|
89
|
-
const legacyQueryResponse = useQuery<TData>(
|
|
90
|
-
[
|
|
88
|
+
const legacyQueryResponse = useQuery<TData>({
|
|
89
|
+
queryKey: [
|
|
91
90
|
...keys().auth().action("identity").get(preferLegacyKeys),
|
|
92
91
|
"v3LegacyAuthProviderCompatible",
|
|
93
92
|
],
|
|
94
93
|
// Enabled check for `getUserIdentity` is enough to be sure that it's defined in the query function but TS is not smart enough to know that.
|
|
95
|
-
legacyGetUserIdentity ?? (() => Promise.resolve({})),
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
meta: {
|
|
101
|
-
|
|
102
|
-
...getXRay("useGetIdentity", preferLegacyKeys),
|
|
103
|
-
},
|
|
94
|
+
queryFn: legacyGetUserIdentity ?? (() => Promise.resolve({})),
|
|
95
|
+
enabled: v3LegacyAuthProviderCompatible && !!legacyGetUserIdentity,
|
|
96
|
+
retry: false,
|
|
97
|
+
...(v3LegacyAuthProviderCompatible ? queryOptions : {}),
|
|
98
|
+
meta: {
|
|
99
|
+
...(v3LegacyAuthProviderCompatible ? queryOptions?.meta : {}),
|
|
100
|
+
...getXRay("useGetIdentity", preferLegacyKeys),
|
|
104
101
|
},
|
|
105
|
-
);
|
|
102
|
+
});
|
|
106
103
|
|
|
107
104
|
return v3LegacyAuthProviderCompatible ? legacyQueryResponse : queryResponse;
|
|
108
105
|
}
|
|
@@ -56,20 +56,22 @@ export function useIsAuthenticated({
|
|
|
56
56
|
const { check } = useAuthBindingsContext();
|
|
57
57
|
const { keys, preferLegacyKeys } = useKeys();
|
|
58
58
|
|
|
59
|
-
const queryResponse = useQuery(
|
|
60
|
-
keys()
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
59
|
+
const queryResponse = useQuery({
|
|
60
|
+
queryKey: keys()
|
|
61
|
+
.auth()
|
|
62
|
+
.action("check")
|
|
63
|
+
.params(params)
|
|
64
|
+
.get(preferLegacyKeys),
|
|
65
|
+
queryFn: async () => (await check?.(params)) ?? {},
|
|
66
|
+
retry: false,
|
|
67
|
+
enabled: !v3LegacyAuthProviderCompatible,
|
|
68
|
+
meta: {
|
|
69
|
+
...getXRay("useIsAuthenticated", preferLegacyKeys),
|
|
68
70
|
},
|
|
69
|
-
);
|
|
71
|
+
});
|
|
70
72
|
|
|
71
|
-
const legacyQueryResponse = useQuery(
|
|
72
|
-
[
|
|
73
|
+
const legacyQueryResponse = useQuery({
|
|
74
|
+
queryKey: [
|
|
73
75
|
...keys()
|
|
74
76
|
.auth()
|
|
75
77
|
.action("check")
|
|
@@ -77,15 +79,13 @@ export function useIsAuthenticated({
|
|
|
77
79
|
.get(preferLegacyKeys),
|
|
78
80
|
"v3LegacyAuthProviderCompatible",
|
|
79
81
|
],
|
|
80
|
-
async () => (await checkAuth?.(params)) ?? {},
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
...getXRay("useIsAuthenticated", preferLegacyKeys),
|
|
86
|
-
},
|
|
82
|
+
queryFn: async () => (await checkAuth?.(params)) ?? {},
|
|
83
|
+
retry: false,
|
|
84
|
+
enabled: v3LegacyAuthProviderCompatible,
|
|
85
|
+
meta: {
|
|
86
|
+
...getXRay("useIsAuthenticated", preferLegacyKeys),
|
|
87
87
|
},
|
|
88
|
-
);
|
|
88
|
+
});
|
|
89
89
|
|
|
90
90
|
return v3LegacyAuthProviderCompatible ? legacyQueryResponse : queryResponse;
|
|
91
91
|
}
|
|
@@ -145,7 +145,9 @@ export function useLogin<TVariables = {}>({
|
|
|
145
145
|
Error | RefineError,
|
|
146
146
|
TVariables,
|
|
147
147
|
unknown
|
|
148
|
-
>(
|
|
148
|
+
>({
|
|
149
|
+
mutationKey: keys().auth().action("login").get(preferLegacyKeys),
|
|
150
|
+
mutationFn: loginFromContext,
|
|
149
151
|
onSuccess: async ({ success, redirectTo, error }) => {
|
|
150
152
|
if (success) {
|
|
151
153
|
close?.("login-error");
|
|
@@ -192,50 +194,46 @@ export function useLogin<TVariables = {}>({
|
|
|
192
194
|
Error | RefineError,
|
|
193
195
|
TVariables,
|
|
194
196
|
unknown
|
|
195
|
-
>(
|
|
196
|
-
[
|
|
197
|
+
>({
|
|
198
|
+
mutationKey: [
|
|
197
199
|
...keys().auth().action("login").get(preferLegacyKeys),
|
|
198
200
|
"v3LegacyAuthProviderCompatible",
|
|
199
201
|
],
|
|
200
|
-
legacyLoginFromContext,
|
|
201
|
-
{
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
}
|
|
202
|
+
mutationFn: legacyLoginFromContext,
|
|
203
|
+
onSuccess: async (redirectPathFromAuth) => {
|
|
204
|
+
if (to) {
|
|
205
|
+
replace(to as string);
|
|
206
|
+
}
|
|
206
207
|
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
} else {
|
|
212
|
-
go({ to: redirectPathFromAuth, type: "replace" });
|
|
213
|
-
}
|
|
208
|
+
if (redirectPathFromAuth !== false && !to) {
|
|
209
|
+
if (typeof redirectPathFromAuth === "string") {
|
|
210
|
+
if (routerType === "legacy") {
|
|
211
|
+
replace(redirectPathFromAuth);
|
|
214
212
|
} else {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
213
|
+
go({ to: redirectPathFromAuth, type: "replace" });
|
|
214
|
+
}
|
|
215
|
+
} else {
|
|
216
|
+
if (routerType === "legacy") {
|
|
217
|
+
replace("/");
|
|
218
|
+
} else {
|
|
219
|
+
go({ to: "/", type: "replace" });
|
|
220
220
|
}
|
|
221
221
|
}
|
|
222
|
+
}
|
|
222
223
|
|
|
223
|
-
|
|
224
|
+
await invalidateAuthStore();
|
|
224
225
|
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
},
|
|
230
|
-
...(v3LegacyAuthProviderCompatible ? mutationOptions : {}),
|
|
231
|
-
meta: {
|
|
232
|
-
...(v3LegacyAuthProviderCompatible
|
|
233
|
-
? mutationOptions?.meta
|
|
234
|
-
: {}),
|
|
235
|
-
...getXRay("useLogin", preferLegacyKeys),
|
|
236
|
-
},
|
|
226
|
+
close?.("login-error");
|
|
227
|
+
},
|
|
228
|
+
onError: (error: any) => {
|
|
229
|
+
open?.(buildNotification(error));
|
|
237
230
|
},
|
|
238
|
-
|
|
231
|
+
...(v3LegacyAuthProviderCompatible ? mutationOptions : {}),
|
|
232
|
+
meta: {
|
|
233
|
+
...(v3LegacyAuthProviderCompatible ? mutationOptions?.meta : {}),
|
|
234
|
+
...getXRay("useLogin", preferLegacyKeys),
|
|
235
|
+
},
|
|
236
|
+
});
|
|
239
237
|
|
|
240
238
|
return v3LegacyAuthProviderCompatible
|
|
241
239
|
? v3LegacyAuthProviderCompatibleMutation
|
|
@@ -118,7 +118,9 @@ export function useLogout<TVariables = {}>({
|
|
|
118
118
|
Error | RefineError,
|
|
119
119
|
(TVariables & Variables) | void,
|
|
120
120
|
unknown
|
|
121
|
-
>(
|
|
121
|
+
>({
|
|
122
|
+
mutationKey: keys().auth().action("logout").get(preferLegacyKeys),
|
|
123
|
+
mutationFn: logoutFromContext,
|
|
122
124
|
onSuccess: async (data, variables) => {
|
|
123
125
|
const { success, error, redirectTo } = data;
|
|
124
126
|
const { redirectPath } = variables ?? {};
|
|
@@ -162,49 +164,45 @@ export function useLogout<TVariables = {}>({
|
|
|
162
164
|
Error | RefineError,
|
|
163
165
|
(TVariables & Variables) | void,
|
|
164
166
|
unknown
|
|
165
|
-
>(
|
|
166
|
-
[
|
|
167
|
+
>({
|
|
168
|
+
mutationKey: [
|
|
167
169
|
...keys().auth().action("logout").get(preferLegacyKeys),
|
|
168
170
|
"v3LegacyAuthProviderCompatible",
|
|
169
171
|
],
|
|
170
|
-
legacyLogoutFromContext,
|
|
171
|
-
{
|
|
172
|
-
|
|
173
|
-
const redirectPath = variables?.redirectPath ?? data;
|
|
174
|
-
|
|
175
|
-
if (redirectPath === false) {
|
|
176
|
-
return;
|
|
177
|
-
}
|
|
172
|
+
mutationFn: legacyLogoutFromContext,
|
|
173
|
+
onSuccess: async (data, variables) => {
|
|
174
|
+
const redirectPath = variables?.redirectPath ?? data;
|
|
178
175
|
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
} else {
|
|
183
|
-
go({ to: redirectPath });
|
|
184
|
-
}
|
|
185
|
-
return;
|
|
186
|
-
}
|
|
176
|
+
if (redirectPath === false) {
|
|
177
|
+
return;
|
|
178
|
+
}
|
|
187
179
|
|
|
180
|
+
if (redirectPath) {
|
|
188
181
|
if (routerType === "legacy") {
|
|
189
|
-
push(
|
|
182
|
+
push(redirectPath);
|
|
190
183
|
} else {
|
|
191
|
-
go({ to:
|
|
184
|
+
go({ to: redirectPath });
|
|
192
185
|
}
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
193
188
|
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
}
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
...getXRay("useLogout", preferLegacyKeys),
|
|
205
|
-
},
|
|
189
|
+
if (routerType === "legacy") {
|
|
190
|
+
push("/login");
|
|
191
|
+
} else {
|
|
192
|
+
go({ to: "/login" });
|
|
193
|
+
}
|
|
194
|
+
|
|
195
|
+
await invalidateAuthStore();
|
|
196
|
+
},
|
|
197
|
+
onError: (error: any) => {
|
|
198
|
+
open?.(buildNotification(error));
|
|
206
199
|
},
|
|
207
|
-
|
|
200
|
+
...(v3LegacyAuthProviderCompatible ? mutationOptions : {}),
|
|
201
|
+
meta: {
|
|
202
|
+
...(v3LegacyAuthProviderCompatible ? mutationOptions?.meta : {}),
|
|
203
|
+
...getXRay("useLogout", preferLegacyKeys),
|
|
204
|
+
},
|
|
205
|
+
});
|
|
208
206
|
|
|
209
207
|
return v3LegacyAuthProviderCompatible
|
|
210
208
|
? v3LegacyAuthProviderCompatibleMutation
|