Refactor of Authentication

Author: odaibert

example/service.parameters.json

@@ -4,13 +4,13 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "publisherEmail": {
-            "value": "admin@contoso.com"
+            "value": "odaibert@microsoft.com"
         },
         "publisherName": {
-            "value": "Contoso"
+            "value": "odaibert"
         },
         "ApimServiceName": {
-            "value": "contosoapim-dev"
+            "value": "odaibert-deploy"
         }
     }
 }

src/apimtemplate.test/CmdLine/ExtractTests.cs

@@ -10,7 +10,11 @@ public class ExtractTests
         [Fact]
         public void ShouldFailWithUnknownCommand()
         {
+            //arrange - do all your instatiation and configuration
 
+            //act - execute
+
+            //assert
             var createCommand = new ExtractCommand();
 
             var ex = Assert.ThrowsAny<CommandParsingException>(() => createCommand.Execute("test"));

src/apimtemplate/Commands/Extract.cs

@@ -1,8 +1,9 @@
 using System;
 using McMaster.Extensions.CommandLineUtils;
 using Colors.Net;
-using System.Net.Http;
-using System.Net.Http.Headers;
+using Newtonsoft.Json.Linq;
+using System.Linq;
+using Newtonsoft.Json;
 
 namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
@@ -13,45 +14,45 @@ public ExtractCommand()
             this.Name = Constants.ExtractName;
             this.Description = Constants.ExtractDescription;
 
-            var apimname = this.Option("--name <apimname>", "API Management name", CommandOptionType.SingleValue).IsRequired();
-
-            var auth = new Authentication();
-
-            var aztoken = auth.GetAccessToken().Result;
+            var apiManagementName = this.Option("--name <apimname>", "API Management name", CommandOptionType.SingleValue).IsRequired();
 
             this.HelpOption();
-
-            this.OnExecute(async () =>
+                 
+            this.OnExecute(() =>
             {
-                if (apimname.HasValue())
-                {
-                    Console.WriteLine($"Create command executed with name {apimname.Value()}");
-
-                    string requestUrl = "https://management.azure.com/subscriptions/cabe3525-a754-4bf7-9af4-1a9746604527/resourceGroups/apim-extractor/providers/Microsoft.ApiManagement/service/apim-extractor/apis/odaibert-logicapp/products?api-version=2018-06-01-preview";
-                                          
-                    using (HttpClient httpClient = new HttpClient())
-                    {
-                        var request = new HttpRequestMessage(HttpMethod.Get, requestUrl);
+                if (apiManagementName.HasValue()) throw new Exception("Missing parameter(s)."); //Validade if is better exception or not
 
-                        request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", aztoken);
+                string resourceGroup = "APIM-Extractor"; //change to get from commandline parameter
+                string apimname;
+                string apis;
+                int count;
 
-                        HttpResponseMessage response = await httpClient.SendAsync(request);
+                Api api = new Api();
+                JObject oApis;
 
-                        response.EnsureSuccessStatusCode();
+                apimname = apiManagementName.Values[0].ToString();
+                apis = api.GetAPIs(apimname, resourceGroup).Result;
+                oApis = JObject.Parse(apis);
+                count = oApis["value"].Count<object>();
 
-                        string responseBody = await response.Content.ReadAsStringAsync();
+                Console.WriteLine("{0} API's found!", count);
 
-                        ColoredConsole.Write(responseBody.ToString());
-                        Console.ReadKey();
-                    }
-                }
-                else
+                for (int i = 0; i < count; i++)
                 {
-                    ColoredConsole.Error.WriteLine("API Management name passed in");
+                    Console.WriteLine(oApis);
+                    string apiname = (string)oApis["value"][i]["name"];
+                    ColoredConsole.WriteLine(apiname);
+                    ColoredConsole.WriteLine(api.GetAPIOperations(apimname, resourceGroup, apiname).Result);
                 }
+                Console.ReadKey();
+
                 return 0;
             });
-
+        }
+        private static string FormatJSON(string json)
+        {
+            dynamic parsedJson = JsonConvert.DeserializeObject(json);
+            return JsonConvert.SerializeObject(parsedJson, Formatting.Indented);
         }
     }
 }

src/apimtemplate/Common/Api.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
+{
+    class Api
+    {
+        static string baseUrl = "https://management.azure.com";
+        internal Authentication auth = new Authentication();
+        public async Task<string> GetAPIOperations(string ApiManagementName, string ResourceGroupName, string ApiName)
+        {
+            (string azToken, string azSubId) = await auth.GetAccessToken();
+
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis/{4}/operations?api-version={5}",
+               baseUrl, azSubId, ResourceGroupName, ApiManagementName, ApiName, Constants.APIVersion);
+
+            return await CallApiManagement(azToken, requestUrl);
+
+        }
+        public async Task<string> GetAPIs(string ApiManagementName, string ResourceGroupName)
+        {
+            (string azToken, string azSubId) = await auth.GetAccessToken();
+
+            string requestUrl = string.Format("{0}/subscriptions/{1}/resourceGroups/{2}/providers/Microsoft.ApiManagement/service/{3}/apis?api-version={4}",
+                baseUrl, azSubId, ResourceGroupName, ApiManagementName, Constants.APIVersion);
+
+            return await CallApiManagement(azToken, requestUrl);
+
+        }
+        private static async Task<string> CallApiManagement(string azToken, string requestUrl)
+        {
+            using (HttpClient httpClient = new HttpClient())
+            {
+                var request = new HttpRequestMessage(HttpMethod.Get, requestUrl);
+
+                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", azToken);
+
+                HttpResponseMessage response = await httpClient.SendAsync(request);
+
+                response.EnsureSuccessStatusCode();
+
+                string responseBody = await response.Content.ReadAsStringAsync();
+
+                return responseBody;
+            }
+        }
+    }
+}

src/apimtemplate/Common/ApiVersionSetIdComparer.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+
+namespace APIManagementTemplate
+{
+    public class ApiVersionSetIdComparer : IEqualityComparer<JToken>
+    {
+        private const string Properties = "properties";
+        private const string ApiVersionSetId = "apiVersionSetId";
+
+        public bool Equals(JToken x, JToken y)
+        {
+            if (x == null && y == null)
+                return true;
+            if (x == null || y == null)
+                return false;
+            if (x[Properties] == null || y[Properties] == null)
+                return false;
+            return x[Properties].Value<string>(ApiVersionSetId)
+                .Equals(y[Properties].Value<string>(ApiVersionSetId));
+        }
+
+        public int GetHashCode(JToken obj)
+        {
+            if (obj[Properties] == null)
+                return obj.GetHashCode();
+            return (obj[Properties].Value<string>(ApiVersionSetId) ?? String.Empty).GetHashCode();
+        }
+    }
+}

src/apimtemplate/Common/Authentication.cs

@@ -9,20 +9,24 @@ namespace Microsoft.Azure.Management.ApiManagement.ArmTemplates
 {
     public class Authentication
     {
-        public async Task<string> GetAccessToken()
+        public async Task<(string azToken, string azSubscriptionId)> GetAccessToken()
         {
-            (bool cliSucceeded, string cliToken) = await TryGetAzCliToken();
+            (bool cliTokenSucceeded, string cliToken) = await TryGetAzCliToken();
+            (bool cliSubscriptionIdSucceeded, string cliSubscriptionId) = await TryGetAzSubscriptionId();
 
-            if (cliSucceeded) return cliToken;
+            if (cliTokenSucceeded || cliSubscriptionIdSucceeded)
+            {
+                return (cliToken, cliSubscriptionId);
+            }
 
             throw new Exception("Unable to connect to Azure. Make sure you have the `az` CLI or Azure PowerShell installed and logged in and try again");
         }
 
         private async Task<(bool succeeded, string token)> TryGetAzCliToken()
         {
             var az = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                ? new Executable("cmd", "/c az " + Constants.azParameters)
-                : new Executable("az", Constants.azParameters);
+                ? new Executable("cmd", "/c az " + Constants.azAccessToken)
+                : new Executable("az", Constants.azAccessToken);
 
             var stdout = new StringBuilder();
             var stderr = new StringBuilder();
@@ -36,7 +40,23 @@ public async Task<string> GetAccessToken()
                 return (false, stdout.ToString().Trim(' ', '\n', '\r', '"'));
             }
         }
+        private async Task<(bool succeeded, string token)> TryGetAzSubscriptionId()
+        {
+            var az = RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                ? new Executable("cmd", "/c az " + Constants.azSubscriptionId)
+                : new Executable("az", Constants.azSubscriptionId);
 
-    }
+            var stdout = new StringBuilder();
+            var stderr = new StringBuilder();
+            var completed = az.RunAsync(o => stdout.AppendLine(o), e => stderr.AppendLine(e));
 
+            if (await completed == 0)
+                return (true, stdout.ToString().Trim(' ', '\n', '\r', '"'));
+            else
+            {
+                ColoredConsole.WriteLine(($"Unable to fetch subscription id from az cli. Error: {stderr.ToString().Trim(' ', '\n', '\r')}"));
+                return (false, stdout.ToString().Trim(' ', '\n', '\r', '"'));
+            }
+        }
+    }
 }

src/apimtemplate/Common/AzureResourceId.cs

@@ -0,0 +1,85 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace APIManagementTemplate
+{
+    public class AzureResourceId
+    {
+
+        public string ResourceGroupName
+        {
+            get
+            {
+                if (this.splittedId.Length > 4)
+                {
+                    return this.splittedId[4];
+                }
+                return "";
+            }
+            set
+            {
+                if (this.splittedId.Length > 4)
+                {
+                    this.splittedId[4] = value;
+                }
+            }
+        }
+        public string SubscriptionId
+        {
+            get
+            {
+                if (this.splittedId.Length > 2)
+                {
+                    return this.splittedId[2];
+                }
+                return "";
+            }
+            set
+            {
+                if (this.splittedId.Length > 2)
+                {
+                    this.splittedId[2] = value;
+                }
+            }
+        }
+        public string ResourceName
+        {
+            get
+            {
+                return this.splittedId.Last();
+            }
+            set
+            {
+                this.splittedId[this.splittedId.Length - 1] = value;
+            }
+        }
+
+        public string ValueAfter(String type)
+        {
+            var rest = this.splittedId.SkipWhile(s => s != type).Skip(1);
+            return rest.FirstOrDefault();
+        }
+
+        public void ReplaceValueAfter(String type, string value)
+        {
+            var position = this.splittedId.TakeWhile(s => s != type).Count() + 1;
+            if (position < this.splittedId.Length)
+                this.splittedId[position] = value;
+        }
+
+        private string[] splittedId;
+        public AzureResourceId(string resourceid)
+        {
+            string replaced = "/" + resourceid.Substring(resourceid.IndexOf("subscriptions/"));
+            this.splittedId = replaced.Split('/');
+        }
+
+        public override string ToString()
+        {
+            return splittedId.Aggregate((a, n) => { return a + '/' + n; }).ToString();
+        }
+    }
+}

src/apimtemplate/Common/Constants.cs

@@ -11,7 +11,11 @@ internal static class Constants
         public const string CreateDescription = "Create an API Management instance from files";
         public const string ExtractName = "extract";
         public const string ExtractDescription = "Extract an existing API Management instance";
+        public const string APIVersion = "2018-06-01-preview";
 
-        public const string azParameters = "account get-access-token --query \"accessToken\" --output json";
+        public const string azAccessToken = "account get-access-token --query \"accessToken\" --output json";
+        public const string azSubscriptionId = "account get-access-token --query \"subscription\" --output json";
+        internal static string deploymentSchema;
+        internal static string deploymenParameterSchema;
     }
 }