From 268d8367b7a4f864a9067b320e09cf81139a57fc Mon Sep 17 00:00:00 2001 From: Pranav C Date: Wed, 31 May 2023 11:02:24 +0530 Subject: [PATCH] refactor: type correction Signed-off-by: Pranav C --- packages/nocodb-sdk/src/lib/Api.ts | 2 ++ packages/nocodb/src/controllers/users/users.controller.ts | 2 +- packages/nocodb/src/schema/swagger.json | 4 ++++ packages/nocodb/src/services/users/users.service.ts | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/nocodb-sdk/src/lib/Api.ts b/packages/nocodb-sdk/src/lib/Api.ts index 06493d405c..5a3fa5ebe1 100644 --- a/packages/nocodb-sdk/src/lib/Api.ts +++ b/packages/nocodb-sdk/src/lib/Api.ts @@ -2255,6 +2255,8 @@ export interface UserType { * @example org-level-viewer */ roles?: string; + /** Access token version */ + token_version?: string; } /** diff --git a/packages/nocodb/src/controllers/users/users.controller.ts b/packages/nocodb/src/controllers/users/users.controller.ts index c68c06a4cd..02f4bf13c2 100644 --- a/packages/nocodb/src/controllers/users/users.controller.ts +++ b/packages/nocodb/src/controllers/users/users.controller.ts @@ -220,7 +220,7 @@ export class UsersController { if (!userId) return; - const user: any = await User.get(userId); + const user = await User.get(userId); if (!user) return; diff --git a/packages/nocodb/src/schema/swagger.json b/packages/nocodb/src/schema/swagger.json index b7d5a6e102..34fae1d3d8 100644 --- a/packages/nocodb/src/schema/swagger.json +++ b/packages/nocodb/src/schema/swagger.json @@ -20000,6 +20000,10 @@ "description": "The roles of the user", "example": "org-level-viewer", "type": "string" + }, + "token_version": { + "description": "Access token version", + "type": "string" } }, "required": ["email", "email_verified", "firstname", "id", "lastname"], diff --git a/packages/nocodb/src/services/users/users.service.ts b/packages/nocodb/src/services/users/users.service.ts index 48a3f4928a..0753329060 100644 --- a/packages/nocodb/src/services/users/users.service.ts +++ b/packages/nocodb/src/services/users/users.service.ts @@ -486,7 +486,7 @@ export class UsersService { return this.login(user); } - login(user: any) { + login(user: UserType) { return { token: genJwt(user, Noco.getConfig()), };