WIP: quick save changes

snek-functions · Sep 28, 2023 · 7d4654a · 7d4654a
1 parent 457acb0
commit 7d4654a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/.DS_Store b/client/.DS_Store
diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@snek-functions/jwt",
   "type": "module",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "Auto-generated API client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/client/src/schema.generated.ts b/client/src/schema.generated.ts
@@ -30,7 +30,7 @@ export class UserTokenPayload {
     type: t.Nullable<ACCESS_REFRESH>;
     sub: t.String;
     scope: t.NotSupportedYet;
-    roles: t.Nullable<t.String>[];
+    roles: t.String[];
     iat: t.Nullable<t.Number>;
     exp: t.Nullable<t.Number>;
     jti: t.String;

diff --git a/src/utils/TokenFactory.ts b/src/utils/TokenFactory.ts
@@ -34,7 +34,7 @@ export interface UserTokenPayload {
   type: "access" | "refresh";
   sub: string;
   scope: { [key: string]: string[] };
-  roles?: string[];
+  roles: string[];
   iat?: number;
   exp?: number;
   jti: string;
@@ -114,7 +114,13 @@ export class TokenFactory {
   }
 
   private checkUserTokenPayload(payload: UserTokenPayload): void {
-    if (!payload.scope || !payload.sub || !payload.aud || !payload.jti) {
+    if (
+      !payload.scope ||
+      !payload.sub ||
+      !payload.aud ||
+      !payload.jti ||
+      !payload.roles
+    ) {
       throw new InvalidTokenError();
     }
   }
@@ -136,6 +142,12 @@ export class TokenFactory {
     if (payload.resourceId) {
       payload.aud = payload.resourceId;
     }
+    if (!payload.roles) {
+      payload.roles = [];
+    }
+    if (!payload.scope) {
+      payload.scope = {};
+    }
 
     this.checkUserTokenPayload(payload);
 
@@ -155,6 +167,12 @@ export class TokenFactory {
     if (payload.resourceId) {
       payload.aud = payload.resourceId;
     }
+    if (!payload.roles) {
+      payload.roles = [];
+    }
+    if (!payload.scope) {
+      payload.scope = {};
+    }
 
     this.checkUserTokenPayload(payload);