Merge pull request #213 from icgc-argo/rc/1.26.0

Release Candidate 1.26.0

Jenkinsfile

@@ -23,24 +23,25 @@ spec:
   - name: docker
     image: docker:18-git
     tty: true
-    volumeMounts:
-    - mountPath: /var/run/docker.sock
-      name: docker-sock
+    env:
+    - name: DOCKER_HOST
+      value: tcp://localhost:2375
+    - name: HOME
+      value: /home/jenkins/agent
   - name: dind-daemon
     image: docker:18.06-dind
     args: ["--registry-mirror", "https://registry.dev.argo.cancercollaboratory.org"]
     securityContext:
       privileged: true
+      runAsUser: 0
     volumeMounts:
     - name: docker-graph-storage
       mountPath: /var/lib/docker
+  securityContext:
+    runAsUser: 1000
   volumes:
   - name: docker-graph-storage
     emptyDir: {}
-  - name: docker-sock
-    hostPath:
-      path: /var/run/docker.sock
-      type: File
 """
         }
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "donor-submission-aggregator",
-  "version": "1.25.0",
+  "version": "1.26.0",
   "description": "Donor aggregation service for the ICGC-ARGO Submission System",
   "main": "src",
   "scripts": {

src/auth/index.ts

@@ -37,7 +37,15 @@ export const createEgoJwtManager = async (): Promise<EgoJwtManager> => {
         egoTokenUtil = await createEgoUtil();
         return await getJwt();
       case false:
-        cachedJwt = egoTokenUtil.isValidJwt() ? await getJwt() : cachedJwt;
+        const isTokenValid = egoTokenUtil.isValidJwt(cachedJwt.access_token);
+        // todo remove loggings once jwt issue is gone.
+        logger.info(`Is current JWT token valid? ${isTokenValid}`);
+        isTokenValid
+          ? logger.info(
+              `Current JWT is valid, expiring in ${cachedJwt.expires_in} seconds.`
+            )
+          : logger.info(`Current JWT is invalid, getting a new JWT...`);
+        cachedJwt = isTokenValid ? cachedJwt : await getJwt();
         return cachedJwt;
     }
   };