fix(IAM Token): Update token validation

IBM · Nov 18, 2019 · 357fc03 · 357fc03
1 parent 8898055
commit 357fc03
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/IBM.Cloud.SDK.Core/Authentication/Iam/IamToken.cs b/src/IBM.Cloud.SDK.Core/Authentication/Iam/IamToken.cs
@@ -23,6 +23,7 @@ public class IamToken
     {
         public string AccessToken { get; set; }
         public long ExpirationTimeInMillis { get; set; }
+        public long ExpirationTime { get; set; }
 
         /// <summary>
         /// This ctor is used to store a user-managed access token which will never expire.
@@ -41,14 +42,15 @@ public IamToken(IamTokenResponse response)
             float fractionOfTtl = 0.8f;
             long? timeToLive = response.ExpiresIn;
             long? expireTime = response.Expiration;
-            long currentTime = DateTimeOffset.Now.ToUnixTimeSeconds();
-
-            ExpirationTimeInMillis = (long)expireTime - ((long)timeToLive * (long)(1.0 - fractionOfTtl)) * 1000;
+            long currentTime = DateTimeOffset.Now.ToUnixTimeSeconds();
+
+            ExpirationTime = (long)(currentTime + (timeToLive * fractionOfTtl));
+            ExpirationTimeInMillis = ExpirationTime * 1000;
         }
 
         public bool IsTokenValid()
         {
-            return !string.IsNullOrEmpty(AccessToken) && (ExpirationTimeInMillis < 0 || DateTimeOffset.Now.ToUnixTimeMilliseconds() <= ExpirationTimeInMillis);
+            return DateTimeOffset.Now.ToUnixTimeSeconds() < ExpirationTime;
         }
     }
 }
diff --git a/src/IBM.Cloud.SDK.Core/IBM.Cloud.SDK.Core.csproj b/src/IBM.Cloud.SDK.Core/IBM.Cloud.SDK.Core.csproj
@@ -13,7 +13,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.0.0</Version>
+    <Version>1.1.0-rc01</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">