Fixed token expiry bug with cache (#2025)

microsoft · Jan 3, 2023 · c679a9f · c679a9f
1 parent 8538cb1
commit c679a9f
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSecurityUtility.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLServerSecurityUtility.java
@@ -408,16 +408,10 @@ static SqlFedAuthToken getMSIAuthToken(String resource, String msiClientId) thro
 
                     int startIndex_ATX;
 
-                    // Fetch expires_on
-                    if (isAzureFunction) {
-                        startIndex_ATX = result
-                                .indexOf(ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_ON_IDENTIFIER)
-                                + ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_ON_IDENTIFIER.length();
-                    } else {
-                        startIndex_ATX = result
-                                .indexOf(ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_IN_IDENTIFIER)
-                                + ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_IN_IDENTIFIER.length();
-                    }
+                    // Fetch expires_in (this is in seconds)
+                    startIndex_ATX = result
+                            .indexOf(ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_IN_IDENTIFIER)
+                            + ActiveDirectoryAuthentication.ACCESS_TOKEN_EXPIRES_IN_IDENTIFIER.length();
 
                     String accessTokenExpiry = result.substring(startIndex_ATX,
                             result.indexOf("\"", startIndex_ATX + 1));