From 13040439c31cba516be1e43b2f095c475e33ec53 Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Thu, 25 Jan 2024 17:07:46 -0500 Subject: [PATCH] coerce big int from string to number from sql --- backend-pg/scripts/generate-schema-types.ts | 2 +- backend-pg/src/db/schemas/identity-access-tokens.ts | 9 ++++----- .../src/db/schemas/identity-ua-client-secrets.ts | 12 +++++------- .../src/db/schemas/identity-universal-auths.ts | 6 +++--- backend-pg/src/server/routes/v1/identity-ua.ts | 6 ++++-- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/backend-pg/scripts/generate-schema-types.ts b/backend-pg/scripts/generate-schema-types.ts index a8e2eaf67..5d51a5164 100644 --- a/backend-pg/scripts/generate-schema-types.ts +++ b/backend-pg/scripts/generate-schema-types.ts @@ -36,7 +36,7 @@ const getZodPrimitiveType = (type: string) => { case "integer": return "z.number()"; case "bigint": - return "z.number()"; + return "z.coerce.number()"; case "text": return "z.string()"; default: diff --git a/backend-pg/src/db/schemas/identity-access-tokens.ts b/backend-pg/src/db/schemas/identity-access-tokens.ts index 1d8405427..934941c4c 100644 --- a/backend-pg/src/db/schemas/identity-access-tokens.ts +++ b/backend-pg/src/db/schemas/identity-access-tokens.ts @@ -9,11 +9,10 @@ import { TImmutableDBKeys } from "./models"; export const IdentityAccessTokensSchema = z.object({ id: z.string().uuid(), - authType: z.string(), - accessTokenTTL: z.number().default(2592000), - accessTokenMaxTTL: z.number().default(2592000), - accessTokenNumUses: z.number().default(0), - accessTokenNumUsesLimit: z.number().default(0), + accessTokenTTL: z.coerce.number().default(2592000), + accessTokenMaxTTL: z.coerce.number().default(2592000), + accessTokenNumUses: z.coerce.number().default(0), + accessTokenNumUsesLimit: z.coerce.number().default(0), accessTokenLastUsedAt: z.date().nullable().optional(), accessTokenLastRenewedAt: z.date().nullable().optional(), isAccessTokenRevoked: z.boolean().default(false), diff --git a/backend-pg/src/db/schemas/identity-ua-client-secrets.ts b/backend-pg/src/db/schemas/identity-ua-client-secrets.ts index 9d65860a1..fc1a724fd 100644 --- a/backend-pg/src/db/schemas/identity-ua-client-secrets.ts +++ b/backend-pg/src/db/schemas/identity-ua-client-secrets.ts @@ -13,17 +13,15 @@ export const IdentityUaClientSecretsSchema = z.object({ clientSecretPrefix: z.string(), clientSecretHash: z.string(), clientSecretLastUsedAt: z.date().nullable().optional(), - clientSecretNumUses: z.number().default(0), - clientSecretNumUsesLimit: z.number().default(0), - clientSecretTTL: z.number().default(0), + clientSecretNumUses: z.coerce.number().default(0), + clientSecretNumUsesLimit: z.coerce.number().default(0), + clientSecretTTL: z.coerce.number().default(0), isClientSecretRevoked: z.boolean().default(false), createdAt: z.date(), updatedAt: z.date(), - identityUAId: z.string().uuid() + identityUAId: z.string().uuid(), }); export type TIdentityUaClientSecrets = z.infer; export type TIdentityUaClientSecretsInsert = Omit; -export type TIdentityUaClientSecretsUpdate = Partial< - Omit ->; +export type TIdentityUaClientSecretsUpdate = Partial>; diff --git a/backend-pg/src/db/schemas/identity-universal-auths.ts b/backend-pg/src/db/schemas/identity-universal-auths.ts index 82b9fb23e..1dbc61ea8 100644 --- a/backend-pg/src/db/schemas/identity-universal-auths.ts +++ b/backend-pg/src/db/schemas/identity-universal-auths.ts @@ -10,9 +10,9 @@ import { TImmutableDBKeys } from "./models"; export const IdentityUniversalAuthsSchema = z.object({ id: z.string().uuid(), clientId: z.string(), - accessTokenTTL: z.number().default(7200), - accessTokenMaxTTL: z.number().default(7200), - accessTokenNumUsesLimit: z.number().default(0), + accessTokenTTL: z.coerce.number().default(7200), + accessTokenMaxTTL: z.coerce.number().default(7200), + accessTokenNumUsesLimit: z.coerce.number().default(0), clientSecretTrustedIps: z.unknown(), accessTokenTrustedIps: z.unknown(), createdAt: z.date(), diff --git a/backend-pg/src/server/routes/v1/identity-ua.ts b/backend-pg/src/server/routes/v1/identity-ua.ts index a6def6d73..6a18b50d4 100644 --- a/backend-pg/src/server/routes/v1/identity-ua.ts +++ b/backend-pg/src/server/routes/v1/identity-ua.ts @@ -31,8 +31,8 @@ export const registerIdentityUaRouter = async (server: FastifyZodProvider) => { response: { 200: z.object({ accessToken: z.string(), - expiresIn: z.number(), - accessTokenMaxTTL: z.number(), + expiresIn: z.coerce.number(), + accessTokenMaxTTL: z.coerce.number(), tokenType: z.literal("Bearer") }) } @@ -242,6 +242,8 @@ export const registerIdentityUaRouter = async (server: FastifyZodProvider) => { } }); + console.log("HELLOoooo====+", typeof(identityUniversalAuth.accessTokenNumUsesLimit), identityUniversalAuth) + return { identityUniversalAuth }; } });