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

@microsoft/teamsfx-core 1.7.0 → 1.7.1-alpha.42a29d71b.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 (448) hide show

package/templates/plugins/resource/aad/auth/tab/js/sso/GetUserProfile.jsx 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/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,5 @@
+{
+    "dependencies": {
+        "@microsoft/teamsfx": "0.6.3-alpha.42a29d71b.0"
+    }
+}

package/templates/plugins/resource/apiconnector/sample/footerComment.template ADDED Viewed

@@ -0,0 +1,20 @@
+/*
+Setting API configuration for cloud environment:
+We have already set the configuration to .env.teamsfx.local based on your answers.
+Before you deploy your code to cloud using TeamsFx, please follow https://aka.ms/teamsfx-add-appsettings to add following app settings with appropriate value to your Azure environment:
+TEAMSFX_API_{{capitalName}}_ENDPOINT
+{{#if (equals config.AuthConfig.AuthType "basic")}}
+TEAMSFX_API_{{capitalName}}_USERNAME
+TEAMSFX_API_{{capitalName}}_PASSWORD
+{{else if (equals config.AuthConfig.AuthType "aad")}}
+    {{#if (equals config.AuthConfig.ReuseTeamsApp false)}}
+TEAMSFX_API_{{capitalName}}_TENANT_ID
+TEAMSFX_API_{{capitalName}}_CLIENT_ID
+TEAMSFX_API_{{capitalName}}_CLIENT_SECRET
+    {{/if}}
+{{else if (equals config.AuthConfig.AuthType "apikey")}}
+TEAMSFX_API_{{capitalName}}_API_KEY
+{{/if}}
+You can refer https://aka.ms/teamsfx-connect-api to learn more.
+*/

package/templates/plugins/resource/apiconnector/sample/headerComment.template ADDED Viewed

@@ -0,0 +1,28 @@
+/*
+Your next steps:
+1. Run npm install. If your project did not install @microsoft/teamsfx package before, we have added it to package.json for you.
+   You need to run the command under "{{component}}" folder instead of project's root folder.
+{{#if (equals config.AuthConfig.AuthType "basic")}}
+2. Add your user password to TEAMSFX_API_{{capitalName}}_PASSWORD in "{{component}}/.env.teamsfx.local".
+{{else if (equals config.AuthConfig.AuthType "aad")}}
+    {{#if (equals config.AuthConfig.ReuseTeamsApp false)}}
+2. Replace "<your-api-scope>" in this file with actual scope required by the API.
+3. Add your client secret to TEAMSFX_API_{{capitalName}}_CLIENT_SECRET in "{{component}}/.env.teamsfx.local".
+    {{else}}
+2. Replace "<your-api-scope>" in this file with actual scope required by the API.
+3. Refer https://aka.ms/teamsfx-connect-api-with-aad for configuring AAD app and consent scopes.
+    {{/if}}
+{{else if (equals config.AuthConfig.AuthType "apikey")}}
+2. Add your API Key to TEAMSFX_API_{{capitalName}}_API_KEY in "{{component}}/.env.teamsfx.local".
+{{else if (equals config.AuthConfig.AuthType "cert")}}
+2. Add code to read your cert content and replace "<your-cert>" and "<your-private-key>" with actual value.
+{{else if (equals config.AuthConfig.AuthType "custom")}}
+2. Refer sample code and comments in this file to implement your auth provider.
+{{/if}}
+You can now import the API client (an Axios instance) in another file and call {{config.APIName}} APIs without worrying about authentication.
+Here is an example for a GET request to "relative_path_of_target_api":
+const result = await {{config.APIName}}Client.get("relative_path_of_target_api");
+You can refer https://aka.ms/teamsfx-connect-api to learn more.
+*/

package/templates/plugins/resource/apiconnector/sample/js/aad.template ADDED Viewed

@@ -0,0 +1,26 @@
+const teamsfxSdk = require("@microsoft/teamsfx");
+// Loads current app's configuration, the sample uses client credential flow to acquire token for your API.
+{{#if (equals config.AuthConfig.ReuseTeamsApp true)}}
+const teamsFx = new teamsfxSdk.TeamsFx(teamsfxSdk.IdentityType.App);
+{{else}}
+const teamsFx = new teamsfxSdk.TeamsFx(teamsfxSdk.IdentityType.App, {
+  // You can replace the default authorityHost url with actual value per your requirement.
+  authorityHost: "https://login.microsoftonline.com",
+  tenantId: process.env.TEAMSFX_API_{{capitalName}}_TENANT_ID,
+  clientId: process.env.TEAMSFX_API_{{capitalName}}_CLIENT_ID,
+  // Please add your client secret to .env.teamsfx.local before local debugging.
+  clientSecret: process.env.TEAMSFX_API_{{capitalName}}_CLIENT_SECRET,
+});
+{{/if}}
+// Initializes a new axios instance to call {{config.APIName}} API.
+const appCredential = teamsFx.getCredential();
+const authProvider = new teamsfxSdk.BearerTokenAuthProvider(
+  // Please replace '<your-api-scope>' with actual api scope value.
+  async () => (await appCredential.getToken("<your-api-scope>")).token
+);
+const {{config.APIName}}Client = teamsfxSdk.createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+module.exports.{{config.APIName}}Client = {{config.APIName}}Client;

package/templates/plugins/resource/apiconnector/sample/js/apikey.template ADDED Viewed

@@ -0,0 +1,19 @@
+const teamsfxSdk = require("@microsoft/teamsfx");
+// Loads current app's configuration.
+const teamsFx = new teamsfxSdk.TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API.
+const authProvider = new teamsfxSdk.ApiKeyProvider(
+  "{{config.AuthConfig.Name}}",
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_API_KEY"),
+{{#if (equals config.AuthConfig.Location "request header")}}
+  teamsfxSdk.ApiKeyLocation.Header
+{{else}}
+  teamsfxSdk.ApiKeyLocation.QueryParams
+{{/if}}
+);
+const {{config.APIName}}Client = teamsfxSdk.createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+module.exports.{{config.APIName}}Client = {{config.APIName}}Client;

package/templates/plugins/resource/apiconnector/sample/js/basic.template ADDED Viewed

@@ -0,0 +1,14 @@
+const teamsfxSdk = require("@microsoft/teamsfx");
+// Loads current app's configuration.
+const teamsFx = new teamsfxSdk.TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API.
+const authProvider = new teamsfxSdk.BasicAuthProvider(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_USERNAME"),
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_PASSWORD")
+);
+const {{config.APIName}}Client = teamsfxSdk.createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+module.exports.{{config.APIName}}Client = {{config.APIName}}Client;

package/templates/plugins/resource/apiconnector/sample/js/cert.template ADDED Viewed

@@ -0,0 +1,15 @@
+const teamsfxSdk = require("@microsoft/teamsfx");
+// Loads current app's configuration.
+const teamsFx = new teamsfxSdk.TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API.
+const authProvider = new teamsfxSdk.CertificateAuthProvider(
+  // Please add code to read your cert and private key, replace "<your-cert>" and "<your-private-key>" with actual value.
+  // If you have a .pfx cert, you can use "createPfxCertOption" function to initialize your cert option.
+  teamsfxSdk.createPemCertOption("<your-cert>", "<your-private-key>")
+);
+const {{config.APIName}}Client = teamsfxSdk.createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+module.exports.{{config.APIName}}Client = {{config.APIName}}Client;

package/templates/plugins/resource/apiconnector/sample/js/custom.template ADDED Viewed

@@ -0,0 +1,39 @@
+const teamsfxSdk = require("@microsoft/teamsfx");
+// The custom authProvider should implement the AuthProvider interface.
+// Here is a sample authProvider class. It will set custom property in the request header
+class CustomAuthProvider {
+  customProperty;
+  customValue;
+  constructor(customProperty, customValue) {
+    this.customProperty = customProperty;
+    this.customValue = customValue;
+  }
+  // Replace the sample code with your own logic.
+  AddAuthenticationInfo = async (config) => {
+    if (!config.headers) {
+      config.headers = {};
+    }
+    config.headers[this.customProperty] = this.customValue;
+    return config;
+  };
+}
+// Loads current app's configuration.
+const teamsFx = new teamsfxSdk.TeamsFx();
+const authProvider = new CustomAuthProvider(
+  // You can also add customized settings to .env.teamsfx.local and use TeamsFx.getConfig("{setting_name}") to read the settings. For example:
+  //  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_CUSTOM_PROPERTY"),
+  //  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_CUSTOM_VALUE")
+  "customPropery",
+  "customValue"
+);
+// Initializes a new axios instance to call {{config.APIName}} API.
+const {{config.APIName}}Client = teamsfxSdk.createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+module.exports.{{config.APIName}}Client = {{config.APIName}}Client;

package/templates/plugins/resource/apiconnector/sample/ts/aad.template ADDED Viewed

@@ -0,0 +1,31 @@
+import {
+  TeamsFx,
+  createApiClient,
+  BearerTokenAuthProvider,
+  IdentityType,
+} from "@microsoft/teamsfx";
+// Loads current app's configuration, the sample uses client credential flow to acquire token for your API.
+{{#if (equals config.AuthConfig.ReuseTeamsApp true)}}
+const teamsFx = new TeamsFx(IdentityType.App);
+{{else}}
+const teamsFx = new TeamsFx(IdentityType.App, {
+  // You can replace the default authorityHost url with actual value per your requirement.
+  authorityHost: "https://login.microsoftonline.com",
+  tenantId: process.env.TEAMSFX_API_{{capitalName}}_TENANT_ID!,
+  clientId: process.env.TEAMSFX_API_{{capitalName}}_CLIENT_ID!,
+  // Please add your client secret to .env.teamsfx.local before local debugging.
+  clientSecret: process.env.TEAMSFX_API_{{capitalName}}_CLIENT_SECRET!,
+});
+{{/if}}
+// Initializes a new axios instance to call {{config.APIName}} API.
+const appCredential = teamsFx.getCredential();
+const authProvider = new BearerTokenAuthProvider(
+  // Please replace '<your-api-scope>' with actual api scope value.
+  async () => (await appCredential.getToken("<your-api-scope>"))!.token
+);
+const {{config.APIName}}Client = createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+export { {{config.APIName}}Client };

package/templates/plugins/resource/apiconnector/sample/ts/apikey.template ADDED Viewed

@@ -0,0 +1,16 @@
+import { TeamsFx, createApiClient, ApiKeyProvider, ApiKeyLocation } from "@microsoft/teamsfx";
+// Loads current app's configuration.
+const teamsFx = new TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API.
+const authProvider = new ApiKeyProvider(
+  "{{config.AuthConfig.Name}}",
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_API_KEY"),
+{{#if (equals config.AuthConfig.Location "request header")}}
+  ApiKeyLocation.Header
+{{else}}
+  ApiKeyLocation.QueryParams
+{{/if}}
+);
+const {{config.APIName}}Client = createApiClient(teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"), authProvider);
+export { {{config.APIName}}Client };

package/templates/plugins/resource/apiconnector/sample/ts/basic.template ADDED Viewed

@@ -0,0 +1,14 @@
+import { TeamsFx, createApiClient, BasicAuthProvider } from "@microsoft/teamsfx";
+// Loads current app's configuration.
+const teamsFx = new TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API.
+const authProvider = new BasicAuthProvider(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_USERNAME"),
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_PASSWORD")
+);
+const {{config.APIName}}Client = createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+export { {{config.APIName}}Client };

package/templates/plugins/resource/apiconnector/sample/ts/cert.template ADDED Viewed

@@ -0,0 +1,17 @@
+import {
+  TeamsFx,
+  createApiClient,
+  CertificateAuthProvider,
+  createPemCertOption,
+} from "@microsoft/teamsfx";
+// Loads current app's configuration.
+const teamsFx = new TeamsFx();
+// Initializes a new axios instance to call {{config.APIName}} API.
+const authProvider = new CertificateAuthProvider(
+  // Please add code to read your cert and private key, replace "<your-cert>" and "<your-private-key>" with actual value.
+  // If you have a .pfx cert, you can use "createPfxCertOption" function to initialize your cert option.
+  createPemCertOption("<your-cert>", "<your-private-key>")
+);
+const {{config.APIName}}Client = createApiClient(teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"), authProvider);
+export { {{config.APIName}}Client };

package/templates/plugins/resource/apiconnector/sample/ts/custom.template ADDED Viewed

@@ -0,0 +1,42 @@
+import { TeamsFx, createApiClient, AuthProvider } from "@microsoft/teamsfx";
+import { AxiosRequestConfig } from "axios";
+// The custom authProvider should implement the AuthProvider interface.
+// Here is a sample authProvider class. It will set custom property in the request header
+class CustomAuthProvider implements AuthProvider {
+  customProperty: string;
+  customValue: string;
+  constructor(customProperty: string, customValue: string) {
+    this.customProperty = customProperty;
+    this.customValue = customValue;
+  }
+  // Replace the sample code with your own logic.
+  AddAuthenticationInfo: (config: AxiosRequestConfig) => Promise<AxiosRequestConfig> = async (
+    config
+  ) => {
+    if (!config.headers) {
+      config.headers = {};
+    }
+    config.headers[this.customProperty] = this.customValue;
+    return config;
+  };
+}
+// Loads current app's configuration.
+const teamsFx = new TeamsFx();
+const authProvider = new CustomAuthProvider(
+  // You can also add customized settings to .env.teamsfx.local and use TeamsFx.getConfig("{setting_name}") to read the settings. For example:
+  //  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_CUSTOM_PROPERTY"),
+  //  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_CUSTOM_VALUE")
+  "customPropery",
+  "customValue"
+);
+// Initializes a new axios instance to call {{config.APIName}} API.
+const {{config.APIName}}Client = createApiClient(
+  teamsFx.getConfig("TEAMSFX_API_{{capitalName}}_ENDPOINT"),
+  authProvider
+);
+export { {{config.APIName}}Client };

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/spfx/solution/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# SPFx(SharePoint Framework) APP
+# SPFx (SharePoint Framework) App
 ## Summary
@@ -39,7 +39,7 @@ Version|Date|Comments
 ## Minimal Path to Awesome
-1. <b>Install the latest version of [Node.js LTS 14.x]</b>(https://nodejs.org/en/download/releases/)(Note: SPFx v1.12.1 support Node.js v10/12/14)
+1. Install the latest version of [Node.js LTS 14.x](https://nodejs.org/en/download/releases/) (Note: SPFx v1.14.0 support Node.js v12/14).
 2. You can either download [Visual Studio Code](https://code.visualstudio.com) and install [Teams Toolkit Visual Studio Code Extension](https://aka.ms/teams-toolkit) or download TeamsFx CLI.
 3. Open the project with VSCode, click `Provision in the cloud` in DEPLOYMENT panel of Teams Toolkit extension.
@@ -49,7 +49,7 @@ Version|Date|Comments
     It will provision an app in Teams App Studio. You may need to login with your M365 tenant admin account.
 4. Build and Deploy your SharePoint Package.
-    - Click `Deploy to the cloud` in DEPLOYMENT panel of Teams Toolkit extension, or run `Teams: Deploy to the cloud` from command palette. This will generate a SharePoint package(*.sppkg) under sharepoint/solution folder.
+    - Click `Deploy to the cloud` in DEPLOYMENT panel of Teams Toolkit extension, or run `Teams: Deploy to the cloud` from command palette. This will generate a SharePoint package (*.sppkg) under sharepoint/solution folder.
     Or you can use TeamsFx CLI with running this cmd under your project path:
         `teamsfx deploy`

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/plugins/solution/v1/README.md CHANGED Viewed

@@ -16,7 +16,7 @@ There are some configuration changed in your project to make it compatible with
 ## Edit the manifest
-You can find the Teams app manifest template in `./templates/appPackage/manifest.local.template.json`. It contains template arguments with `{...}` statements which will be replaced at build time. You may add any extra properties or permissions you require to this file. See the [schema reference](https://docs.microsoft.com/en-us/microsoftteams/platform/resources/schema/manifest-schema) for more.
+You can find the Teams app manifest template in `./templates/appPackage/manifest.template.json`. It contains template arguments with `{...}` statements which will be replaced at build time. You may add any extra properties or permissions you require to this file. See the [schema reference](https://docs.microsoft.com/en-us/microsoftteams/platform/resources/schema/manifest-schema) for more.
 ## Learn more