Merge pull request #179 from umbraco/bugfix/semrush-auth-ui-status

Bugfix/semrush auth UI status

Author: acoumb

src/Umbraco.Cms.Integrations.SEO.Semrush/App_Plugins/UmbracoCms.Integrations/SEO/Semrush/semrush.controller.js

@@ -200,7 +200,7 @@
         function validateToken() {
             umbracoCmsIntegrationsSemrushResource.validateToken().then(function (response) {
                 vm.isFreeAccount = response.isFreeAccount;
-                if (response.isExpired) {
+                if (!response.isAuthorized) {
                     vm.isConnected = false;
                 } else {
                     if (response.isValid === false) {
@@ -275,6 +275,7 @@
             var options = {
                 title: "SEMrush Authorization Details",
                 isFreeAccount: vm.isFreeAccount,
+                isAuthorized: vm.isConnected,
                 view: "/App_Plugins/UmbracoCms.Integrations/SEO/Semrush/statusEditor.html",
                 size: "small",
                 revoke: function () {

src/Umbraco.Cms.Integrations.SEO.Semrush/App_Plugins/UmbracoCms.Integrations/SEO/Semrush/status.controller.js

@@ -4,7 +4,8 @@
 
         var vm = this;
 
-        vm.isFreeAccount = $scope.model.isFreeAccount !== null
+        vm.isAuthorized = $scope.model.isAuthorized;
+        vm.isFreeAccount = $scope.model.isFreeAccount !== null && $scope.model.isAuthorized
             ? ($scope.model.isFreeAccount === true ? "Free" : "Paid") : "N.A.";
 
         umbracoCmsIntegrationsSemrushResource.getTokenDetails().then(function (response) {

src/Umbraco.Cms.Integrations.SEO.Semrush/App_Plugins/UmbracoCms.Integrations/SEO/Semrush/statusEditor.html

@@ -4,7 +4,7 @@
         <umb-editor-container>
             <umb-box>
                 <umb-box-content>
-                    <p><b>Connected:</b> {{ vm.isAccessTokenAvailable }}</p>
+                    <p><b>Connected:</b> {{ vm.isAccessTokenAvailable && vm.isAuthorized }}</p>
                     <p><b>Account:</b> {{ vm.isFreeAccount }}</p>
                     <p ng-if="vm.isAccessTokenAvailable"><b>Access Token:</b> {{ vm.AccessToken }}</p>
                     <umb-button action="vm.onRevokeToken()"

src/Umbraco.Cms.Integrations.SEO.Semrush/Constants.cs

@@ -11,6 +11,8 @@ public class Constants
 
         public const string SemrushKeywordsEndpoint = "{0}api/v1/keywords/{1}?access_token={2}&phrase={3}&database={4}";
 
+        public const string BadRefreshToken = "BAD_REFRESH_TOKEN";
+
         public static class Configuration
         {
             public const string Settings = "Umbraco:Cms:Integrations:SEO:Semrush:Settings";

src/Umbraco.Cms.Integrations.SEO.Semrush/Controllers/SemrushController.cs

@@ -113,13 +113,19 @@ public async Task<AuthorizationResponseDto> ValidateToken()
         {
             _semrushTokenService.TryGetParameters(Constants.TokenDbKey, out TokenDto token);
 
-            if (!token.IsAccessTokenAvailable) return new AuthorizationResponseDto { IsExpired = true };
+            if (!token.IsAccessTokenAvailable) return new AuthorizationResponseDto { IsAuthorized = false };
 
             var response = await ClientFactory()
                 .GetAsync(string.Format(Constants.SemrushKeywordsEndpoint, _settings.BaseUrl, "phrase_related", token.AccessToken, "ping", "us"));
 
+            if (response.StatusCode == HttpStatusCode.Unauthorized)
+            {
+                await _authorizationService.RefreshAccessTokenAsync();
+            }
+
             return new AuthorizationResponseDto
             {
+                IsAuthorized = response.StatusCode == HttpStatusCode.OK,
                 IsValid = response.StatusCode != HttpStatusCode.Unauthorized,
                 IsFreeAccount = response.Headers.TryGetValues(Constants.AllowLimitOffsetHeaderName,
                     out IEnumerable<string> values)

src/Umbraco.Cms.Integrations.SEO.Semrush/Models/Dtos/AuthorizationResponseDto.cs

@@ -5,8 +5,8 @@ namespace Umbraco.Cms.Integrations.SEO.Semrush.Models.Dtos
 {
     public class AuthorizationResponseDto
     {
-        [JsonProperty("isExpired")]
-        public bool IsExpired { get; set; }
+        [JsonProperty("isAuthorized")]
+        public bool IsAuthorized { get; set; }
 
         [JsonProperty("isValid")]
         public bool IsValid { get; set; }

src/Umbraco.Cms.Integrations.SEO.Semrush/Services/AuthorizationService.cs

@@ -6,6 +6,10 @@
 using Umbraco.Cms.Integrations.SEO.Semrush.Configuration;
 using System.Net.Http;
 using Umbraco.Cms.Integrations.SEO.Semrush.Models.Dtos;
+using Newtonsoft.Json.Linq;
+
+using Newtonsoft.Json;
+
 
 #if NETCOREAPP
 using Microsoft.Extensions.Options;
@@ -97,6 +101,16 @@ public async Task<string> RefreshAccessTokenAsync()
 
                 return result;
             }
+            else
+            {
+                var responseContent = await response.Content.ReadAsStringAsync();
+
+                var statusObject = (JObject)JsonConvert.DeserializeObject(responseContent);
+                if (statusObject.ContainsKey("status") && statusObject["status"].ToString() == Constants.BadRefreshToken)
+                {
+                    SemrushTokenService.RemoveParameters(Constants.TokenDbKey);
+                }
+            }
 
             return "error";
         }

src/Umbraco.Cms.Integrations.SEO.Semrush/Services/UmbracoAuthorizationService.cs

@@ -1,4 +1,6 @@
-using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Umbraco.Cms.Integrations.SEO.Semrush.Models.Dtos;
@@ -70,6 +72,7 @@ public async Task<string> RefreshAccessTokenAsync()
             requestMessage.Headers.Add("service", "Semrush");
 
             var response = await ClientFactory().SendAsync(requestMessage);
+            
             if (response.IsSuccessStatusCode)
             {
                 var result = await response.Content.ReadAsStringAsync();
@@ -78,6 +81,16 @@ public async Task<string> RefreshAccessTokenAsync()
 
                 return result;
             }
+            else
+            {
+                var responseContent = await response.Content.ReadAsStringAsync();
+
+                var statusObject = (JObject)JsonConvert.DeserializeObject(responseContent);
+                if (statusObject.ContainsKey("status") && statusObject["status"].ToString() == Constants.BadRefreshToken)
+                {
+                    SemrushTokenService.RemoveParameters(Constants.TokenDbKey);
+                }
+            }
 
             return "error";
         }

src/Umbraco.Cms.Integrations.SEO.Semrush/Umbraco.Cms.Integrations.SEO.Semrush.csproj

@@ -61,10 +61,6 @@
 		</Content>
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Compile Remove="SemrushComponent.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Content Include="semrush.png">
 			<Pack>true</Pack>