@kwiz/node 1.0.29 → 1.0.31
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/auth/msal.d.ts +5 -3
- package/dist/auth/msal.js +19 -20
- package/dist/auth/msal.js.map +1 -1
- package/package.json +1 -1
package/dist/auth/msal.d.ts
CHANGED
|
@@ -10,15 +10,17 @@ export interface iUserTokenAccountInfo {
|
|
|
10
10
|
name?: string;
|
|
11
11
|
}
|
|
12
12
|
export interface iUserTokenRequestInfo {
|
|
13
|
-
|
|
13
|
+
/** graphScope or sharepoint site https://microsoft.sharepoint.com or tenant site https://[tenant].sharepoint.com
|
|
14
|
+
* code will append /.default to the sent scope
|
|
15
|
+
* cannot combine graph and sharepoint
|
|
16
|
+
*/
|
|
17
|
+
scope: string;
|
|
14
18
|
/** a page in your app that will get the code in query after user logs in, call GetMSALUserToken with that code */
|
|
15
19
|
redirectUri: string;
|
|
16
20
|
/** pass a state to the login uri page to validate and/or restore the user's app state (page he came from?) */
|
|
17
21
|
state?: string;
|
|
18
22
|
/** redeem a code from redirect */
|
|
19
23
|
code?: string;
|
|
20
|
-
/** request a new token silently from account cache */
|
|
21
|
-
account?: iUserTokenAccountInfo;
|
|
22
24
|
}
|
|
23
25
|
/** Get user token.
|
|
24
26
|
* if code or account proivded will attempt to get a token, otherwise will redirect the user
|
package/dist/auth/msal.js
CHANGED
|
@@ -62,29 +62,28 @@ function GetMSALUserToken(tenantInfo, auth, info, clearCache) {
|
|
|
62
62
|
if (clearCache)
|
|
63
63
|
app.clearCache();
|
|
64
64
|
let error;
|
|
65
|
-
if (info.account) {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
65
|
+
// if (info.account) {
|
|
66
|
+
// try {
|
|
67
|
+
// const result = await app.acquireTokenSilent({
|
|
68
|
+
// account: info.account,
|
|
69
|
+
// scopes: info.scopes,
|
|
70
|
+
// redirectUri: info.redirectUri
|
|
71
|
+
// });
|
|
72
|
+
// return {
|
|
73
|
+
// success: true,
|
|
74
|
+
// accessToken: result.accessToken,
|
|
75
|
+
// account: result.account
|
|
76
|
+
// }
|
|
77
|
+
// } catch (e) {
|
|
78
|
+
// logger.error(e);
|
|
79
|
+
// error = `Could not get token for account: ${GetError(e)}`;
|
|
80
|
+
// }
|
|
81
|
+
// }
|
|
83
82
|
if (info.code) {
|
|
84
83
|
try {
|
|
85
84
|
const result = yield app.acquireTokenByCode({
|
|
86
85
|
code: info.code,
|
|
87
|
-
scopes: info.
|
|
86
|
+
scopes: [`${info.scope}/.default`],
|
|
88
87
|
redirectUri: info.redirectUri,
|
|
89
88
|
state: info.state
|
|
90
89
|
});
|
|
@@ -99,7 +98,7 @@ function GetMSALUserToken(tenantInfo, auth, info, clearCache) {
|
|
|
99
98
|
error = `Could not redeem code: ${(0, common_1.GetError)(e)}`;
|
|
100
99
|
}
|
|
101
100
|
}
|
|
102
|
-
const loginUrl = yield app.getAuthCodeUrl(info);
|
|
101
|
+
const loginUrl = yield app.getAuthCodeUrl(Object.assign(Object.assign({}, info), { scopes: [`${info.scope}/.default`] }));
|
|
103
102
|
return { success: false, redirect: loginUrl, error };
|
|
104
103
|
});
|
|
105
104
|
}
|
package/dist/auth/msal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msal.js","sourceRoot":"","sources":["../../src/auth/msal.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAiE;AACjE,yCAAyG;AACzG,4GAA4G;AAC5G,kGAAkG;AAElG,MAAM,MAAM,GAAG,IAAI,qBAAY,CAAC,MAAM,CAAC,CAAC;AAExC,IAAI,IAAI,GAAwD,EAAE,CAAC;AAEnE,SAAS,MAAM,CAAC,UAAuB,EAAE,IAAqB;IAC1D,IAAI,GAAG,GAAG,GAAG,UAAU,CAAC,QAAQ,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAA;IAC7D,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QACb,IAAI,CAAC,kBAAkB,KAAK,4BAAmB,CAAC,YAAY;YACxD,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,yCAA6B,CAAC;gBAC5C,IAAI,EAAE;oBACF,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,SAAS,EAAE,UAAU,CAAC,YAAY;oBAClC,YAAY,EAAE,IAAI,CAAC,YAAY;iBAClC;aAEJ,CAAC;YACF,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,yCAA6B,CAAC;gBAC5C,IAAI,EAAE;oBACF,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,SAAS,EAAE,UAAU,CAAC,YAAY;oBAClC,iBAAiB,EAAE;wBACf,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;qBAC9B;iBACJ;aAEJ,CAAC,CAAC;IACX,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;AACrB,CAAC;AAED,0FAA0F;AAC1F,SAAsB,YAAY,CAAC,UAAuB,EAAE,KAAa,EAAE,IAAqB,EAAE,UAAoB;;QAClH,MAAM,GAAG,GAAG,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACrC,IAAI,UAAU;YACV,GAAG,CAAC,UAAU,EAAE,CAAC;QACrB,IAAI,KAAK,GAAG,MAAM,GAAG,CAAC,8BAA8B,CAAC;YACjD,MAAM,EAAE,CAAC,GAAG,KAAK,WAAW,CAAC;SAChC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,WAAW,CAAC;IAC7B,CAAC;CAAA;AARD,oCAQC;
|
|
1
|
+
{"version":3,"file":"msal.js","sourceRoot":"","sources":["../../src/auth/msal.ts"],"names":[],"mappings":"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"}
|