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

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

@@ -1,107 +1,116 @@
 {
   "id": "${{AAD_APP_OBJECT_ID}}",
   "appId": "${{AAD_APP_CLIENT_ID}}",
-  "name": "YOUR_AAD_APP_NAME",
-  "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"
-              }
-          ]
-      }
+  "displayName": "YOUR_AAD_APP_NAME",
+  "identifierUris": [
+    "api://botid-${{BOT_ID}}"
   ],
-  "oauth2Permissions": [
+  "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": "${{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}}"
+        ]
       }
-  ],
-  "identifierUris": [
-    "api://botid-${{BOT_ID}}"
-  ],
-  "replyUrlsWithType": [
+    ]
+  },
+  "info": {},
+  "optionalClaims": {
+    "idToken": [],
+    "accessToken": [
+      {
+        "name": "idtyp",
+        "source": null,
+        "essential": false,
+        "additionalProperties": []
+      }
+    ],
+    "saml2Token": []
+  },
+  "publicClient": {
+    "redirectUris": []
+  },
+  "requiredResourceAccess": [
     {
-      "url": "https://${{BOT_DOMAIN}}/auth-end.html",
-      "type": "Web"
+      "resourceAppId": "Microsoft Graph",
+      "resourceAccess": [
+        {
+          "id": "User.Read",
+          "type": "Scope"
+        }
+      ]
     }
-  ]
-}
+  ],
+  "web": {
+    "redirectUris": [
+      "https://${{BOT_DOMAIN}}/auth-end.html"
+    ],
+    "implicitGrantSettings": {}
+  },
+  "spa": {
+    "redirectUris": []
+  }
+}

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

@@ -1,115 +1,119 @@
 {
   "id": "${{AAD_APP_OBJECT_ID}}",
   "appId": "${{AAD_APP_CLIENT_ID}}",
-  "name": "YOUR_AAD_APP_NAME",
-  "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"
-              }
-          ]
-      }
+  "displayName": "YOUR_AAD_APP_NAME",
+  "identifierUris": [
+    "api://${{TAB_DOMAIN}}/${{AAD_APP_CLIENT_ID}}"
   ],
-  "oauth2Permissions": [
+  "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": "${{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}}"
+        ]
       }
-  ],
-  "identifierUris": [
-    "api://${{TAB_DOMAIN}}/${{AAD_APP_CLIENT_ID}}"
-  ],
-  "replyUrlsWithType": [
-    {
-      "url": "${{TAB_ENDPOINT}}/auth-end.html",
-      "type": "Web"
-    },
-    {
-      "url": "${{TAB_ENDPOINT}}/auth-end.html?clientId=${{AAD_APP_CLIENT_ID}}",
-      "type": "Spa"
-    },
+    ]
+  },
+  "info": {},
+  "optionalClaims": {
+    "idToken": [],
+    "accessToken": [
+      {
+        "name": "idtyp",
+        "source": null,
+        "essential": false,
+        "additionalProperties": []
+      }
+    ],
+    "saml2Token": []
+  },
+  "publicClient": {
+    "redirectUris": []
+  },
+  "requiredResourceAccess": [
     {
-      "url": "${{TAB_ENDPOINT}}/blank-auth-end.html",
-      "type": "Spa"
+      "resourceAppId": "Microsoft Graph",
+      "resourceAccess": [
+        {
+          "id": "User.Read",
+          "type": "Scope"
+        }
+      ]
     }
-  ]
-}
+  ],
+  "web": {
+    "redirectUris": [
+      "${{TAB_ENDPOINT}}/auth-end.html"
+    ],
+    "implicitGrantSettings": {}
+  },
+  "spa": {
+    "redirectUris": [
+      "${{TAB_ENDPOINT}}/auth-end.html?clientId=${{AAD_APP_CLIENT_ID}}",
+      "${{TAB_ENDPOINT}}/blank-auth-end.html"
+    ]
+  }
+}