From b519fc0860dbd5754f0a8cae998912ec3da74926 Mon Sep 17 00:00:00 2001
From: Grace Ng <grace@workato.com>
Date: Fri, 12 Nov 2021 13:04:33 +0800
Subject: [PATCH 1/2] Update JWT to accept member ID

---
 server/index.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/server/index.js b/server/index.js
index 45edf0e..a458e6e 100644
--- a/server/index.js
+++ b/server/index.js
@@ -13,14 +13,23 @@ export default app => {
     }
 
     app.get('/workato-jwt', (req, res) => {
-        const token = sign(
-            {
-                sub: `${process.env.WK_API_KEY}:${process.env.WK_USER_ID}`,
-                jti: nanoid()
-            },
-            process.env.WK_JWT_PRIVATE_KEY,
-            {algorithm: 'RS256'}
-        );
+        const {WK_API_KEY, WK_CUSTOMER_ID, WK_USER_ID, WK_CUSTOM_VENDOR_ORIGIN} = process.env;
+        const subParams = [WK_API_KEY, WK_CUSTOMER_ID];
+
+    if (WK_USER_ID) {
+      subParams.push(WK_USER_ID);
+    }
+
+    const token = sign(
+      {
+        sub: subParams.join(':'),
+        jti: nanoid(),
+        origin: WK_CUSTOM_VENDOR_ORIGIN || undefined
+      },
+      process.env.WK_JWT_PRIVATE_KEY,
+      {algorithm: 'RS256'}
+    );
+
 
         res.json(token);
     });

From 60813bd262103c43b1942015fdb3fffb6263960a Mon Sep 17 00:00:00 2001
From: Grace Ng <grace@workato.com>
Date: Thu, 18 Nov 2021 23:38:43 +0800
Subject: [PATCH 2/2] Address comments for variables

---
 server/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/index.js b/server/index.js
index a458e6e..b74b3bc 100644
--- a/server/index.js
+++ b/server/index.js
@@ -13,7 +13,7 @@ export default app => {
     }
 
     app.get('/workato-jwt', (req, res) => {
-        const {WK_API_KEY, WK_CUSTOMER_ID, WK_USER_ID, WK_CUSTOM_VENDOR_ORIGIN} = process.env;
+        const {WK_API_KEY, WK_CUSTOMER_ID, WK_USER_ID, WK_CUSTOM_VENDOR_ORIGIN, WK_JWT_PRIVATE_KEY} = process.env;
         const subParams = [WK_API_KEY, WK_CUSTOMER_ID];
 
     if (WK_USER_ID) {
@@ -24,9 +24,9 @@ export default app => {
       {
         sub: subParams.join(':'),
         jti: nanoid(),
-        origin: WK_CUSTOM_VENDOR_ORIGIN || undefined
+        origin: WK_CUSTOM_VENDOR_ORIGIN
       },
-      process.env.WK_JWT_PRIVATE_KEY,
+      WK_JWT_PRIVATE_KEY,
       {algorithm: 'RS256'}
     );