npm - @microsoft/teamsfx-core - Versions diffs - 1.7.0 → 1.7.1-alpha.8d048e1f1.0 - Mend

@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.8d048e1f1.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 (226) hide show

package/templates/plugins/resource/aad/auth/tab/ts/public/auth-end.html ADDED Viewed

@@ -0,0 +1,58 @@
+<!--This file is added by us when enable SSO. Developers can use it directly, or reference this sample to create their own auth end page.-->
+<!--This file is used during the Teams 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://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
+      integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
+      crossorigin="anonymous">
+    </script>
+    <script type="text/javascript">
+      var currentURL = new URL(window.location);
+      var clientId = currentURL.searchParams.get("clientId");
+      microsoftTeams.initialize();
+      microsoftTeams.getContext(async function (context) {
+        const msalConfig = {
+          auth: {
+            clientId: clientId,
+            authority: `https://login.microsoftonline.com/${context.tid}`,
+            navigateToLoginRequestUrl: false
+          },
+          cache: {
+            cacheLocation: "sessionStorage",
+          },
+        }
+        const msalInstance = new window.msal.PublicClientApplication(msalConfig);
+        msalInstance.handleRedirectPromise()
+          .then((tokenResponse) => {
+            if (tokenResponse !== null) {
+              microsoftTeams.authentication.notifySuccess(JSON.stringify({
+                sessionStorage: sessionStorage
+              }));
+            } else {
+              microsoftTeams.authentication.notifyFailure("Get empty response.");
+            }
+          })
+          .catch((error) => {
+            microsoftTeams.authentication.notifyFailure(error);
+          });
+      })
+    </script>
+  </body>
+</html>

package/templates/plugins/resource/aad/auth/tab/ts/public/auth-start.html ADDED Viewed

@@ -0,0 +1,57 @@
+<!--This file is added by us when enable SSO. Developers can use it directly, or reference this sample to create their own auth end page.-->
+<!--This file is used during the Teams 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 Start Page</title>
+    <meta charset="utf-8" />
+  </head>
+  <body>
+    <script
+      src="https://statics.teams.cdn.office.net/sdk/v1.6.0/js/MicrosoftTeams.min.js"
+      integrity="sha384-mhp2E+BLMiZLe7rDIzj19WjgXJeI32NkPvrvvZBrMi5IvWup/1NUfS5xuYN5S3VT"
+      crossorigin="anonymous"
+    ></script>
+    <script
+      type="text/javascript"
+      src="https://alcdn.msauth.net/browser/2.21.0/js/msal-browser.min.js"
+      integrity="sha384-s/NxjjAgw1QgpDhOlVjTceLl4axrp5nqpUbCPOEQy1PqbFit9On6uw2XmEF1eq0s"
+      crossorigin="anonymous">
+    </script>
+    <script type="text/javascript">
+      microsoftTeams.initialize();
+      // Get the tab context, and use the information to navigate to Azure AD login page
+      microsoftTeams.getContext(async function (context) {
+        // Generate random state string and store it, so we can verify it in the callback
+        var currentURL = new URL(window.location);
+        var clientId = currentURL.searchParams.get("clientId");
+        var scope = currentURL.searchParams.get("scope");
+        var loginHint = currentURL.searchParams.get("loginHint");
+        const msalConfig = {
+          auth: {
+            clientId: clientId,
+            authority: `https://login.microsoftonline.com/${context.tid}`,
+            navigateToLoginRequestUrl: false
+          },
+          cache: {
+            cacheLocation: "sessionStorage",
+          },
+        }
+        const msalInstance = new msal.PublicClientApplication(msalConfig);
+        const scopesArray = scope.split(" ");
+        const scopesRequest = {
+          scopes: scopesArray,
+          redirectUri: window.location.origin + `/auth-end.html?clientId=${clientId}`,
+          loginHint: loginHint
+        };
+        await msalInstance.loginRedirect(scopesRequest);
+      });
+      </script>
+  </body>
+</html>

package/templates/plugins/resource/aad/auth/tab/ts/sso/GetUserProfile.tsx ADDED Viewed

@@ -0,0 +1,34 @@
+import { Button } from "@fluentui/react-northstar";
+import { useGraph, useTeamsFx } from "@microsoft/teamsfx-react";
+export function GetUserProfile() {
+  const { teamsfx } = useTeamsFx();
+  const { loading, error, data, reload } = useGraph(
+    async (graph, teamsfx, scope) => {
+      // Call graph api directly to get user profile information
+      const profile = await graph.api("/me").get();
+      let photoUrl = "";
+      try {
+        const photo = await graph.api("/me/photo/$value").get();
+        photoUrl = URL.createObjectURL(photo);
+      } catch {
+        // Could not fetch photo from user's profile, return empty string as placeholder.
+      }
+      return { profile, photoUrl };
+    },
+    { scope: ["User.Read"], teamsfx: teamsfx }
+  );
+  return (
+    <div>
+      <h2>GetUserProfile</h2>
+      <p>Click below to authorize button to grant permission to using Microsoft Graph.</p>
+      <Button primary content="Authorize" disabled={loading} onClick={reload} />
+      {!loading && error && (
+        <div className="error">Failed to read your profile. Please try again later.</div>
+      )}
+      {!loading && data && <div>Hello {data.profile.displayName}</div>}
+    </div>
+  );
+}

package/templates/plugins/resource/aad/manifest/aad.template.json CHANGED Viewed

@@ -92,18 +92,5 @@
     "identifierUris": [
         "{{state.fx-resource-aad-app-for-teams.applicationIdUris}}"
     ],
-    "replyUrlsWithType": [
-        {
-            "url": "{{state.fx-resource-frontend-hosting.endpoint}}/auth-end.html",
-            "type": "Web"
-        },
-        {
-            "url": "{{state.fx-resource-frontend-hosting.endpoint}}/auth-end.html?clientId={{state.fx-resource-aad-app-for-teams.clientId}}",
-            "type": "Spa"
-        },
-        {
-            "url": "{{state.fx-resource-frontend-hosting.endpoint}}/blank-auth-end.html",
-            "type": "Spa"
-        }
-    ]
+    "replyUrlsWithType": []
 }

package/templates/plugins/resource/apiconnector/package.json ADDED Viewed

@@ -0,0 +1,6 @@
+{
+    "dependencies": {
+        "@microsoft/teasfx": "0.6.2-alpha.0",
+        "@microsoft/teams-js": "^1.9.0"
+    }
+}

package/templates/plugins/resource/bot/bicep/botProvision.template.bicep CHANGED Viewed

@@ -8,7 +8,11 @@ var botServiceName = contains(provisionParameters, 'botServiceName') ? provision
 var botServiceSku = contains(provisionParameters, 'botServiceSku') ? provisionParameters['botServiceSku'] : 'F0' // Try to read SKU for Azure Bot Service from parameters
 var botDisplayName = contains(provisionParameters, 'botDisplayName') ? provisionParameters['botDisplayName'] : '${resourceBaseName}' // Try to read display name for Azure Bot Service from parameters
 var serverfarmsName = contains(provisionParameters, 'botServerfarmsName') ? provisionParameters['botServerfarmsName'] : '${resourceBaseName}bot' // Try to read name for App Service Plan from parameters
+{{#if enableAlwaysOn}}
+var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'B1' // Try to read SKU for Azure Web App from parameters
+{{else}}
 var webAppSKU = contains(provisionParameters, 'botWebAppSKU') ? provisionParameters['botWebAppSKU'] : 'F1' // Try to read SKU for Azure Web App from parameters
+{{/if}}
 var webAppName = contains(provisionParameters, 'botSitesName') ? provisionParameters['botSitesName'] : '${resourceBaseName}bot' // Try to read name for Azure Web App from parameters
 // Register your web service as a bot with the Bot Framework
@@ -54,7 +58,11 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverfarm.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
     siteConfig: {
+      {{#if enableAlwaysOn}}
+      alwaysOn: true
+      {{/if}}
       appSettings: [
         {
           name: 'SCM_DO_BUILD_DURING_DEPLOYMENT'
@@ -69,6 +77,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '1'
         }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {

package/templates/plugins/resource/bot/bicep/funcHostedBotProvision.template.bicep CHANGED Viewed

@@ -56,6 +56,7 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverfarm.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
     siteConfig: {
       alwaysOn: true
       appSettings: [
@@ -96,6 +97,7 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '1' // Zipdeploy files will always be updated. Detail: https://aka.ms/teamsfx-zipdeploy-donot-preserve-filetime
         }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {

package/templates/plugins/resource/function/bicep/functionProvision.template.bicep CHANGED Viewed

@@ -27,6 +27,7 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverfarms.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
     siteConfig: {
       appSettings: [
         {
@@ -58,6 +59,7 @@ resource functionApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '~14' // Set NodeJS version to 14.x
         }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {

package/templates/plugins/resource/simpleauth/bicep/simpleAuthProvision.template.bicep CHANGED Viewed

@@ -25,6 +25,10 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverFarms.id
     keyVaultReferenceIdentity: userAssignedIdentityId // Use given user assigned identity to access Key Vault
+    httpsOnly: true
+    siteConfig:{
+      ftpsState: 'FtpsOnly'
+    }
   }
   identity: {
     type: 'UserAssigned'

package/templates/plugins/resource/webapp/bicep/webappProvision.template.bicep CHANGED Viewed

@@ -23,6 +23,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
   properties: {
     serverFarmId: serverFarms.id
     keyVaultReferenceIdentity: userAssignedIdentityId
+    httpsOnly: true
     siteConfig: {
       appSettings: [
         {
@@ -30,6 +31,7 @@ resource webApp 'Microsoft.Web/sites@2021-02-01' = {
           value: '1'
         }
       ]
+      ftpsState: 'FtpsOnly'
     }
   }
   identity: {

package/templates/core/README-auto-generated.md DELETED Viewed

@@ -1,31 +0,0 @@
-# TeamsFx Project
-## Take a tour of your app source code
-After initializing the project, you can view the project folders and files in the Explorer area of Visual Studio Code after the Teams Toolkit registers and configures your app. The following table lists all the scaffolded folder and files by Teams Toolkit:
-| File name | Contents |
-|- | -|
-|`.fx/configs/config.local.json`| Configuration file for local environment |
-|`.fx/configs/config.dev.json`| Configuration file for dev environment |
-|`.fx/configs/projectSettings.json`| Global project settings, which apply to all environments |
-|`templates/appPackage/manifest.template.json`|Teams app manifest template|
-|`templates/appPackage/resources`|Teams app's icon referenced by manifest template|
-## Add components
-Now you're able to add components with Teams Toolkit to build Teams app for below scenarios.
-### Scenario 1: Send Notification to Teams
-Sending a message in response to stimulus tasks through conversations. Please refer to [our wiki](https://github.com/OfficeDev/TeamsFx/wiki/Incremental-Build#scenario-1-send-notification-to-teams) for instructions.
-### Scenario 2: Build Command And Response
-Running simple and repetitive automated tasks through conversations. Please refer to [our wiki](https://github.com/OfficeDev/TeamsFx/wiki/Incremental-Build#scenario-2-build-command-and-response) for instructions.
-### Scenario 3: Embed your existing web pages in Teams
-Integrate with your existing web page application to build a Teams app. Please refer to [our wiki](https://github.com/OfficeDev/TeamsFx/wiki/Incremental-Build#scenario-3-embed-your-existing-web-pages-in-teams) for instructions.

package/templates/fallback/bot-msgext.csharp.default.zip DELETED Viewed

Binary file

package/templates/fallback/bot-msgext.js.default.zip DELETED Viewed

Binary file

package/templates/fallback/bot-msgext.ts.default.zip DELETED Viewed

Binary file

package/templates/fallback/msgext.js.default.zip DELETED Viewed

Binary file

package/templates/fallback/msgext.ts.default.zip DELETED Viewed

Binary file