@logto/react 2.2.1 → 2.2.4
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/lib/hooks/index.cjs +20 -21
- package/lib/hooks/index.d.ts +1 -1
- package/lib/hooks/index.js +20 -21
- package/lib/index.cjs +12 -12
- package/package.json +8 -8
package/lib/hooks/index.cjs
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
+
var essentials = require('@silverhand/essentials');
|
|
3
4
|
var react = require('react');
|
|
4
5
|
var context = require('../context.cjs');
|
|
5
6
|
|
|
@@ -38,36 +39,34 @@ const useHandleSignInCallback = (callback) => {
|
|
|
38
39
|
// eslint-disable-next-line @silverhand/fp/no-mutation
|
|
39
40
|
callbackRef.current = callback; // Update ref to the latest callback.
|
|
40
41
|
}, [callback]);
|
|
41
|
-
const handleSignInCallback = react.useCallback(async (callbackUri) => {
|
|
42
|
-
if (!logtoClient) {
|
|
43
|
-
return context.throwContextError();
|
|
44
|
-
}
|
|
45
|
-
try {
|
|
46
|
-
setLoadingState(true);
|
|
47
|
-
await logtoClient.handleSignInCallback(callbackUri);
|
|
48
|
-
setIsAuthenticated(true);
|
|
49
|
-
callbackRef.current?.();
|
|
50
|
-
}
|
|
51
|
-
catch (error) {
|
|
52
|
-
handleError(error, 'Unexpected error occurred while handling sign in callback.');
|
|
53
|
-
}
|
|
54
|
-
finally {
|
|
55
|
-
setLoadingState(false);
|
|
56
|
-
}
|
|
57
|
-
}, [logtoClient, setLoadingState, setIsAuthenticated, handleError]);
|
|
58
42
|
react.useEffect(() => {
|
|
59
|
-
if (!logtoClient) {
|
|
43
|
+
if (!logtoClient || isLoading || error) {
|
|
60
44
|
return;
|
|
61
45
|
}
|
|
62
46
|
(async () => {
|
|
63
47
|
const currentPageUrl = window.location.href;
|
|
64
|
-
const isAuthenticated = await logtoClient.isAuthenticated();
|
|
65
48
|
const isRedirected = await logtoClient.isSignInRedirected(currentPageUrl);
|
|
66
49
|
if (!isAuthenticated && isRedirected) {
|
|
67
|
-
|
|
50
|
+
setLoadingState(true);
|
|
51
|
+
await essentials.trySafe(async () => {
|
|
52
|
+
await logtoClient.handleSignInCallback(currentPageUrl);
|
|
53
|
+
setIsAuthenticated(true);
|
|
54
|
+
callbackRef.current?.();
|
|
55
|
+
}, (error) => {
|
|
56
|
+
handleError(error, 'Unexpected error occurred while handling sign in callback.');
|
|
57
|
+
});
|
|
58
|
+
setLoadingState(false);
|
|
68
59
|
}
|
|
69
60
|
})();
|
|
70
|
-
}, [
|
|
61
|
+
}, [
|
|
62
|
+
error,
|
|
63
|
+
handleError,
|
|
64
|
+
isAuthenticated,
|
|
65
|
+
isLoading,
|
|
66
|
+
logtoClient,
|
|
67
|
+
setIsAuthenticated,
|
|
68
|
+
setLoadingState,
|
|
69
|
+
]);
|
|
71
70
|
return {
|
|
72
71
|
isLoading,
|
|
73
72
|
isAuthenticated,
|
package/lib/hooks/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type LogtoClient from '@logto/browser';
|
|
2
|
-
import type
|
|
2
|
+
import { type Optional } from '@silverhand/essentials';
|
|
3
3
|
type OptionalPromiseReturn<T> = {
|
|
4
4
|
[K in keyof T]: T[K] extends (...args: infer A) => Promise<infer R> ? (...args: A) => Promise<Optional<R>> : T[K];
|
|
5
5
|
};
|
package/lib/hooks/index.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { trySafe } from '@silverhand/essentials';
|
|
1
2
|
import { useContext, useRef, useEffect, useCallback, useMemo } from 'react';
|
|
2
3
|
import { LogtoContext, throwContextError } from '../context.js';
|
|
3
4
|
|
|
@@ -36,36 +37,34 @@ const useHandleSignInCallback = (callback) => {
|
|
|
36
37
|
// eslint-disable-next-line @silverhand/fp/no-mutation
|
|
37
38
|
callbackRef.current = callback; // Update ref to the latest callback.
|
|
38
39
|
}, [callback]);
|
|
39
|
-
const handleSignInCallback = useCallback(async (callbackUri) => {
|
|
40
|
-
if (!logtoClient) {
|
|
41
|
-
return throwContextError();
|
|
42
|
-
}
|
|
43
|
-
try {
|
|
44
|
-
setLoadingState(true);
|
|
45
|
-
await logtoClient.handleSignInCallback(callbackUri);
|
|
46
|
-
setIsAuthenticated(true);
|
|
47
|
-
callbackRef.current?.();
|
|
48
|
-
}
|
|
49
|
-
catch (error) {
|
|
50
|
-
handleError(error, 'Unexpected error occurred while handling sign in callback.');
|
|
51
|
-
}
|
|
52
|
-
finally {
|
|
53
|
-
setLoadingState(false);
|
|
54
|
-
}
|
|
55
|
-
}, [logtoClient, setLoadingState, setIsAuthenticated, handleError]);
|
|
56
40
|
useEffect(() => {
|
|
57
|
-
if (!logtoClient) {
|
|
41
|
+
if (!logtoClient || isLoading || error) {
|
|
58
42
|
return;
|
|
59
43
|
}
|
|
60
44
|
(async () => {
|
|
61
45
|
const currentPageUrl = window.location.href;
|
|
62
|
-
const isAuthenticated = await logtoClient.isAuthenticated();
|
|
63
46
|
const isRedirected = await logtoClient.isSignInRedirected(currentPageUrl);
|
|
64
47
|
if (!isAuthenticated && isRedirected) {
|
|
65
|
-
|
|
48
|
+
setLoadingState(true);
|
|
49
|
+
await trySafe(async () => {
|
|
50
|
+
await logtoClient.handleSignInCallback(currentPageUrl);
|
|
51
|
+
setIsAuthenticated(true);
|
|
52
|
+
callbackRef.current?.();
|
|
53
|
+
}, (error) => {
|
|
54
|
+
handleError(error, 'Unexpected error occurred while handling sign in callback.');
|
|
55
|
+
});
|
|
56
|
+
setLoadingState(false);
|
|
66
57
|
}
|
|
67
58
|
})();
|
|
68
|
-
}, [
|
|
59
|
+
}, [
|
|
60
|
+
error,
|
|
61
|
+
handleError,
|
|
62
|
+
isAuthenticated,
|
|
63
|
+
isLoading,
|
|
64
|
+
logtoClient,
|
|
65
|
+
setIsAuthenticated,
|
|
66
|
+
setLoadingState,
|
|
67
|
+
]);
|
|
69
68
|
return {
|
|
70
69
|
isLoading,
|
|
71
70
|
isAuthenticated,
|
package/lib/index.cjs
CHANGED
|
@@ -6,51 +6,51 @@ var index = require('./hooks/index.cjs');
|
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
|
|
9
|
-
Object.defineProperty(exports,
|
|
9
|
+
Object.defineProperty(exports, "LogtoClientError", {
|
|
10
10
|
enumerable: true,
|
|
11
11
|
get: function () { return LogtoClient.LogtoClientError; }
|
|
12
12
|
});
|
|
13
|
-
Object.defineProperty(exports,
|
|
13
|
+
Object.defineProperty(exports, "LogtoError", {
|
|
14
14
|
enumerable: true,
|
|
15
15
|
get: function () { return LogtoClient.LogtoError; }
|
|
16
16
|
});
|
|
17
|
-
Object.defineProperty(exports,
|
|
17
|
+
Object.defineProperty(exports, "LogtoRequestError", {
|
|
18
18
|
enumerable: true,
|
|
19
19
|
get: function () { return LogtoClient.LogtoRequestError; }
|
|
20
20
|
});
|
|
21
|
-
Object.defineProperty(exports,
|
|
21
|
+
Object.defineProperty(exports, "OidcError", {
|
|
22
22
|
enumerable: true,
|
|
23
23
|
get: function () { return LogtoClient.OidcError; }
|
|
24
24
|
});
|
|
25
|
-
Object.defineProperty(exports,
|
|
25
|
+
Object.defineProperty(exports, "PersistKey", {
|
|
26
26
|
enumerable: true,
|
|
27
27
|
get: function () { return LogtoClient.PersistKey; }
|
|
28
28
|
});
|
|
29
|
-
Object.defineProperty(exports,
|
|
29
|
+
Object.defineProperty(exports, "Prompt", {
|
|
30
30
|
enumerable: true,
|
|
31
31
|
get: function () { return LogtoClient.Prompt; }
|
|
32
32
|
});
|
|
33
|
-
Object.defineProperty(exports,
|
|
33
|
+
Object.defineProperty(exports, "ReservedResource", {
|
|
34
34
|
enumerable: true,
|
|
35
35
|
get: function () { return LogtoClient.ReservedResource; }
|
|
36
36
|
});
|
|
37
|
-
Object.defineProperty(exports,
|
|
37
|
+
Object.defineProperty(exports, "ReservedScope", {
|
|
38
38
|
enumerable: true,
|
|
39
39
|
get: function () { return LogtoClient.ReservedScope; }
|
|
40
40
|
});
|
|
41
|
-
Object.defineProperty(exports,
|
|
41
|
+
Object.defineProperty(exports, "UserScope", {
|
|
42
42
|
enumerable: true,
|
|
43
43
|
get: function () { return LogtoClient.UserScope; }
|
|
44
44
|
});
|
|
45
|
-
Object.defineProperty(exports,
|
|
45
|
+
Object.defineProperty(exports, "buildOrganizationUrn", {
|
|
46
46
|
enumerable: true,
|
|
47
47
|
get: function () { return LogtoClient.buildOrganizationUrn; }
|
|
48
48
|
});
|
|
49
|
-
Object.defineProperty(exports,
|
|
49
|
+
Object.defineProperty(exports, "getOrganizationIdFromUrn", {
|
|
50
50
|
enumerable: true,
|
|
51
51
|
get: function () { return LogtoClient.getOrganizationIdFromUrn; }
|
|
52
52
|
});
|
|
53
|
-
Object.defineProperty(exports,
|
|
53
|
+
Object.defineProperty(exports, "organizationUrnPrefix", {
|
|
54
54
|
enumerable: true,
|
|
55
55
|
get: function () { return LogtoClient.organizationUrnPrefix; }
|
|
56
56
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@logto/react",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./lib/index.cjs",
|
|
6
6
|
"module": "./lib/index.js",
|
|
@@ -21,14 +21,14 @@
|
|
|
21
21
|
"directory": "packages/react"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
-
"@logto/browser": "^2.2.
|
|
25
|
-
"@silverhand/essentials": "^2.
|
|
24
|
+
"@logto/browser": "^2.2.2",
|
|
25
|
+
"@silverhand/essentials": "^2.8.7"
|
|
26
26
|
},
|
|
27
27
|
"devDependencies": {
|
|
28
|
-
"@silverhand/eslint-config": "^
|
|
29
|
-
"@silverhand/eslint-config-react": "^
|
|
30
|
-
"@silverhand/ts-config": "^
|
|
31
|
-
"@silverhand/ts-config-react": "^
|
|
28
|
+
"@silverhand/eslint-config": "^5.0.0",
|
|
29
|
+
"@silverhand/eslint-config-react": "^5.0.0",
|
|
30
|
+
"@silverhand/ts-config": "^5.0.0",
|
|
31
|
+
"@silverhand/ts-config-react": "^5.0.0",
|
|
32
32
|
"@swc/core": "^1.3.50",
|
|
33
33
|
"@swc/jest": "^0.2.24",
|
|
34
34
|
"@testing-library/react": "^14.0.0",
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
"postcss": "^8.4.31",
|
|
41
41
|
"prettier": "^3.0.0",
|
|
42
42
|
"react": "^18.0.2",
|
|
43
|
-
"stylelint": "^
|
|
43
|
+
"stylelint": "^16.0.0",
|
|
44
44
|
"typescript": "^5.0.0"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|