allow both https and api for backwards compat

microsoft · Sep 15, 2021 · afaba3c · chkeita · Sep 15, 2021 · afaba3c
1 parent 9ea6399
commit afaba3c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/src/deployment/azuredeploy.json b/src/deployment/azuredeploy.json
@@ -20,8 +20,8 @@
         "app_func_issuer": {
             "type": "string"
         },
-        "app_func_audience": {
-            "type": "string"
+        "app_func_audiences": {
+            "type": "array"
         },
         "multi_tenant_domain": {
             "type": "string"
@@ -283,9 +283,7 @@
                         "clientSecret": "[parameters('clientSecret')]",
                         "issuer": "[parameters('app_func_issuer')]",
                         "defaultProvider": "AzureActiveDirectory",
-                        "allowedAudiences": [
-                            "[parameters('app_func_audience')]"
-                        ],
+                        "allowedAudiences": "[parameters('app_func_audiences')]",
                         "isAadAutoProvisioned": false
                     }
                 },

diff --git a/src/deployment/deploy.py b/src/deployment/deploy.py
@@ -383,22 +383,38 @@ def try_sp_create() -> None:
                 )
 
         if self.multi_tenant_domain and app.sign_in_audience == "AzureADMyOrg":
-            url = "api://%s/%s" % (
+            url = "https://%s/%s" % (
                 self.multi_tenant_domain,
                 self.application_name,
             )
+            api_url = "api://%s/%s" % (
+                self.multi_tenant_domain,
+                self.application_name,
+            )
+            if not app.identifier_uris.contains(api_url):
+                app.identifier_uris.append(api_url)
+            else:
+                app.identifier_uris = [api_url]
+
             client.applications.patch(
-                app.object_id, ApplicationUpdateParameters(identifier_uris=[url])
+                app.object_id, ApplicationUpdateParameters(identifier_uris=app.identifier_uris)
             )
             set_app_audience(app.object_id, "AzureADMultipleOrgs")
         elif (
             not self.multi_tenant_domain
             and app.sign_in_audience == "AzureADMultipleOrgs"
         ):
             set_app_audience(app.object_id, "AzureADMyOrg")
-            url = "api://%s.azurewebsites.net" % self.application_name
+            url = "https://%s.azurewebsites.net" % self.application_name
+            api = "api://%s.azurewebsites.net" % self.application_name
+
+            if not app.identifier_uris.contains(api_url):
+                app.identifier_uris.append(api_url)
+            else:
+                app.identifier_uris = [api_url]
+
             client.applications.patch(
-                app.object_id, ApplicationUpdateParameters(identifier_uris=[url])
+                app.object_id, ApplicationUpdateParameters(identifier_uris=app.identifier_uris)
             )
         else:
             logger.debug("No change to App Registration signInAudence setting")
@@ -471,20 +487,23 @@ def deploy_template(self) -> None:
         if self.multi_tenant_domain:
             # clear the value in the Issuer Url field:
             # https://docs.microsoft.com/en-us/sharepoint/dev/spfx/use-aadhttpclient-enterpriseapi-multitenant
-            app_func_audience = "api://%s/%s" % (
-                self.multi_tenant_domain,
-                self.application_name,
-            )
+            app_func_audiences = [
+                "api://%s/%s" % ( self.multi_tenant_domain, self.application_name,),
+                "https://%s/%s" % ( self.multi_tenant_domain, self.application_name,),
+            ]
             app_func_issuer = ""
             multi_tenant_domain = {"value": self.multi_tenant_domain}
         else:
-            app_func_audience = "api://%s.azurewebsites.net" % self.application_name
+            app_func_audience = [
+                "api://%s.azurewebsites.net" % self.application_name,
+                "https://%s.azurewebsites.net" % self.application_name,
+            ]
             tenant_oid = str(self.cli_config["authority"]).split("/")[-1]
             app_func_issuer = "https://sts.windows.net/%s/" % tenant_oid
             multi_tenant_domain = {"value": ""}
 
         params = {
-            "app_func_audience": {"value": app_func_audience},
+            "app_func_audiences": {"value": app_func_audiences},
             "name": {"value": self.application_name},
             "owner": {"value": self.owner},
             "clientId": {"value": self.results["client_id"]},