@microsoft/teamsfx-core 2.0.14-rc.1 → 2.0.15-alpha.0b985f7da.0

package/resource/yaml-schema/yaml.schema.json

@@ -14,7 +14,7 @@
     "version": {
       "type": "string",
       "description": "The version of the yaml file schema",
-      "const": "v1.7"
+      "const": "v1.8"
     },
     "additionalMetadata": {
       "type": "object",
@@ -1304,6 +1304,10 @@
                 "symlinkDir": {
                   "type": "string",
                   "description": "The path of the symlink target for the folder containing Teams App Test Tool binaries."
+                },
+                "releaseType": {
+                  "type": "string",
+                  "description": "The release type of Teams App Test Tool: binary or npm. Default to 'npm'."
                 }
               }
             }

package/templates/plugins/resource/aad/auth/V3/Enable SSO.txt

@@ -11,6 +11,6 @@ Basically, you will need to take care of these configurations:
 * In the Teams manifest file, add the SSO application to link it with Teams application. 
 * Add SSO application information in Teams Toolkit configuration files in order to make sure the authentication app can be registered on backend service and started by Teams Toolkit when you debugging or previewing Teams application.
 
-Refer to the step-by-step guide for Teams Tab Application at https://aka.ms/teams-toolkit-vs-add-SSO-tab.
-Refer to the step-by-step guide for Teams Bot Applications at https://aka.ms/teams-toolkit-vs-add-SSO-bot. This guide use Command and Response bot as an example to show case how to enable SSO.
+Refer to the step-by-step guide for Teams Tab Application at https://aka.ms/teamsfx-add-sso-vs-new-schema#for-teams-tab-application.
+Refer to the step-by-step guide for Teams Bot Applications at https://aka.ms/teamsfx-add-sso-vs-new-schema#for-teams-bot-applications. This guide use Command and Response bot as an example to show case how to enable SSO.
 

package/templates/plugins/resource/aad/auth/V3/aad.manifest.template.json

@@ -1,102 +1,112 @@
 {
   "id": "${{AAD_APP_OBJECT_ID}}",
   "appId": "${{AAD_APP_CLIENT_ID}}",
-  "name": "YOUR_AAD_APP_NAME",
-  "accessTokenAcceptedVersion": 2,
+  "displayName": "YOUR_AAD_APP_NAME",
+  "identifierUris": [],
   "signInAudience": "AzureADMyOrg",
-  "optionalClaims": {
-      "idToken": [],
-      "accessToken": [
-          {
-              "name": "idtyp",
-              "source": null,
-              "essential": false,
-              "additionalProperties": []
-          }
-      ],
-      "saml2Token": []
-  },
-  "requiredResourceAccess": [
-      {
-          "resourceAppId": "Microsoft Graph",
-          "resourceAccess": [
-              {
-                  "id": "User.Read",
-                  "type": "Scope"
-              }
-          ]
-      }
-  ],
-  "oauth2Permissions": [
+  "api": {
+    "requestedAccessTokenVersion": 2,
+    "oauth2PermissionScopes": [
       {
-          "adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
-          "adminConsentDisplayName": "Teams can access app's web APIs",
-          "id": "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}",
-          "isEnabled": true,
-          "type": "User",
-          "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
-          "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
-          "value": "access_as_user"
+        "adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
+        "adminConsentDisplayName": "Teams can access app's web APIs",
+        "id": "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}",
+        "isEnabled": true,
+        "type": "User",
+        "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
+        "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
+        "value": "access_as_user"
       }
-  ],
-  "preAuthorizedApplications": [
+    ],
+    "preAuthorizedApplications": [
       {
-          "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "00000002-0000-0ff1-ce00-000000000000",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "00000002-0000-0ff1-ce00-000000000000",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "4345a7b9-9a63-4910-a426-35363201d503",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "4345a7b9-9a63-4910-a426-35363201d503",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       },
       {
-          "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
-          "permissionIds": [
-              "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-          ]
+        "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
       }
+    ]
+  },
+  "info": {},
+  "optionalClaims": {
+    "idToken": [],
+    "accessToken": [
+      {
+        "name": "idtyp",
+        "source": null,
+        "essential": false,
+        "additionalProperties": []
+      }
+    ],
+    "saml2Token": []
+  },
+  "publicClient": {
+    "redirectUris": []
+  },
+  "requiredResourceAccess": [
+    {
+      "resourceAppId": "Microsoft Graph",
+      "resourceAccess": [
+        {
+          "id": "User.Read",
+          "type": "Scope"
+        }
+      ]
+    }
   ],
-  "identifierUris": [
-  ],
-  "replyUrlsWithType": [
-  ]
-}
+  "web": {
+    "redirectUris": [],
+    "implicitGrantSettings": {}
+  },
+  "spa": {
+    "redirectUris": []
+  }
+}

package/templates/plugins/resource/aad/auth/bot/js/public/auth-end.html

@@ -9,8 +9,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      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>

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

@@ -9,8 +9,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      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>

package/templates/plugins/resource/aad/auth/tab/js/public/auth-end.html

@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      src="https://res.cdn.office.net/teams-js/2.31.1/js/MicrosoftTeams.min.js"
+      integrity="sha384-ihAqYgEJz9hzEU+HaYodG1aTzjebC/wKXQi1nWKZG7OLAUyOL9ZrzD/SfZu79Jeu"
       crossorigin="anonymous"
     ></script>
     <script

package/templates/plugins/resource/aad/auth/tab/js/public/auth-start.html

@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      src="https://res.cdn.office.net/teams-js/2.31.1/js/MicrosoftTeams.min.js"
+      integrity="sha384-ihAqYgEJz9hzEU+HaYodG1aTzjebC/wKXQi1nWKZG7OLAUyOL9ZrzD/SfZu79Jeu"
       crossorigin="anonymous"
     ></script>
     <script

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

@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      src="https://res.cdn.office.net/teams-js/2.31.1/js/MicrosoftTeams.min.js"
+      integrity="sha384-ihAqYgEJz9hzEU+HaYodG1aTzjebC/wKXQi1nWKZG7OLAUyOL9ZrzD/SfZu79Jeu"
       crossorigin="anonymous"
     ></script>
     <script

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

@@ -8,8 +8,8 @@
 
   <body>
     <script
-      src="https://res.cdn.office.net/teams-js/2.17.0/js/MicrosoftTeams.min.js"
-      integrity="sha384-xp55t/129OsN192JZYLP0rGhzjCF9aYtjY0LVtXvolkDrBe4Jchylp56NrUYJ4S2"
+      src="https://res.cdn.office.net/teams-js/2.31.1/js/MicrosoftTeams.min.js"
+      integrity="sha384-ihAqYgEJz9hzEU+HaYodG1aTzjebC/wKXQi1nWKZG7OLAUyOL9ZrzD/SfZu79Jeu"
       crossorigin="anonymous"
     ></script>
     <script

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

@@ -1,102 +1,114 @@
 {
-    "id": "{{state.fx-resource-aad-app-for-teams.objectId}}",
-    "appId": "{{state.fx-resource-aad-app-for-teams.clientId}}",
-    "name": "{{config.manifest.appName.short}}-aad",
-    "accessTokenAcceptedVersion": 2,
-    "signInAudience": "AzureADMyOrg",
-    "optionalClaims": {
-        "idToken": [],
-        "accessToken": [
-            {
-                "name": "idtyp",
-                "source": null,
-                "essential": false,
-                "additionalProperties": []
-            }
-        ],
-        "saml2Token": []
-    },
-    "requiredResourceAccess": [
-        {
-            "resourceAppId": "Microsoft Graph",
-            "resourceAccess": [
-                {
-                    "id": "User.Read",
-                    "type": "Scope"
-                }
-            ]
-        }
-    ],
-    "oauth2Permissions": [
-        {
-            "adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
-            "adminConsentDisplayName": "Teams can access app's web APIs",
-            "id": "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}",
-            "isEnabled": true,
-            "type": "User",
-            "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
-            "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
-            "value": "access_as_user"
-        }
+  "id": "{{state.fx-resource-aad-app-for-teams.objectId}}",
+  "appId": "{{state.fx-resource-aad-app-for-teams.clientId}}",
+  "displayName": "{{config.manifest.appName.short}}-aad",
+  "identifierUris": [
+    "{{state.fx-resource-aad-app-for-teams.applicationIdUris}}"
+  ],
+  "signInAudience": "AzureADMyOrg",
+  "api": {
+    "requestedAccessTokenVersion": 2,
+    "oauth2PermissionScopes": [
+      {
+        "adminConsentDescription": "Allows Teams to call the app's web APIs as the current user.",
+        "adminConsentDisplayName": "Teams can access app's web APIs",
+        "id": "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}",
+        "isEnabled": true,
+        "type": "User",
+        "userConsentDescription": "Enable Teams to call this app's web APIs with the same rights that you have",
+        "userConsentDisplayName": "Teams can access app's web APIs and make requests on your behalf",
+        "value": "access_as_user"
+      }
     ],
     "preAuthorizedApplications": [
+      {
+        "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "00000002-0000-0ff1-ce00-000000000000",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "4345a7b9-9a63-4910-a426-35363201d503",
+        "delegatedPermissionIds": [
+          "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
+        ]
+      },
+      {
+        "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
+        "delegatedPermissionIds": [
+          "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
+        ]
+      }
+    ]
+  },
+  "info": {},
+  "optionalClaims": {
+    "idToken": [],
+    "accessToken": [
+      {
+        "name": "idtyp",
+        "source": null,
+        "essential": false,
+        "additionalProperties": []
+      }
+    ],
+    "saml2Token": []
+  },
+  "publicClient": {
+    "redirectUris": []
+  },
+  "requiredResourceAccess": [
+    {
+      "resourceAppId": "Microsoft Graph",
+      "resourceAccess": [
         {
-            "appId": "1fec8e78-bce4-4aaf-ab1b-5451cc387264",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "5e3ce6c0-2b1f-4285-8d4b-75ee78787346",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "d3590ed6-52b3-4102-aeff-aad2292ab01c",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "00000002-0000-0ff1-ce00-000000000000",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "bc59ab01-8403-45c6-8796-ac3ef710b3e3",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "0ec893e0-5785-4de6-99da-4ed124e5296c",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "4765445b-32c6-49b0-83e6-1d93765276ca",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "4345a7b9-9a63-4910-a426-35363201d503",
-            "permissionIds": [
-                "{{state.fx-resource-aad-app-for-teams.oauth2PermissionScopeId}}"
-            ]
-        },
-        {
-            "appId": "27922004-5251-4030-b22d-91ecd9a37ea4",
-            "permissionIds": [
-                "${{AAD_APP_ACCESS_AS_USER_PERMISSION_ID}}"
-            ]
+          "id": "User.Read",
+          "type": "Scope"
         }
-    ],
-    "identifierUris": [
-        "{{state.fx-resource-aad-app-for-teams.applicationIdUris}}"
-    ],
-    "replyUrlsWithType": []
-}
+      ]
+    }
+  ],
+  "web": {
+    "redirectUris": [],
+    "implicitGrantSettings": {}
+  },
+  "spa": {
+    "redirectUris": []
+  }
+}