@kwiz/node 1.0.25 → 1.0.26

package/dist/auth/msal.d.ts

@@ -1,3 +1,31 @@
 import { AuthContextType, ITenantInfo } from "@kwiz/common";
-/** client secret not supported by SharePoint, must use certificate */
+/** Get app-only token. client secret not supported by SharePoint, must use certificate */
 export declare function GetMSALToken(tenantInfo: ITenantInfo, scope: string, auth: AuthContextType, clearCache?: boolean): Promise<string>;
+export interface iUserTokenAccountInfo {
+    homeAccountId: string;
+    environment: string;
+    tenantId: string;
+    username: string;
+    localAccountId: string;
+    name?: string;
+}
+export interface iUserTokenRequestInfo {
+    scopes: string[];
+    /** a page in your app that will get the code in query after user logs in, call GetMSALUserToken with that code */
+    redirectUri: string;
+    /** pass a state to the login uri page to validate and/or restore the user's app state (page he came from?) */
+    state?: string;
+    /** a redirect handler in case we need to take the user to the login page */
+    redirect: (url: string) => void;
+    /** code you got from redirectUri  */
+    code?: string;
+    /** if you kept a user account from previous GetMSALUserToken result - try to use it to get a silent token/refreshed token */
+    account?: iUserTokenAccountInfo;
+}
+/** Get user token.
+ * if code or account proivded will attempt to get a token, otherwise will redirect the user
+ * client secret not supported by SharePoint, must use certificate */
+export declare function GetMSALUserToken(tenantInfo: ITenantInfo, auth: AuthContextType, info: iUserTokenRequestInfo, clearCache?: boolean): Promise<{
+    accessToken: string;
+    account: iUserTokenAccountInfo;
+} | null>;

package/dist/auth/msal.js

@@ -9,11 +9,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetMSALToken = void 0;
+exports.GetMSALUserToken = exports.GetMSALToken = void 0;
 const msal_node_1 = require("@azure/msal-node");
 const common_1 = require("@kwiz/common");
 //find tenant id? https://login.microsoftonline.com/kwizcom.onmicrosoft.com/.well-known/openid-configuration
 //https://stackoverflow.com/questions/54771270/msal-ad-token-not-valid-with-sharepoint-online-csom
+const logger = new common_1.CommonLogger("msal");
 var apps = {};
 function GetApp(tenantInfo, auth) {
     let key = `${tenantInfo.idOrName}|${auth.authenticationMode}`;
@@ -39,7 +40,7 @@ function GetApp(tenantInfo, auth) {
     }
     return apps[key];
 }
-/** client secret not supported by SharePoint, must use certificate */
+/** Get app-only token. client secret not supported by SharePoint, must use certificate */
 function GetMSALToken(tenantInfo, scope, auth, clearCache) {
     return __awaiter(this, void 0, void 0, function* () {
         const app = GetApp(tenantInfo, auth);
@@ -52,4 +53,51 @@ function GetMSALToken(tenantInfo, scope, auth, clearCache) {
     });
 }
 exports.GetMSALToken = GetMSALToken;
+/** Get user token.
+ * if code or account proivded will attempt to get a token, otherwise will redirect the user
+ * client secret not supported by SharePoint, must use certificate */
+function GetMSALUserToken(tenantInfo, auth, info, clearCache) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const app = GetApp(tenantInfo, auth);
+        if (clearCache)
+            app.clearCache();
+        if (info.account) {
+            try {
+                const result = yield app.acquireTokenSilent({
+                    account: info.account,
+                    scopes: info.scopes,
+                    redirectUri: info.redirectUri
+                });
+                return {
+                    accessToken: result.accessToken,
+                    account: result.account
+                };
+            }
+            catch (e) {
+                logger.error(e);
+            }
+        }
+        if (info.code) {
+            try {
+                const result = yield app.acquireTokenByCode({
+                    code: info.code,
+                    scopes: info.scopes,
+                    redirectUri: info.redirectUri,
+                    state: info.state
+                });
+                return {
+                    accessToken: result.accessToken,
+                    account: result.account
+                };
+            }
+            catch (e) {
+                logger.error(e);
+            }
+        }
+        const loginUrl = yield app.getAuthCodeUrl(info);
+        info.redirect(loginUrl);
+        return null;
+    });
+}
+exports.GetMSALUserToken = GetMSALUserToken;
 //# sourceMappingURL=msal.js.map

package/dist/auth/msal.js.map

@@ -1 +1 @@
-{"version":3,"file":"msal.js","sourceRoot":"","sources":["../../src/auth/msal.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gDAAiE;AACjE,yCAAiF;AACjF,4GAA4G;AAC5G,kGAAkG;AAElG,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,sEAAsE;AACtE,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"}
+{"version":3,"file":"msal.js","sourceRoot":"","sources":["../../src/auth/msal.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kwiz/node",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "KWIZ utilities and helpers for node applications",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -70,7 +70,7 @@
   "dependencies": {
     "@azure/data-tables": "^13.2.2",
     "@azure/msal-node": "^2.6.4",
-    "@kwiz/common": "^1.0.164",
+    "@kwiz/common": "^1.0.173",
     "axios": "^1.6.7",
     "esbuild": "^0.19.12",
     "get-tsconfig": "^4.7.2",