got auth working

Author: jeffhollan

ConverterLibrary/Constants/Constants.cs

@@ -75,15 +75,10 @@ public static class Constants
 }
 ";
 
-        public static string AuthString = "https://login.windows.net/common";
-        public static string ClientId = "748bbb12-57ae-4ade-8138-13cd7caa0027";
-        //  public static string ClientSecret = "NnFK4FPwE+usvvTIOvjUpmY8/zC2dXwm5i89UsSfNSg=";
-        public static string ResourceUrl = "https://management.core.windows.net/"; 
-        //  public static string ResourceUrl = "http://jeffhollanlive.onmicrosoft.com/armexplorer";
-
-
-        public static string RedirectUrl = "http://localhost/";
-        public static string AuthUrl = "https://login.microsoftonline.com/common/oauth2/token";
+        public static string AuthString = "https://login.windows.net/common/oauth2/authorize";
+        public static string ClientId = "1950a258-227b-4e31-a9cf-717495945fc2";
+        public static string ResourceUrl = "https://management.core.windows.net/";
+        public static string RedirectUrl = "urn:ietf:wg:oauth:2.0:oob";
     }
 }
 

ConverterLibrary/Converter.cs

@@ -13,8 +13,6 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
-using System.Web;
-using System.Windows.Forms;
 
 namespace ConverterLibrary
 {
@@ -44,7 +42,6 @@ public class Converter : PSCmdlet
         public string Token = "";
         private DeploymentTemplate template;
         private JObject workflowTemplateReference;
-        private AuthenticationContext ac = new AuthenticationContext(Constants.AuthString);
 
 
         public Converter()
@@ -61,66 +58,19 @@ protected override void ProcessRecord()
         {
             if (String.IsNullOrEmpty(Token))
             {
+                AuthenticationContext ac = new AuthenticationContext(Constants.AuthString, true);
+                var ar = ac.AcquireToken(Constants.ResourceUrl, Constants.ClientId, new Uri(Constants.RedirectUrl), PromptBehavior.Always);
 
-                var uri = String.Format("https://login.microsoftonline.com/common/oauth2/authorize?response_type=code&client_id={0}&redirect_uri={1}&resource={2}&prompt=consent", 
-                    Constants.ClientId, HttpUtility.UrlEncode(Constants.RedirectUrl), HttpUtility.UrlEncode(Constants.ResourceUrl));
-                WriteVerbose(uri);
-                WebBrowser browser = new WebBrowser();
-                browser.ScrollBarsEnabled = true;
-                browser.Width = 800;
-                browser.Height = 840;
-                browser.ScriptErrorsSuppressed = true;
-                browser.Url = new Uri(uri);
-                
-                Form form = new Form();
-                browser.DocumentCompleted += Browser_DocumentCompleted;
-                form.Controls.Add(browser);
-                form.AutoSize = true;
-                form.ShowIcon = false;
-                form.AutoSizeMode = AutoSizeMode.GrowOnly;
-                form.Width = 810;
-                form.Height = 840;
-                form.ShowDialog();
-
-             //   Token = ar.AccessToken;
-            }
-            WriteVerbose("Retrieved Token");
-            var result = ConvertWithToken(SubscriptionId, ResourceGroup, LogicApp, Token).Result;
-            WriteObject(result.ToString());
-        }
-
-        private void Browser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
-        {
-            if (e.Url.AbsoluteUri.Contains("code="))
-            {
 
-                var queryDictionary = System.Web.HttpUtility.ParseQueryString(e.Url.Query);
-                var code = queryDictionary[0];
-                WriteVerbose("fullURL: " + e.Url.AbsoluteUri);
-                WriteVerbose("code: " + code);
+                Token = ar.AccessToken;
 
-                using (var client = new HttpClient())
-                {
-                    IEnumerable<KeyValuePair<string, string>> authorizeParameters = new[] {
-                        new KeyValuePair<string,string>("client_id",Constants.ClientId),
-                        new KeyValuePair<string,string>("code",code),
-                        new KeyValuePair<string, string>("grant_type", "authorization_code"),
-                        new KeyValuePair<string, string>("redirect_uri", Constants.RedirectUrl)
-                    };
-                    var response = client.PostAsync(Constants.AuthUrl, new FormUrlEncodedContent(authorizeParameters)).Result;
-                    WriteVerbose(response.Content.ReadAsStringAsync().Result);
-                }
-                    ((WebBrowser)sender).FindForm().Close();
-
-            }
-            else if (e.Url.AbsoluteUri.Contains("error="))
-            {
-                WriteVerbose("error: " + e.Url.AbsoluteUri);
-                ((WebBrowser)sender).FindForm().Close();
+                WriteVerbose("Retrieved Token: " + Token);
             }
-                
+            var result = ConvertWithToken(SubscriptionId, ResourceGroup, LogicApp, Token).Result;
+            WriteObject(result.ToString());
         }
 
+        
         public async Task<JObject> ConvertWithToken(string subscriptionId, string resourceGroup, string logicAppName, string bearerToken)
         {
             SubscriptionId = subscriptionId;