Merge pull request #331 from dragonfruitnetwork/allow-token-refetch

add refetch logic to tokens
dragonfruitnetwork · Oct 22, 2022 · e2a13a4 · e2a13a4
2 parents f29d965 + 3a7ba00
commit e2a13a4
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/DragonFruit.Six.Api/Dragon6Client.cs b/DragonFruit.Six.Api/Dragon6Client.cs
@@ -68,21 +68,31 @@ static Dragon6Client()
 
         protected internal async ValueTask<ClientTokenInjector> RequestToken()
         {
-            if (_access?.Expired is false)
+            if (_access?.Expired == false)
             {
                 return _access;
             }
 
             using (await _accessSync.LockAsync().ConfigureAwait(false))
             {
                 // check again in case of a backlog
-                if (_access?.Expired is not false)
+                if (_access?.Expired == false)
+                {
+                    return _access;
+                }
+
+                for (int i = 0; i < 2; i++)
                 {
                     var token = await GetToken(_access?.Token.SessionId).ConfigureAwait(false);
                     _access = new ClientTokenInjector(token);
+
+                    if (!_access.Expired)
+                    {
+                        return _access;
+                    }
                 }
 
-                return _access;
+                throw new InvalidTokenException(_access?.Token);
             }
         }
     }