supaapps-auth 2.0.0-rc.2 → 2.0.0-rc.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/dist/AuthManager.d.ts +2 -2
- package/dist/AuthManager.js +8 -5
- package/package.json +1 -1
- package/src/AuthManager.ts +8 -5
package/dist/AuthManager.d.ts
CHANGED
|
@@ -11,8 +11,8 @@ export declare class AuthManager {
|
|
|
11
11
|
private tokenToPayload;
|
|
12
12
|
private toBase64Url;
|
|
13
13
|
private generatePKCEPair;
|
|
14
|
-
refreshAccessToken(): Promise<string>;
|
|
15
|
-
checkAccessToken(): Promise<string>;
|
|
14
|
+
refreshAccessToken(isInitilization?: boolean): Promise<string>;
|
|
15
|
+
checkAccessToken(isInitilization?: boolean): Promise<string>;
|
|
16
16
|
private isTokenExpired;
|
|
17
17
|
mustBeLoggedIn(): Promise<void>;
|
|
18
18
|
getLoginWithGoogleUri(): string;
|
package/dist/AuthManager.js
CHANGED
|
@@ -26,7 +26,7 @@ class AuthManager {
|
|
|
26
26
|
if (!AuthManager.instance) {
|
|
27
27
|
AuthManager.instance = new AuthManager(authServer, realmName, redirectUri, onStateChange);
|
|
28
28
|
AuthManager.instance
|
|
29
|
-
.checkAccessToken()
|
|
29
|
+
.checkAccessToken(true)
|
|
30
30
|
.then((token) => {
|
|
31
31
|
onStateChange({
|
|
32
32
|
type: types_1.AuthEventType.INITALIZED_IN,
|
|
@@ -63,7 +63,7 @@ class AuthManager {
|
|
|
63
63
|
return { verifier, challenge };
|
|
64
64
|
}
|
|
65
65
|
refreshAccessToken() {
|
|
66
|
-
return __awaiter(this,
|
|
66
|
+
return __awaiter(this, arguments, void 0, function* (isInitilization = false) {
|
|
67
67
|
try {
|
|
68
68
|
const refreshToken = localStorage.getItem('refresh_token');
|
|
69
69
|
if (!refreshToken) {
|
|
@@ -79,16 +79,19 @@ class AuthManager {
|
|
|
79
79
|
console.error(`Refresh token error, logging out: ${error}`);
|
|
80
80
|
localStorage.removeItem('access_token');
|
|
81
81
|
localStorage.removeItem('refresh_token');
|
|
82
|
-
|
|
82
|
+
if (!isInitilization) {
|
|
83
|
+
// throw refresh fail only if not initialization
|
|
84
|
+
this.onStateChange({ type: types_1.AuthEventType.REFRESH_FAILED });
|
|
85
|
+
}
|
|
83
86
|
throw error;
|
|
84
87
|
}
|
|
85
88
|
});
|
|
86
89
|
}
|
|
87
90
|
checkAccessToken() {
|
|
88
|
-
return __awaiter(this,
|
|
91
|
+
return __awaiter(this, arguments, void 0, function* (isInitilization = false) {
|
|
89
92
|
const accessToken = localStorage.getItem('access_token');
|
|
90
93
|
if (accessToken || this.isTokenExpired(accessToken)) {
|
|
91
|
-
return this.refreshAccessToken();
|
|
94
|
+
return this.refreshAccessToken(isInitilization);
|
|
92
95
|
}
|
|
93
96
|
return accessToken;
|
|
94
97
|
});
|
package/package.json
CHANGED
package/src/AuthManager.ts
CHANGED
|
@@ -44,7 +44,7 @@ export class AuthManager {
|
|
|
44
44
|
onStateChange,
|
|
45
45
|
);
|
|
46
46
|
AuthManager.instance
|
|
47
|
-
.checkAccessToken()
|
|
47
|
+
.checkAccessToken(true)
|
|
48
48
|
.then((token) => {
|
|
49
49
|
onStateChange({
|
|
50
50
|
type: AuthEventType.INITALIZED_IN,
|
|
@@ -95,7 +95,7 @@ export class AuthManager {
|
|
|
95
95
|
return { verifier, challenge };
|
|
96
96
|
}
|
|
97
97
|
|
|
98
|
-
public async refreshAccessToken(): Promise<string> {
|
|
98
|
+
public async refreshAccessToken(isInitilization: boolean = false): Promise<string> {
|
|
99
99
|
try {
|
|
100
100
|
const refreshToken = localStorage.getItem('refresh_token');
|
|
101
101
|
if (!refreshToken) {
|
|
@@ -114,15 +114,18 @@ export class AuthManager {
|
|
|
114
114
|
console.error(`Refresh token error, logging out: ${error}`);
|
|
115
115
|
localStorage.removeItem('access_token');
|
|
116
116
|
localStorage.removeItem('refresh_token');
|
|
117
|
-
|
|
117
|
+
if (!isInitilization) {
|
|
118
|
+
// throw refresh fail only if not initialization
|
|
119
|
+
this.onStateChange({ type: AuthEventType.REFRESH_FAILED });
|
|
120
|
+
}
|
|
118
121
|
throw error;
|
|
119
122
|
}
|
|
120
123
|
}
|
|
121
124
|
|
|
122
|
-
public async checkAccessToken(): Promise<string> {
|
|
125
|
+
public async checkAccessToken(isInitilization: boolean = false): Promise<string> {
|
|
123
126
|
const accessToken = localStorage.getItem('access_token');
|
|
124
127
|
if (accessToken || this.isTokenExpired(accessToken)) {
|
|
125
|
-
return this.refreshAccessToken();
|
|
128
|
+
return this.refreshAccessToken(isInitilization);
|
|
126
129
|
}
|
|
127
130
|
return accessToken;
|
|
128
131
|
}
|