npm - @microsoft/teamsfx-core - Versions diffs - 3.0.4 → 3.0.5-alpha.1d492cee1.0 - Mend

@microsoft/teamsfx-core 3.0.4 → 3.0.5-alpha.1d492cee1.0

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.

Files changed (316) hide show

package/templates/plugins/resource/aad/auth/bot/ts/public/auth-end.html CHANGED Viewed

@@ -2,67 +2,78 @@
 <!--This file is used during the Teams Bot authentication flow to assist with retrieval of the access token.-->
 <!--If you're not familiar with this, do not alter or remove this file from your project.-->
 <html>
-  <head>
-    <title>Login End Page</title>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <script
-      src="https://res.cdn.office.net/teams-js/2.31.1/js/MicrosoftTeams.min.js"
-      integrity="sha384-ihAqYgEJz9hzEU+HaYodG1aTzjebC/wKXQi1nWKZG7OLAUyOL9ZrzD/SfZu79Jeu"
-      crossorigin="anonymous"
-    ></script>
-    <div id="divError"></div>
-    <script type="text/javascript">
-      microsoftTeams.app.initialize().then(() => {
-        let hashParams = getHashParameters();
+<head>
+  <title>Login End Page</title>
+  <meta charset="utf-8" />
+</head>
-        if (hashParams.get("error")) {
-          // Authentication failed
-          handleAuthError(hashParams.get("error"), hashParams);
-        } else if (hashParams.get("code")) {
-          // Get the stored state parameter and compare with incoming state
-          let expectedState = localStorage.getItem("state");
-          if (expectedState !== hashParams.get("state")) {
-            // State does not match, report error
-            handleAuthError("StateDoesNotMatch", hashParams);
-          } else {
-            microsoftTeams.authentication.notifySuccess();
-          }
+<body>
+  <script src="https://res.cdn.office.net/teams-js/2.31.1/js/MicrosoftTeams.min.js"
+    integrity="sha384-ihAqYgEJz9hzEU+HaYodG1aTzjebC/wKXQi1nWKZG7OLAUyOL9ZrzD/SfZu79Jeu"
+    crossorigin="anonymous"></script>
+  <div id="divError"></div>
+  <script type="text/javascript">
+    microsoftTeams.app.initialize().then(() => {
+      let hashParams = getHashParameters();
+      if (hashParams.get("error")) {
+        // Authentication failed
+        handleAuthError(hashParams.get("error"), hashParams);
+      } else if (hashParams.get("code")) {
+        // Get the stored state parameter and compare with incoming state
+        let expectedState = localStorage.getItem("state");
+        if (expectedState !== hashParams.get("state")) {
+          // State does not match, report error
+          handleAuthError("StateDoesNotMatch", hashParams);
         } else {
-          // Unexpected condition: hash does not contain error or access_token parameter
-          handleAuthError("UnexpectedFailure", hashParams);
+          microsoftTeams.authentication.notifySuccess();
         }
-      });
-      // Parse hash parameters into key-value pairs
-      function getHashParameters() {
-        let hashParams = new Map();
+      } else {
+        // Unexpected condition: hash does not contain error or access_token parameter
+        handleAuthError("UnexpectedFailure", hashParams);
+      }
+    });
+    // Parse hash parameters into key-value pairs
+    function getHashParameters() {
+      // Using ES6 Map instead of plain object to prevent prototype pollution
+      let hashParams = new Map();
+      if (location.hash && location.hash.length > 1) {
         location.hash
           .substr(1)
           .split("&")
           .forEach(function (item) {
+            if (!item) return;
             let s = item.split("="),
               k = s[0],
               v = s[1] && decodeURIComponent(s[1]);
-            hashParams.set(k, v);
+            if (k) {
+              // Store parameters in the Map
+              hashParams.set(k, v);
+            }
           });
-        return hashParams;
       }
+      // Convert Map back to a plain object for compatibility with the rest of the code
+      return Object.fromEntries(hashParams);
+    }
-      // Show error information
-      function handleAuthError(errorType, errorMessage) {
-        const err = JSON.stringify({
-          error: encodeURIComponent(errorType),
-          message: encodeURIComponent(JSON.stringify(errorMessage)),
-        });
-        let para = document.createElement("p");
-        let node = document.createTextNode(err);
-        para.appendChild(node);
+    // Show error information
+    function handleAuthError(errorType, errorMessage) {
+      const err = JSON.stringify({
+        error: encodeURIComponent(errorType),
+        message: encodeURIComponent(JSON.stringify(errorMessage)),
+      });
+      let para = document.createElement("p");
+      let node = document.createTextNode(err);
+      para.appendChild(node);
-        let element = document.getElementById("divError");
-        element.appendChild(para);
-      }
-    </script>
-  </body>
-</html>
+      let element = document.getElementById("divError");
+      element.appendChild(para);
+    }
+  </script>
+</body>
+</html>

package/build/component/driver/share/shareToOthers.d.ts DELETED Viewed

@@ -1,17 +0,0 @@
-import { FxError, Result } from "@microsoft/teamsfx-api";
-import { DriverContext } from "../interface/commonArgs";
-import { ExecutionResult, StepDriver } from "../interface/stepDriver";
-export interface ShareArgs {
-    appPackagePath?: string;
-}
-export declare const actionName = "teamsApp/shareToOthers";
-export declare class ShareToOthersDriver implements StepDriver {
-    description: string;
-    readonly progressTitle: string;
-    run(args: ShareArgs, context: DriverContext): Promise<Result<Map<string, string>, FxError>>;
-    execute(args: ShareArgs, ctx: DriverContext, outputEnvVarNames?: Map<string, string>): Promise<ExecutionResult>;
-    private handler;
-    private validateArgs;
-    private validateOutputEnvVarNames;
-}
-//# sourceMappingURL=shareToOthers.d.ts.map

package/build/component/driver/share/shareToOthers.d.ts.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"shareToOthers.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/shareToOthers.ts"],"names":[],"mappings":"AAOA,OAAO,EAAU,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAQzF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,MAAM,WAAW,SAAS;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAQnD,qBACa,mBAAoB,YAAW,UAAU;IACpD,WAAW,SAA0D;IACrE,QAAQ,CAAC,aAAa,SAA+D;IAGxE,GAAG,CACd,IAAI,EAAE,SAAS,EACf,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,SAAS,EACf,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAiErB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;CASlC"}

package/build/component/driver/share/shareToOthers.js DELETED Viewed

@@ -1,127 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShareToOthersDriver = exports.actionName = void 0;
-const tslib_1 = require("tslib");
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-const fs = tslib_1.__importStar(require("fs-extra"));
-const typedi_1 = require("typedi");
-const lib_1 = require("@feathersjs/hooks/lib");
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const localizeUtils_1 = require("../../../common/localizeUtils");
-const packageService_1 = require("../../m365/packageService");
-const serviceConstant_1 = require("../../m365/serviceConstant");
-const common_1 = require("../../../error/common");
-const common_2 = require("../../utils/common");
-const constants_1 = require("../aad/utility/constants");
-const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-exports.actionName = "teamsApp/shareToOthers";
-const outputKeys = {
-    titleId: "titleId",
-    appId: "appId",
-    shareLink: "shareLink",
-};
-let ShareToOthersDriver = class ShareToOthersDriver {
-    constructor() {
-        this.description = (0, localizeUtils_1.getLocalizedString)("driver.shareToOthers.description");
-        this.progressTitle = (0, localizeUtils_1.getLocalizedString)("driver.shareToOthers.progress.message");
-    }
-    async run(args, context) {
-        return (0, common_2.wrapRun)(async () => {
-            const result = await this.handler(args, context);
-            return result.output;
-        }, exports.actionName);
-    }
-    async execute(args, ctx, outputEnvVarNames) {
-        let summaries = [];
-        const outputResult = await (0, common_2.wrapRun)(async () => {
-            const result = await this.handler(args, ctx, outputEnvVarNames);
-            summaries = result.summaries;
-            return result.output;
-        }, exports.actionName);
-        return {
-            result: outputResult,
-            summaries,
-        };
-    }
-    async handler(args, context, outputEnvVarNames) {
-        var _a, _b, _c, _d, _e;
-        try {
-            this.validateArgs(args);
-            this.validateOutputEnvVarNames(outputEnvVarNames);
-            const appPackagePath = (0, common_2.getAbsolutePath)(args.appPackagePath, context.projectPath);
-            if (!(await fs.pathExists(appPackagePath))) {
-                throw new common_1.FileNotFoundError(exports.actionName, appPackagePath);
-            }
-            // get sideloading service settings
-            const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.MosServiceEndpoint;
-            const sideloadingServiceScope = (_b = process.env.SIDELOADING_SERVICE_SCOPE) !== null && _b !== void 0 ? _b : serviceConstant_1.MosServiceScope;
-            const packageService = new packageService_1.PackageService(sideloadingServiceEndpoint, context.logProvider);
-            const sideloadingTokenRes = await context.m365TokenProvider.getAccessToken({
-                scopes: [sideloadingServiceScope],
-            });
-            if (sideloadingTokenRes.isErr()) {
-                throw sideloadingTokenRes.error;
-            }
-            const sideloadingToken = sideloadingTokenRes.value;
-            const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath, packageService_1.AppScope.Shared);
-            const shareSuccess = [
-                { content: "(√)Done: ", color: teamsfx_api_1.Colors.BRIGHT_GREEN },
-                { content: "Share Link: ", color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                { content: sideloadingRes[2], color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-            ];
-            (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.info(shareSuccess);
-            return {
-                output: new Map([
-                    [outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]],
-                    [outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]],
-                    [outputEnvVarNames.get(outputKeys.shareLink), sideloadingRes[2]],
-                ]),
-                summaries: [(0, localizeUtils_1.getLocalizedString)("driver.shareToOthers.summary", sideloadingRes[2])],
-            };
-        }
-        catch (error) {
-            if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, error.displayMessage));
-                throw error;
-            }
-            const message = JSON.stringify(error);
-            (_e = context.logProvider) === null || _e === void 0 ? void 0 : _e.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
-            throw (0, common_1.assembleError)(error, exports.actionName);
-        }
-    }
-    validateArgs(args) {
-        const invalidParameters = [];
-        if (!args.appPackagePath || typeof args.appPackagePath !== "string") {
-            invalidParameters.push("appPackagePath");
-        }
-        if (invalidParameters.length > 0) {
-            throw new common_1.InvalidActionInputError(exports.actionName, invalidParameters);
-        }
-    }
-    validateOutputEnvVarNames(outputEnvVarNames) {
-        if (!(outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.titleId)) ||
-            !outputEnvVarNames.get(outputKeys.appId) ||
-            !outputEnvVarNames.get(outputKeys.shareLink)) {
-            throw new common_1.InvalidActionInputError(exports.actionName, ["writeToEnvironmentFile"]);
-        }
-    }
-};
-tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], ShareToOthersDriver.prototype, "run", null);
-tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
-    tslib_1.__metadata("design:returntype", Promise)
-], ShareToOthersDriver.prototype, "execute", null);
-ShareToOthersDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(exports.actionName) // DO NOT MODIFY the service name
-], ShareToOthersDriver);
-exports.ShareToOthersDriver = ShareToOthersDriver;
-//# sourceMappingURL=shareToOthers.js.map

package/build/component/driver/share/shareToOthers.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"shareToOthers.js","sourceRoot":"","sources":["../../../../src/component/driver/share/shareToOthers.ts"],"names":[],"mappings":"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"}