Merge pull request #13 from CodeBeamOrg/dev

More AuthService Features

Author: mckaragoz

GoogleApis.Blazor/AllEnums.cs

@@ -2,17 +2,6 @@
 #pragma warning disable CS1591
 namespace GoogleApis.Blazor
 {
-    public static class EnumExtensions
-    {
-        public static string ToDescriptionString(this Enum val)
-        {
-            var attributes = (DescriptionAttribute[])val.GetType().GetField(val.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), false);
-
-            return attributes.Length > 0
-                ? attributes[0].Description
-                : val.ToString();
-        }
-    }
 
     public enum Scope
     {
@@ -80,4 +69,14 @@ public enum EventValueType
         Location,
     }
 
+    public enum PromptType
+    {
+        [Description("none")]
+        None,
+        [Description("consent")]
+        Consent,
+        [Description("select_account")]
+        SelectAccount,
+    }
+
 }

GoogleApis.Blazor/Auth/AuthService.cs

@@ -1,4 +1,6 @@
-using Microsoft.AspNetCore.Components;
+using GoogleApis.Blazor.Extensions;
+using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Configuration;
 using Microsoft.JSInterop;
 using System;
 using System.Collections.Generic;
@@ -19,26 +21,30 @@ public class AuthService
     {
         [Inject] IHttpClientFactory HttpClientFactory { get; set; }
         [Inject] IJSRuntime JSRuntime { get; set; }
+        [Inject] IConfiguration Configuration { get; set; }
 
         /// <summary>
         /// Constructs the class.
         /// </summary>
         /// <param name="jsRuntime"></param>
         /// <param name="httpClientFactory"></param>
-        public AuthService(IJSRuntime jsRuntime, IHttpClientFactory httpClientFactory)
+        /// <param name="configuration"></param>
+        public AuthService(IJSRuntime jsRuntime, IHttpClientFactory httpClientFactory, IConfiguration configuration)
         {
             JSRuntime = jsRuntime;
             HttpClientFactory = httpClientFactory;
+            Configuration = configuration;
         }
 
         /// <summary>
-        /// oAuth2 Step 1. Opens "Select Google Account" page in a new tab and return the value into redirectUrl.
+        /// oAuth2 Step 1. Opens "Select Google Account" page in a new tab and return the value into redirectUrl. Default prompt is consent, which asked for user permission each time (none for not opening consent page and select account for account select account page).
         /// </summary>
         /// <param name="clientId"></param>
         /// <param name="scopes"></param>
         /// <param name="redirectUrl"></param>
+        /// <param name="promptType"></param>
         /// <returns></returns>
-        public async Task RequestAuthorizationCode(string clientId, List<Scope> scopes, string redirectUrl)
+        public async Task RequestAuthorizationCode(string clientId, List<Scope> scopes, string redirectUrl, PromptType promptType = PromptType.Consent)
         {
             string encodedRedirectUrl = HttpUtility.UrlEncode(redirectUrl);
             if (scopes == null || scopes.Count == 0)
@@ -52,7 +58,7 @@ public async Task RequestAuthorizationCode(string clientId, List<Scope> scopes,
             }
             string scopeString = string.Join("+", scopeStringList);
 
-            await JSRuntime.InvokeAsync<object>("open", $"https://accounts.google.com/o/oauth2/auth/oauthchooseaccount?response_type=code&client_id={clientId}&scope={scopeString}&redirect_uri={encodedRedirectUrl}&flowName=GeneralOAuthFlow&access_type=offline&prompt=consent", "_blank");
+            await JSRuntime.InvokeAsync<object>("open", $"https://accounts.google.com/o/oauth2/auth/oauthchooseaccount?response_type=code&client_id={clientId}&scope={scopeString}&redirect_uri={encodedRedirectUrl}&flowName=GeneralOAuthFlow&access_type=offline&prompt={promptType.ToDescriptionString()}", "_blank");
         }
 
         /// <summary>
@@ -77,6 +83,81 @@ public string AuthorizeCredential(string authorizationCode, string clientId, str
             return request.Content.ReadAsStringAsync().Result;
         }
 
+        /// <summary>
+        /// Refresh and create new access token with given resfresh token.
+        /// </summary>
+        /// <param name="refreshToken"></param>
+        /// <param name="clientId"></param>
+        /// <param name="clientSecret"></param>
+        /// <param name="redirectUrl"></param>
+        /// <returns></returns>
+        public string RefreshAccessToken(string refreshToken, string clientId, string clientSecret, string redirectUrl)
+        {
+            string encodedRedirectUrl = HttpUtility.UrlEncode(redirectUrl);
+
+            var client = HttpClientFactory.CreateClient();
+            client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/x-www-form-urlencoded"));
+            var content = new StringContent($"refresh_token={refreshToken}&client_id={clientId}&client_secret={clientSecret}&redirect_uri={encodedRedirectUrl}&scope=&grant_type=refresh_token", Encoding.UTF8, "application/x-www-form-urlencoded");
+
+            var request = client.PostAsync("https://oauth2.googleapis.com/token", content).Result;
+
+            var result = request.Content.ReadAsStringAsync().Result;
+
+            var jsonResult = JsonDocument.Parse(result);
+            string accessToken = jsonResult.RootElement.GetProperty("access_token").ToString();
+
+            return accessToken;
+        }
+
+        /// <summary>
+        /// Get client id. Only works when client id stored in appsettings.json. You can choose the root value that google credentials stored.
+        /// </summary>
+        /// <param name="rootValue"></param>
+        /// <returns></returns>
+        public string GetClientId(string rootValue = "GoogleClient")
+        {
+            return Configuration.GetSection(rootValue).GetSection("client_id").Value;
+        }
+
+        /// <summary>
+        /// Get client secret. Only works when client id stored in appsettings.json. You can choose the root value that google credentials stored.
+        /// </summary>
+        /// <param name="rootValue"></param>
+        /// <returns></returns>
+        public string GetClientSecret(string rootValue = "GoogleClient")
+        {
+            return Configuration.GetSection(rootValue).GetSection("client_secret").Value;
+        }
+
+        /// <summary>
+        /// Get project id. Only works when client id stored in appsettings.json. You can choose the root value that google credentials stored.
+        /// </summary>
+        /// <param name="rootValue"></param>
+        /// <returns></returns>
+        public string GetProjectId(string rootValue = "GoogleClient")
+        {
+            return Configuration.GetSection(rootValue).GetSection("project_id").Value;
+        }
+
+        /// <summary>
+        /// Gets access token expired or not with given content result. Most of the methods' result can be the contentResult parameter directly.
+        /// </summary>
+        /// <param name="contentResult"></param>
+        /// <returns></returns>
+        public bool IsAccessTokenExpired(string contentResult)
+        {
+            var jsonResult = JsonDocument.Parse(contentResult);
+            string errorMessage = jsonResult.RootElement.GetPropertyExtension("error")?.GetProperty("errors")[0].GetProperty("message").ToString();
+            string errorReason = jsonResult.RootElement.GetPropertyExtension("error")?.GetProperty("errors")[0].GetProperty("reason").ToString();
+
+            if (errorMessage == "Invalid Credentials" || errorReason == "authError")
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Get authenticated user's e-mail adress.
         /// </summary>

GoogleApis.Blazor/Extensions/EnumExtension.cs

@@ -0,0 +1,17 @@
+#pragma warning disable CS1591
+using System.ComponentModel;
+
+namespace GoogleApis.Blazor.Extensions
+{
+    public static class EnumExtensions
+    {
+        public static string ToDescriptionString(this Enum val)
+        {
+            var attributes = (DescriptionAttribute[])val.GetType().GetField(val.ToString()).GetCustomAttributes(typeof(DescriptionAttribute), false);
+
+            return attributes.Length > 0
+                ? attributes[0].Description
+                : val.ToString();
+        }
+    }
+}

GoogleApis.Blazor/Extensions/JsonElementExtension.cs

@@ -0,0 +1,17 @@
+using System.Text.Json;
+#pragma warning disable CS1591
+namespace GoogleApis.Blazor.Extensions
+{
+    public static class JsonElementExtenstion
+    {
+        public static JsonElement? GetPropertyExtension(this JsonElement jsonElement, string propertyName)
+        {
+            if (jsonElement.TryGetProperty(propertyName, out JsonElement returnElement))
+            {
+                return returnElement;
+            }
+
+            return null;
+        }
+    }
+}

GoogleApis.Blazor/GoogleApis.Blazor.csproj

@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="Microsoft.JSInterop" Version="6.0.4" />
   </ItemGroup>