@microsoft/teamsfx 1.2.1 → 2.0.0-alpha.fcb7f02f1.0

package/dist/index.esm5.js

@@ -1,6 +1,6 @@
 import { __awaiter } from 'tslib';
 import jwt_decode from 'jwt-decode';
-import * as microsoftTeams from '@microsoft/teams-js';
+import { app, authentication } from '@microsoft/teams-js';
 import { PublicClientApplication } from '@azure/msal-browser';
 import { Client } from '@microsoft/microsoft-graph-client';
 import axios from 'axios';
@@ -560,51 +560,48 @@ class TeamsUserCredential {
             if (!this.initialized) {
                 yield this.init(resources);
             }
-            return new Promise((resolve, reject) => {
-                microsoftTeams.initialize(() => {
-                    microsoftTeams.authentication.authenticate({
-                        url: `${this.config.initiateLoginEndpoint}?clientId=${this.config.clientId}&scope=${encodeURI(scopesStr)}&loginHint=${this.loginHint}`,
-                        width: loginPageWidth,
-                        height: loginPageHeight,
-                        successCallback: (result) => __awaiter(this, void 0, void 0, function* () {
-                            if (!result) {
-                                const errorMsg = "Get empty authentication result from MSAL";
-                                internalLogger.error(errorMsg);
-                                reject(new ErrorWithCode(errorMsg, ErrorCode.InternalError));
-                                return;
-                            }
-                            let resultJson = {};
-                            try {
-                                resultJson = typeof result == "string" ? JSON.parse(result) : result;
-                            }
-                            catch (error) {
-                                // If can not parse result as Json, will throw error.
-                                const failedToParseResult = "Failed to parse response to Json.";
-                                internalLogger.error(failedToParseResult);
-                                reject(new ErrorWithCode(failedToParseResult, ErrorCode.InvalidResponse));
-                            }
-                            // If code exists in result, user may using previous auth-start and auth-end page.
-                            if (resultJson.code) {
-                                const helpLink = "https://aka.ms/teamsfx-auth-code-flow";
-                                const usingPreviousAuthPage = "Found auth code in response. Auth code is not support for current version of SDK. " +
-                                    `Please refer to the help link for how to fix the issue: ${helpLink}.`;
-                                internalLogger.error(usingPreviousAuthPage);
-                                reject(new ErrorWithCode(usingPreviousAuthPage, ErrorCode.InvalidResponse));
-                            }
-                            // If sessionStorage exists in result, set the values in current session storage.
-                            if (resultJson.sessionStorage) {
-                                this.setSessionStorage(resultJson.sessionStorage);
-                            }
-                            resolve();
-                        }),
-                        failureCallback: (reason) => {
-                            const errorMsg = `Consent failed for the scope ${scopesStr} with error: ${reason}`;
-                            internalLogger.error(errorMsg);
-                            reject(new ErrorWithCode(errorMsg, ErrorCode.ConsentFailed));
-                        },
-                    });
-                });
-            });
+            yield app.initialize();
+            let result;
+            try {
+                const params = {
+                    url: `${this.config.initiateLoginEndpoint}?clientId=${this.config.clientId}&scope=${encodeURI(scopesStr)}&loginHint=${this.loginHint}`,
+                    width: loginPageWidth,
+                    height: loginPageHeight,
+                };
+                result = yield authentication.authenticate(params);
+                if (!result) {
+                    const errorMsg = "Get empty authentication result from MSAL";
+                    internalLogger.error(errorMsg);
+                    throw new ErrorWithCode(errorMsg, ErrorCode.InternalError);
+                }
+            }
+            catch (err) {
+                const errorMsg = `Consent failed for the scope ${scopesStr} with error: ${err.message}`;
+                internalLogger.error(errorMsg);
+                throw new ErrorWithCode(errorMsg, ErrorCode.ConsentFailed);
+            }
+            let resultJson = {};
+            try {
+                resultJson = typeof result == "string" ? JSON.parse(result) : result;
+            }
+            catch (error) {
+                // If can not parse result as Json, will throw error.
+                const failedToParseResult = "Failed to parse response to Json.";
+                internalLogger.error(failedToParseResult);
+                throw new ErrorWithCode(failedToParseResult, ErrorCode.InvalidResponse);
+            }
+            // If code exists in result, user may using previous auth-start and auth-end page.
+            if (resultJson.code) {
+                const helpLink = "https://aka.ms/teamsfx-auth-code-flow";
+                const usingPreviousAuthPage = "Found auth code in response. Auth code is not support for current version of SDK. " +
+                    `Please refer to the help link for how to fix the issue: ${helpLink}.`;
+                internalLogger.error(usingPreviousAuthPage);
+                throw new ErrorWithCode(usingPreviousAuthPage, ErrorCode.InvalidResponse);
+            }
+            // If sessionStorage exists in result, set the values in current session storage.
+            if (resultJson.sessionStorage) {
+                this.setSessionStorage(resultJson.sessionStorage);
+            }
         });
     }
     /**
@@ -754,52 +751,48 @@ class TeamsUserCredential {
      * @returns SSO token
      */
     getSSOToken(resources) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.ssoToken) {
                 if (this.ssoToken.expiresOnTimestamp - Date.now() > tokenRefreshTimeSpanInMillisecond) {
                     internalLogger.verbose("Get SSO token from memory cache");
-                    resolve(this.ssoToken);
-                    return;
+                    return this.ssoToken;
                 }
             }
-            if (this.checkInTeams()) {
-                microsoftTeams.initialize(() => {
-                    microsoftTeams.authentication.getAuthToken({
-                        successCallback: (token) => {
-                            if (!token) {
-                                const errorMsg = "Get empty SSO token from Teams";
-                                internalLogger.error(errorMsg);
-                                reject(new ErrorWithCode(errorMsg, ErrorCode.InternalError));
-                                return;
-                            }
-                            const tokenObject = parseJwt(token);
-                            if (tokenObject.ver !== "1.0" && tokenObject.ver !== "2.0") {
-                                const errorMsg = "SSO token is not valid with an unknown version: " + tokenObject.ver;
-                                internalLogger.error(errorMsg);
-                                reject(new ErrorWithCode(errorMsg, ErrorCode.InternalError));
-                                return;
-                            }
-                            const ssoToken = {
-                                token,
-                                expiresOnTimestamp: tokenObject.exp * 1000,
-                            };
-                            this.ssoToken = ssoToken;
-                            resolve(ssoToken);
-                        },
-                        failureCallback: (errMessage) => {
-                            const errorMsg = "Get SSO token failed with error: " + errMessage;
-                            internalLogger.error(errorMsg);
-                            reject(new ErrorWithCode(errorMsg, ErrorCode.InternalError));
-                        },
-                        resources: resources !== null && resources !== void 0 ? resources : [],
-                    });
-                });
+            const params = { resources: resources !== null && resources !== void 0 ? resources : [] };
+            let token;
+            try {
+                yield app.initialize();
             }
-            else {
-                const errorMsg = "Initialize teams sdk failed due to not running inside Teams";
+            catch (err) {
+                const errorMsg = "Initialize teams sdk failed due to not running inside Teams environment";
+                internalLogger.error(errorMsg);
+                throw new ErrorWithCode(errorMsg, ErrorCode.InternalError);
+            }
+            try {
+                token = yield authentication.getAuthToken(params);
+            }
+            catch (err) {
+                const errorMsg = "Get SSO token failed with error: " + err.message;
+                internalLogger.error(errorMsg);
+                throw new ErrorWithCode(errorMsg, ErrorCode.InternalError);
+            }
+            if (!token) {
+                const errorMsg = "Get empty SSO token from Teams";
                 internalLogger.error(errorMsg);
-                reject(new ErrorWithCode(errorMsg, ErrorCode.InternalError));
+                throw new ErrorWithCode(errorMsg, ErrorCode.InternalError);
             }
+            const tokenObject = parseJwt(token);
+            if (tokenObject.ver !== "1.0" && tokenObject.ver !== "2.0") {
+                const errorMsg = "SSO token is not valid with an unknown version: " + tokenObject.ver;
+                internalLogger.error(errorMsg);
+                throw new ErrorWithCode(errorMsg, ErrorCode.InternalError);
+            }
+            const ssoToken = {
+                token,
+                expiresOnTimestamp: tokenObject.exp * 1000,
+            };
+            this.ssoToken = ssoToken;
+            return ssoToken;
         });
     }
     /**
@@ -840,16 +833,6 @@ class TeamsUserCredential {
             throw new ErrorWithCode(errorMessage, ErrorCode.InternalError);
         }
     }
-    // Come from here: https://github.com/wictorwilen/msteams-react-base-component/blob/master/src/useTeams.ts
-    checkInTeams() {
-        if ((window.parent === window.self && window.nativeInterface) ||
-            window.navigator.userAgent.includes("Teams/") ||
-            window.name === "embedded-page-container" ||
-            window.name === "extension-tab-frame") {
-            return true;
-        }
-        return false;
-    }
 }
 
 // Copyright (c) Microsoft Corporation.
@@ -973,6 +956,9 @@ function createMicrosoftGraphClient(teamsfx, scopes) {
 // Copyright (c) Microsoft Corporation.
 /**
  * Generate connection configuration consumed by tedious.
+ *
+ * @deprecated we recommend you compose your own Tedious configuration for better flexibility.
+ *
  * @remarks
  * Only works in in server side.
  */