Merge pull request #2943 from airqo-platform/staging

move to production
airqo-platform · Jan 23, 2024 · 0f007bb · 0f007bb
2 parents abc8c26 + 5b012f1
commit 0f007bb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/k8s/auth-service/values-prod.yaml b/k8s/auth-service/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-auth-api
-  tag: prod-b572fab3-1706011246
+  tag: prod-abc8c262-1706011801
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/data-proxy/values-prod.yaml b/k8s/data-proxy/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-data-proxy-api
-  tag: prod-b572fab3-1706011246
+  tag: prod-abc8c262-1706011801
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/device-registry/values-prod.yaml b/k8s/device-registry/values-prod.yaml
@@ -6,7 +6,7 @@ app:
 replicaCount: 3
 image:
   repository: eu.gcr.io/airqo-250220/airqo-device-registry-api
-  tag: prod-b572fab3-1706011246
+  tag: prod-abc8c262-1706011801
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/k8s/gp-model/values-prod.yaml b/k8s/gp-model/values-prod.yaml
@@ -6,7 +6,7 @@ app:
   namespace: production
   configMap: env-gp-model-production
 images:
-  tag: prod-b572fab3-1706011246
+  tag: prod-abc8c262-1706011801
   repositories:
     cronJob: eu.gcr.io/airqo-250220/airqo-gp-model-job
     brokerConsumer: eu.gcr.io/airqo-250220/airqo-gp-model-broker-consumer

diff --git a/k8s/predict/values-prod.yaml b/k8s/predict/values-prod.yaml
@@ -7,7 +7,7 @@ images:
     predictJob: eu.gcr.io/airqo-250220/airqo-predict-job
     trainJob: eu.gcr.io/airqo-250220/airqo-train-job
     predictPlaces: eu.gcr.io/airqo-250220/airqo-predict-places-air-quality
-  tag: prod-b572fab3-1706011246
+  tag: prod-abc8c262-1706011801
 api:
   name: airqo-prediction-api
   label: prediction-api

diff --git a/k8s/workflows/values-prod.yaml b/k8s/workflows/values-prod.yaml
@@ -9,7 +9,7 @@ images:
   repositories:
     initContainer: eu.gcr.io/airqo-250220/airqo-workflows-xcom
     containers: eu.gcr.io/airqo-250220/airqo-workflows
-  tag: prod-b572fab3-1706011246
+  tag: prod-abc8c262-1706011801
 nameOverride: ''
 fullnameOverride: ''
 podAnnotations: {}

diff --git a/src/auth-service/models/User.js b/src/auth-service/models/User.js
@@ -835,8 +835,8 @@ UserSchema.methods.createToken = async function () {
       return userWithDerivedAttributes;
     } else {
       const user = userWithDerivedAttributes.data[0];
-      // Calculate expiration time (24 hours from now) in seconds
-      const expirationTime = Math.floor(Date.now() / 1000) + 24 * 60 * 60;
+      const oneDayExpiry = Math.floor(Date.now() / 1000) + 24 * 60 * 60;
+      const oneHourExpiry = Math.floor(Date.now() / 1000) + 60 * 60;
       logObject("user", user);
       return jwt.sign(
         {
@@ -856,7 +856,7 @@ UserSchema.methods.createToken = async function () {
           updatedAt: user.updatedAt,
           rateLimit: user.rateLimit,
           lastLogin: user.lastLogin,
-          exp: expirationTime,
+          exp: oneHourExpiry,
         },
         constants.JWT_SECRET
       );