nextauthz 1.2.6 → 1.2.8
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/dist/index.d.mts +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.js +9 -7
- package/dist/index.mjs +9 -7
- package/package.json +1 -1
- package/src/AuthProvider.tsx +11 -11
package/dist/index.d.mts
CHANGED
|
@@ -10,7 +10,7 @@ type AuthContextType<UserType extends User$1 = User$1> = {
|
|
|
10
10
|
user: UserType | null;
|
|
11
11
|
role: string | null;
|
|
12
12
|
isAuthenticated: boolean;
|
|
13
|
-
login: (tokens: Record<string, string>, userData
|
|
13
|
+
login: (tokens: Record<string, string>, userData?: UserType, role?: string) => void;
|
|
14
14
|
logout: () => void;
|
|
15
15
|
setUser: (user: UserType | null) => void;
|
|
16
16
|
tokenKey: string;
|
package/dist/index.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ type AuthContextType<UserType extends User$1 = User$1> = {
|
|
|
10
10
|
user: UserType | null;
|
|
11
11
|
role: string | null;
|
|
12
12
|
isAuthenticated: boolean;
|
|
13
|
-
login: (tokens: Record<string, string>, userData
|
|
13
|
+
login: (tokens: Record<string, string>, userData?: UserType, role?: string) => void;
|
|
14
14
|
logout: () => void;
|
|
15
15
|
setUser: (user: UserType | null) => void;
|
|
16
16
|
tokenKey: string;
|
package/dist/index.js
CHANGED
|
@@ -80,12 +80,14 @@ function createAuthContext(option) {
|
|
|
80
80
|
(0, import_react.useEffect)(() => {
|
|
81
81
|
const storedUser = manager.getSingleToken("user");
|
|
82
82
|
const token = manager.getSingleToken(tokenKey);
|
|
83
|
-
if (
|
|
83
|
+
if (token && !manager.isExpired(token)) {
|
|
84
84
|
try {
|
|
85
|
-
const parsedUser = JSON.parse(storedUser);
|
|
86
|
-
setUser(parsedUser);
|
|
87
|
-
setRole(parsedUser?.role ?? null);
|
|
88
85
|
setAuth(true);
|
|
86
|
+
if (storedUser) {
|
|
87
|
+
const parsedUser = JSON.parse(storedUser);
|
|
88
|
+
setUser(parsedUser);
|
|
89
|
+
setRole(parsedUser?.role ?? null);
|
|
90
|
+
}
|
|
89
91
|
} catch {
|
|
90
92
|
resetAuth();
|
|
91
93
|
}
|
|
@@ -99,10 +101,10 @@ function createAuthContext(option) {
|
|
|
99
101
|
manager.setTokens({
|
|
100
102
|
...tokens,
|
|
101
103
|
[tokenKey]: tokenValue,
|
|
102
|
-
user: JSON.stringify(userData)
|
|
104
|
+
user: JSON.stringify(userData ?? null)
|
|
103
105
|
});
|
|
104
|
-
setUser(userData);
|
|
105
|
-
setRole(role2);
|
|
106
|
+
if (userData) setUser(userData);
|
|
107
|
+
setRole(role2 ?? null);
|
|
106
108
|
setAuth(true);
|
|
107
109
|
};
|
|
108
110
|
const logout = () => {
|
package/dist/index.mjs
CHANGED
|
@@ -53,12 +53,14 @@ function createAuthContext(option) {
|
|
|
53
53
|
useEffect(() => {
|
|
54
54
|
const storedUser = manager.getSingleToken("user");
|
|
55
55
|
const token = manager.getSingleToken(tokenKey);
|
|
56
|
-
if (
|
|
56
|
+
if (token && !manager.isExpired(token)) {
|
|
57
57
|
try {
|
|
58
|
-
const parsedUser = JSON.parse(storedUser);
|
|
59
|
-
setUser(parsedUser);
|
|
60
|
-
setRole(parsedUser?.role ?? null);
|
|
61
58
|
setAuth(true);
|
|
59
|
+
if (storedUser) {
|
|
60
|
+
const parsedUser = JSON.parse(storedUser);
|
|
61
|
+
setUser(parsedUser);
|
|
62
|
+
setRole(parsedUser?.role ?? null);
|
|
63
|
+
}
|
|
62
64
|
} catch {
|
|
63
65
|
resetAuth();
|
|
64
66
|
}
|
|
@@ -72,10 +74,10 @@ function createAuthContext(option) {
|
|
|
72
74
|
manager.setTokens({
|
|
73
75
|
...tokens,
|
|
74
76
|
[tokenKey]: tokenValue,
|
|
75
|
-
user: JSON.stringify(userData)
|
|
77
|
+
user: JSON.stringify(userData ?? null)
|
|
76
78
|
});
|
|
77
|
-
setUser(userData);
|
|
78
|
-
setRole(role2);
|
|
79
|
+
if (userData) setUser(userData);
|
|
80
|
+
setRole(role2 ?? null);
|
|
79
81
|
setAuth(true);
|
|
80
82
|
};
|
|
81
83
|
const logout = () => {
|
package/package.json
CHANGED
package/src/AuthProvider.tsx
CHANGED
|
@@ -12,7 +12,7 @@ export type AuthContextType<UserType extends User = User> = {
|
|
|
12
12
|
user: UserType | null
|
|
13
13
|
role: string | null
|
|
14
14
|
isAuthenticated: boolean
|
|
15
|
-
login: (tokens: Record<string, string>, userData
|
|
15
|
+
login: (tokens: Record<string, string>, userData?: UserType, role?: string) => void
|
|
16
16
|
logout: () => void
|
|
17
17
|
setUser: (user: UserType | null) => void
|
|
18
18
|
tokenKey: string
|
|
@@ -37,7 +37,6 @@ export function createAuthContext<UserType extends User = User>(option?: {
|
|
|
37
37
|
}, [storage])
|
|
38
38
|
|
|
39
39
|
const manager = useTokenManager()
|
|
40
|
-
|
|
41
40
|
const {
|
|
42
41
|
user,
|
|
43
42
|
role,
|
|
@@ -57,12 +56,14 @@ export function createAuthContext<UserType extends User = User>(option?: {
|
|
|
57
56
|
const storedUser = manager.getSingleToken('user')
|
|
58
57
|
const token = manager.getSingleToken(tokenKey)
|
|
59
58
|
|
|
60
|
-
if (
|
|
59
|
+
if (token && !manager.isExpired(token)) {
|
|
61
60
|
try {
|
|
62
|
-
const parsedUser = JSON.parse(storedUser) as UserType
|
|
63
|
-
setUser(parsedUser)
|
|
64
|
-
setRole((parsedUser as any)?.role ?? null)
|
|
65
61
|
setAuth(true)
|
|
62
|
+
if(storedUser) {
|
|
63
|
+
const parsedUser = JSON.parse(storedUser) as UserType
|
|
64
|
+
setUser(parsedUser)
|
|
65
|
+
setRole((parsedUser as any)?.role ?? null)
|
|
66
|
+
}
|
|
66
67
|
} catch {
|
|
67
68
|
resetAuth()
|
|
68
69
|
}
|
|
@@ -78,18 +79,17 @@ export function createAuthContext<UserType extends User = User>(option?: {
|
|
|
78
79
|
/* Login */
|
|
79
80
|
/* ---------------------------------- */
|
|
80
81
|
|
|
81
|
-
const login = (tokens: Record<string, string>, userData
|
|
82
|
-
// Use dynamic token key
|
|
82
|
+
const login = (tokens: Record<string, string>, userData?: UserType, role?: string) => {
|
|
83
83
|
const tokenValue = tokens[tokenKey] ?? tokens['access_token'] ?? Object.values(tokens)[0]
|
|
84
84
|
|
|
85
85
|
manager.setTokens({
|
|
86
86
|
...tokens,
|
|
87
87
|
[tokenKey]: tokenValue,
|
|
88
|
-
user: JSON.stringify(userData),
|
|
88
|
+
user: JSON.stringify(userData ?? null),
|
|
89
89
|
})
|
|
90
90
|
|
|
91
|
-
setUser(userData)
|
|
92
|
-
setRole(role
|
|
91
|
+
if (userData) setUser(userData)
|
|
92
|
+
setRole(role ?? null)
|
|
93
93
|
setAuth(true)
|
|
94
94
|
}
|
|
95
95
|
|