@mu-cabin/opms-permission 0.8.3 → 0.8.5
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.cjs +22 -36
- package/dist/index.d.mts +2 -2
- package/dist/index.d.ts +2 -2
- package/dist/index.mjs +22 -36
- package/package.json +1 -1
package/dist/index.cjs
CHANGED
@@ -276,44 +276,36 @@ var Permission = class {
|
|
276
276
|
* Login using code from URL, save userInfo
|
277
277
|
*/
|
278
278
|
async login(code) {
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
} = await login(this.baseUrl, authCode);
|
294
|
-
if (!success || loginCode !== 200) {
|
295
|
-
return Promise.reject({
|
296
|
-
code: loginCode,
|
297
|
-
msg
|
298
|
-
});
|
299
|
-
}
|
300
|
-
const { token } = obj;
|
301
|
-
url.searchParams.delete("code");
|
302
|
-
storage.setItem(TOKEN_KEY, token);
|
303
|
-
return token;
|
304
|
-
} catch (error) {
|
279
|
+
const url = new URL(window.location.href);
|
280
|
+
const authCode = code || url.searchParams.get("code");
|
281
|
+
if (!authCode) {
|
282
|
+
return Promise.reject({
|
283
|
+
code: 400,
|
284
|
+
msg: "No code found in URL"
|
285
|
+
});
|
286
|
+
}
|
287
|
+
const {
|
288
|
+
obj,
|
289
|
+
msg,
|
290
|
+
code: loginCode
|
291
|
+
} = await login(this.baseUrl, authCode);
|
292
|
+
if (loginCode !== 200) {
|
305
293
|
return Promise.reject({
|
306
|
-
code:
|
307
|
-
msg
|
294
|
+
code: loginCode,
|
295
|
+
msg
|
308
296
|
});
|
309
297
|
}
|
298
|
+
const { token } = obj;
|
299
|
+
url.searchParams.delete("code");
|
300
|
+
storage.setItem(TOKEN_KEY, token);
|
301
|
+
return token;
|
310
302
|
}
|
311
303
|
/**
|
312
304
|
* Logout and clear userInfo
|
313
305
|
*/
|
314
|
-
async logout() {
|
306
|
+
async logout(clearData = false) {
|
315
307
|
await logout(this.baseUrl);
|
316
|
-
this.clear();
|
308
|
+
clearData && this.clear();
|
317
309
|
}
|
318
310
|
clear() {
|
319
311
|
this._userInfo = null;
|
@@ -332,12 +324,6 @@ var Permission = class {
|
|
332
324
|
async getUserInfo() {
|
333
325
|
const data = await getUserInfo(this.baseUrl);
|
334
326
|
const { obj, success, msg, code } = data;
|
335
|
-
if (!success) {
|
336
|
-
return Promise.reject({
|
337
|
-
code,
|
338
|
-
msg
|
339
|
-
});
|
340
|
-
}
|
341
327
|
this._userInfo = obj;
|
342
328
|
return this.userInfo;
|
343
329
|
}
|
package/dist/index.d.mts
CHANGED
@@ -65,7 +65,7 @@ declare class Permission {
|
|
65
65
|
/**
|
66
66
|
* Logout and clear userInfo
|
67
67
|
*/
|
68
|
-
logout(): Promise<void>;
|
68
|
+
logout(clearData?: boolean): Promise<void>;
|
69
69
|
clear(): void;
|
70
70
|
getUserInfo(): Promise<UserInfo | null>;
|
71
71
|
/**
|
@@ -120,7 +120,7 @@ declare function jumpToSSOLogin({ baseUrl, redirectUrl, clientId, }: {
|
|
120
120
|
*/
|
121
121
|
declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
|
122
122
|
baseUrl: string;
|
123
|
-
redirectToUrl
|
123
|
+
redirectToUrl?: string;
|
124
124
|
clientId?: string;
|
125
125
|
}): void;
|
126
126
|
|
package/dist/index.d.ts
CHANGED
@@ -65,7 +65,7 @@ declare class Permission {
|
|
65
65
|
/**
|
66
66
|
* Logout and clear userInfo
|
67
67
|
*/
|
68
|
-
logout(): Promise<void>;
|
68
|
+
logout(clearData?: boolean): Promise<void>;
|
69
69
|
clear(): void;
|
70
70
|
getUserInfo(): Promise<UserInfo | null>;
|
71
71
|
/**
|
@@ -120,7 +120,7 @@ declare function jumpToSSOLogin({ baseUrl, redirectUrl, clientId, }: {
|
|
120
120
|
*/
|
121
121
|
declare function jumpToSSOLogout({ baseUrl, redirectToUrl, clientId, }: {
|
122
122
|
baseUrl: string;
|
123
|
-
redirectToUrl
|
123
|
+
redirectToUrl?: string;
|
124
124
|
clientId?: string;
|
125
125
|
}): void;
|
126
126
|
|
package/dist/index.mjs
CHANGED
@@ -238,44 +238,36 @@ var Permission = class {
|
|
238
238
|
* Login using code from URL, save userInfo
|
239
239
|
*/
|
240
240
|
async login(code) {
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
} = await login(this.baseUrl, authCode);
|
256
|
-
if (!success || loginCode !== 200) {
|
257
|
-
return Promise.reject({
|
258
|
-
code: loginCode,
|
259
|
-
msg
|
260
|
-
});
|
261
|
-
}
|
262
|
-
const { token } = obj;
|
263
|
-
url.searchParams.delete("code");
|
264
|
-
storage.setItem(TOKEN_KEY, token);
|
265
|
-
return token;
|
266
|
-
} catch (error) {
|
241
|
+
const url = new URL(window.location.href);
|
242
|
+
const authCode = code || url.searchParams.get("code");
|
243
|
+
if (!authCode) {
|
244
|
+
return Promise.reject({
|
245
|
+
code: 400,
|
246
|
+
msg: "No code found in URL"
|
247
|
+
});
|
248
|
+
}
|
249
|
+
const {
|
250
|
+
obj,
|
251
|
+
msg,
|
252
|
+
code: loginCode
|
253
|
+
} = await login(this.baseUrl, authCode);
|
254
|
+
if (loginCode !== 200) {
|
267
255
|
return Promise.reject({
|
268
|
-
code:
|
269
|
-
msg
|
256
|
+
code: loginCode,
|
257
|
+
msg
|
270
258
|
});
|
271
259
|
}
|
260
|
+
const { token } = obj;
|
261
|
+
url.searchParams.delete("code");
|
262
|
+
storage.setItem(TOKEN_KEY, token);
|
263
|
+
return token;
|
272
264
|
}
|
273
265
|
/**
|
274
266
|
* Logout and clear userInfo
|
275
267
|
*/
|
276
|
-
async logout() {
|
268
|
+
async logout(clearData = false) {
|
277
269
|
await logout(this.baseUrl);
|
278
|
-
this.clear();
|
270
|
+
clearData && this.clear();
|
279
271
|
}
|
280
272
|
clear() {
|
281
273
|
this._userInfo = null;
|
@@ -294,12 +286,6 @@ var Permission = class {
|
|
294
286
|
async getUserInfo() {
|
295
287
|
const data = await getUserInfo(this.baseUrl);
|
296
288
|
const { obj, success, msg, code } = data;
|
297
|
-
if (!success) {
|
298
|
-
return Promise.reject({
|
299
|
-
code,
|
300
|
-
msg
|
301
|
-
});
|
302
|
-
}
|
303
289
|
this._userInfo = obj;
|
304
290
|
return this.userInfo;
|
305
291
|
}
|