split api if auth server is referenced, enable api-auth server linking

Author: lucashuet93

src/APIM_ARMTemplate/apimtemplate/Common/TemplateModels/APITemplateResource.cs

@@ -1,4 +1,6 @@
 
+using System;
+
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates.Common
 {
     public class APITemplateResource: TemplateResource
@@ -15,11 +17,11 @@ public class APITemplateProperties
         public string type { get; set; }
         public string apiRevision { get; set; }
         public string apiVersion { get; set; }
-        public bool isCurrent { get; set; }
+        public Nullable<bool> isCurrent { get; set; }
         public string apiRevisionDescription { get; set; }
         public string apiVersionDescription { get; set; }
         public string apiVersionSetId { get; set; }
-        public bool subscriptionRequired { get; set; }
+        public Nullable<bool> subscriptionRequired { get; set; }
         public string displayName { get; set; }
         public string serviceUrl { get; set; }
         public string path { get; set; }

src/APIM_ARMTemplate/apimtemplate/Creator/TemplateCreators/APITemplateCreator.cs

@@ -127,7 +127,7 @@ public async Task<APITemplateResource> CreateAPITemplateResourceAsync(APIConfig
                 if (api.authenticationSettings != null && api.authenticationSettings.oAuth2 != null && api.authenticationSettings.oAuth2.authorizationServerId != null
                     && apiTemplateResource.properties.authenticationSettings != null && apiTemplateResource.properties.authenticationSettings.oAuth2 != null && apiTemplateResource.properties.authenticationSettings.oAuth2.authorizationServerId != null)
                 {
-                    apiTemplateResource.properties.authenticationSettings.oAuth2.authorizationServerId = $"[resourceId('Microsoft.ApiManagement/service/authorizationServers', parameters('ApimServiceName'), '{api.authenticationSettings.oAuth2.authorizationServerId}')]";
+                    apiTemplateResource.properties.authenticationSettings.oAuth2.authorizationServerId = api.authenticationSettings.oAuth2.authorizationServerId;
                 }
             }
             if (!isSplit || !isInitial)
@@ -160,7 +160,7 @@ public string[] CreateProtocols(OpenApiDocument doc)
         public bool isSplitAPI(APIConfig apiConfig)
         {
             // the api needs to be split into multiple templates if the user has supplied a version or version set - deploying swagger related properties at the same time as api version related properties fails, so they must be written and deployed separately
-            return apiConfig.apiVersion != null || apiConfig.apiVersionSetId != null;
+            return apiConfig.apiVersion != null || apiConfig.apiVersionSetId != null || (apiConfig.authenticationSettings != null && apiConfig.authenticationSettings.oAuth2 != null && apiConfig.authenticationSettings.oAuth2.authorizationServerId != null);
         }
     }
 }