Shopify OAuth fixes

Author: acoumb

src/Umbraco.Cms.Integrations.Commerce.Shopify/App_Plugins/UmbracoCms.Integrations/Commerce/Shopify/js/productPickerSettings.controller.js

@@ -62,11 +62,11 @@
 
     function validateOAuthSetup() {
         umbracoCmsIntegrationsCommerceShopifyResource.validateAccessToken().then(function (response) {
-
             vm.oauthSetup = {
-                isConnected: response.isValid,
+                isValid: response.isValid,
+                isConnected: response.isConnected,
                 isAccessTokenExpired: response.isExpired,
-                isAccessTokenValid: response.isValid
+                isAccessTokenValid: response.isConnected
             }
 
             if (vm.oauthSetup.isConnected === true && vm.oauthSetup.isAccessTokenValid === true) {

src/Umbraco.Cms.Integrations.Commerce.Shopify/Models/EditorSettings.cs

@@ -12,6 +12,9 @@ public EditorSettings()
         [JsonProperty("isValid")]
         public bool IsValid { get; set; }
 
+        [JsonProperty("isConnected")]
+        public bool IsConnected { get; set; }
+
         [JsonProperty("type")]
         public ConfigurationType Type { get; set; }
     }

src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/BaseAuthorizationService.cs

@@ -16,8 +16,7 @@ public class BaseAuthorizationService
         protected const string ShopifyAuthorizationUrl = "https://{0}.myshopify.com/admin/oauth/authorize" +
             "?client_id={1}" +
             "&redirect_uri={2}" +
-            "&scope=read_products" +
-            "&grant_options[]=value";
+            "&scope=read_products";
 
         public BaseAuthorizationService(ITokenService tokenService)
         {

src/Umbraco.Cms.Integrations.Commerce.Shopify/Services/ShopifyService.cs

@@ -106,13 +106,25 @@ public EditorSettings GetApiConfiguration()
             // validate OAuth configuration if AuthorizationService is used.
             // if authorization is managed through UmbracoAuthorizationService, the properties client ID and proxy URL are set correctly.
             if (_settings.UseUmbracoAuthorization)
-                return new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth };
+            {
+                var editorSettings = new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth };
+
+                editorSettings.IsConnected = ValidateAccessToken().ConfigureAwait(false).GetAwaiter().GetResult().IsValid;
+
+                return editorSettings;
+            }
             else
+            {
                 return !string.IsNullOrEmpty(_oauthSettings.ClientId)
                         && !string.IsNullOrEmpty(_oauthSettings.ClientSecret)
                         && !string.IsNullOrEmpty(_oauthSettings.RedirectUri)
-                        ? new EditorSettings { IsValid = true, Type = ConfigurationType.OAuth }
+                        ? new EditorSettings { 
+                            IsValid = true,
+                            IsConnected = ValidateAccessToken().ConfigureAwait(false).GetAwaiter().GetResult().IsValid, 
+                            Type = ConfigurationType.OAuth 
+                        }
                         : new EditorSettings();
+            }
         }
 
         public async Task<ResponseDto<ProductsListDto>> ValidateAccessToken()
@@ -146,7 +158,7 @@ public async Task<ResponseDto<ProductsListDto>> ValidateAccessToken()
 
         public void RevokeAccessToken()
         {
-            _tokenService.RemoveParameters(Constants.Configuration.UmbracoCmsIntegrationsCommerceShopifyAccessToken);
+            _tokenService.RemoveParameters(Constants.AccessTokenDbKey);
         }
 
         public async Task<ResponseDto<ProductsListDto>> GetResults(string pageInfo)