Rename TimeSpan properties

Author: acoumb

examples/Umbraco.AuthorizedServices.TestSite/appsettings.json

@@ -492,10 +492,10 @@
             "RequestTokenPath": "/access_token",
             "TokenGrantType": "ig_exchange_token",
             "RequestRefreshTokenPath": "/refresh_access_token",
-            "RefreshTokenGrantType": "ig_refresh_token"
+            "RefreshTokenGrantType": "ig_refresh_token",
+            "ExchangeTokenWhenExpiresWithin": "25.00:00:00"
           },
-          "AccessTokenExpirationInterval": "00.00:00:40",
-          "ExchangeTokenExpirationInterval": "25.00:00:00"
+          "RefreshAccessTokenWhenExpiresWithin": "00.00:00:40"
         }
       }
     }

src/Umbraco.AuthorizedServices/Configuration/AuthorizedServiceSettings.cs

@@ -97,6 +97,11 @@ public class ExchangeTokenProvision
     public string RequestRefreshTokenPath { get; set; } = string.Empty;
 
     public string RefreshTokenGrantType { get; set; } = string.Empty;
+
+    /// <summary>
+    /// Gets or sets the time interval for expiration of exchange tokens.
+    /// </summary>
+    public TimeSpan ExchangeTokenWhenExpiresWithin { get; set; } = TimeSpan.FromDays(30);
 }
 
 /// <summary>
@@ -256,12 +261,7 @@ public class ServiceDetail : ServiceSummary
     /// <summary>
     /// Gets or sets the time interval for expiration of access tokens.
     /// </summary>
-    public TimeSpan AccessTokenExpirationInterval { get; set; } = TimeSpan.FromSeconds(30);
-
-    /// <summary>
-    /// Gets or sets the time interval for expiration of exchange tokens.
-    /// </summary>
-    public TimeSpan ExchangeTokenExpirationInterval { get; set; } = TimeSpan.FromDays(30);
+    public TimeSpan RefreshAccessTokenWhenExpiresWithin { get; set; } = TimeSpan.FromSeconds(30);
 
     internal string GetTokenHost() => string.IsNullOrWhiteSpace(TokenHost)
         ? IdentityHost

src/Umbraco.AuthorizedServices/Services/Implement/AuthorizedServiceCaller.cs

@@ -145,7 +145,7 @@ public async Task<string> SendRequestRawAsync<TRequest>(string serviceAlias, str
     private async Task<Token> EnsureAccessToken(string serviceAlias, Token token)
     {
         ServiceDetail serviceDetail = GetServiceDetail(serviceAlias);
-        if (token.WillBeExpiredAfter(serviceDetail.AccessTokenExpirationInterval))
+        if (token.WillBeExpiredAfter(serviceDetail.RefreshAccessTokenWhenExpiresWithin))
         {
             if (string.IsNullOrEmpty(token.RefreshToken))
             {
@@ -186,7 +186,8 @@ private async Task<Token> EnsureAccessToken(string serviceAlias, Token token)
     private async Task<Token> EnsureExchangeAccessToken(string serviceAlias, Token token)
     {
         ServiceDetail serviceDetail = GetServiceDetail(serviceAlias);
-        if (token.WillBeExpiredAfter(serviceDetail.ExchangeTokenExpirationInterval))
+        if (serviceDetail.ExchangeTokenProvision is not null
+            && token.WillBeExpiredAfter(serviceDetail.ExchangeTokenProvision.ExchangeTokenWhenExpiresWithin))
         {
             return await RefreshExchangeAccessToken(serviceAlias, token.AccessToken)
                 ?? throw new AuthorizedServiceException($"Cannot request service '{serviceAlias}' as the access token will expire and it's not been possible to exchange it for a new access token.");

src/Umbraco.AuthorizedServices/appsettings-schema.Umbraco.AuthorizedServices.json

@@ -148,13 +148,9 @@
           "type": "string",
           "description": "Gets or sets the path to a GET request used as a sample for verifying the service in the backoffice."
         },
-        "AccessTokenExpirationInterval": {
+        "RefreshAccessTokenWhenExpiresWithin": {
           "type": "string",
           "description": "Gets or sets the time interval for expiration of access tokens."
-        },
-        "ExchangeTokenExpirationInterval": {
-          "type": "string",
-          "description": "Gets or sets the time interval for expiration of exchange tokens."
         }
       }
     },
@@ -195,6 +191,10 @@
         "RefreshTokenGrantType": {
           "type": "string",
           "description": "Gets or set the grant type used for refreshing the access token."
+        },
+        "ExchangeTokenWhenExpiresWithin": {
+          "type": "string",
+          "description": "Gets or sets the time interval for expiration of exchange tokens."
         }
       }
     }