From 1ee7288e3f046df570dcd0af895aa6c869f86135 Mon Sep 17 00:00:00 2001
From: Adam Duff <adam@getinrev.com>
Date: Thu, 23 Mar 2023 15:20:44 -0500
Subject: [PATCH 1/2] add exp to generateBearerToken options

---
 src/service-account/util/Token.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/service-account/util/Token.ts b/src/service-account/util/Token.ts
index b75918b7..ff58f5b6 100644
--- a/src/service-account/util/Token.ts
+++ b/src/service-account/util/Token.ts
@@ -18,6 +18,7 @@ export type ResponseSignedDataTokens = { token: string, signedToken: string }
 export type BearerTokenOptions = {
   ctx?: string,
   roleIDs?: string[],
+  exp?: number, 
 }
 
 export type SignedDataTokensOptions = {
@@ -84,7 +85,7 @@ function getToken(credentials, options?: BearerTokenOptions): Promise<ResponseTo
         printLog(errorMessages.NotAValidJSON, MessageType.ERROR);
         throw new SkyflowError({ code: 400, description: errorMessages.NotAValidJSON });
       }
-      const expiryTime = Math.floor(Date.now() / 1000) + 3600;
+      const expiryTime = options?.exp !== undefined ? Math.min(Math.max(options.exp), 1) : (Math.floor(Date.now() / 1000) + 3600);
 
       const claims = {
         iss: credentialsObj.clientID,

From 96a926e818811169da86d63a773c0b108ef6b26e Mon Sep 17 00:00:00 2001
From: Adam Duff <adam@getinrev.com>
Date: Thu, 23 Mar 2023 15:29:02 -0500
Subject: [PATCH 2/2] fix expiryTime exp setting incorrectly

---
 src/service-account/util/Token.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/service-account/util/Token.ts b/src/service-account/util/Token.ts
index ff58f5b6..a2645681 100644
--- a/src/service-account/util/Token.ts
+++ b/src/service-account/util/Token.ts
@@ -85,7 +85,7 @@ function getToken(credentials, options?: BearerTokenOptions): Promise<ResponseTo
         printLog(errorMessages.NotAValidJSON, MessageType.ERROR);
         throw new SkyflowError({ code: 400, description: errorMessages.NotAValidJSON });
       }
-      const expiryTime = options?.exp !== undefined ? Math.min(Math.max(options.exp), 1) : (Math.floor(Date.now() / 1000) + 3600);
+      const expiryTime = Math.floor(Date.now() / 1000) + (options?.exp !== undefined ? Math.min(Math.max(options.exp), 1) : 3600);
 
       const claims = {
         iss: credentialsObj.clientID,