Merge pull request #73 from oat-sa/fix/TBD-48/initialize-token-pool-b…

…y-configuration-values-on-first-access Fix TBD-48 initialize token pool with configuration values on first access
oat-sa · Aug 7, 2020 · 4c84a33 · 4c84a33
2 parents 0cea5f0 + eafcdd3
commit 4c84a33
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oat-sa/tao-core-sdk",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "displayName": "TAO Core SDK",
   "description": "Core libraries of TAO",
   "homepage": "https://github.com/oat-sa/tao-core-sdk-fe#readme",

diff --git a/src/core/tokenHandler.js b/src/core/tokenHandler.js
@@ -85,21 +85,25 @@ export default function tokenHandlerFactory(options) {
             // Some async checks before we go for the token:
             return tokenStore
                 .expireOldTokens()
-                .then(() => tokenStore.getSize())
-                .then(queueSize => {
-                    if (queueSize > 0) {
-                        // Token available, use it
-                        return getFirstTokenValue();
-                    } else if (!validateTokensOpt) {
-                        return this.getClientConfigTokens()
-                            .then(getFirstTokenValue);
-                    }else if (!clientConfigFetched) {
+                .then(() => {
+                    if (!clientConfigFetched) {
                         // Client Config allowed! (first and only time)
                         return this.getClientConfigTokens()
                             .then(getFirstTokenValue);
                     } else {
-                        // No more token options, refresh needed
-                        return Promise.reject(new Error('No tokens available. Please refresh the page.'));
+                        return tokenStore.getSize()
+                            .then(queueSize => {
+                                if (queueSize > 0) {
+                                    // Token available, use it
+                                    return getFirstTokenValue();
+                                } else if (!validateTokensOpt) {
+                                    return this.getClientConfigTokens()
+                                        .then(getFirstTokenValue);
+                                } else {
+                                    // No more token options, refresh needed
+                                    return Promise.reject(new Error('No tokens available. Please refresh the page.'));
+                                }
+                            });
                     }
                 });
         },