From 1e4164e1c24b882c22c2f231eafc0a6afa4dd175 Mon Sep 17 00:00:00 2001 From: = Date: Sun, 1 Dec 2024 23:00:07 +0530 Subject: [PATCH] feat: resolved migration failing due to json --- .../migrations/20241129180030_identity-k8-auth-to-kms.ts | 7 ++++++- .../migrations/20241129180053_identity-oidc-auth-to-kms.ts | 6 +++++- backend/src/server/routes/v1/identity-oidc-auth-router.ts | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/backend/src/db/migrations/20241129180030_identity-k8-auth-to-kms.ts b/backend/src/db/migrations/20241129180030_identity-k8-auth-to-kms.ts index 2bbe8022b..b1b3a7ec1 100644 --- a/backend/src/db/migrations/20241129180030_identity-k8-auth-to-kms.ts +++ b/backend/src/db/migrations/20241129180030_identity-k8-auth-to-kms.ts @@ -137,7 +137,12 @@ const reencryptIdentityK8sAuth = async (knex: Knex) => { plainText: Buffer.from(decryptedCertificate) }).cipherTextBlob; - return { ...el, encryptedKubernetesCaCertificate, encryptedKubernetesTokenReviewerJwt }; + return { + ...el, + accessTokenTrustedIps: JSON.stringify(el.accessTokenTrustedIps), + encryptedKubernetesCaCertificate, + encryptedKubernetesTokenReviewerJwt + }; } ) ); diff --git a/backend/src/db/migrations/20241129180053_identity-oidc-auth-to-kms.ts b/backend/src/db/migrations/20241129180053_identity-oidc-auth-to-kms.ts index 4aed557d5..e4947b296 100644 --- a/backend/src/db/migrations/20241129180053_identity-oidc-auth-to-kms.ts +++ b/backend/src/db/migrations/20241129180053_identity-oidc-auth-to-kms.ts @@ -96,7 +96,11 @@ const reencryptIdentityOidcAuth = async (knex: Knex) => { plainText: Buffer.from(decryptedCertificate) }).cipherTextBlob; - return { ...el, encryptedCaCertificate }; + return { + ...el, + accessTokenTrustedIps: JSON.stringify(el.accessTokenTrustedIps), + encryptedCaCertificate + }; } ) ); diff --git a/backend/src/server/routes/v1/identity-oidc-auth-router.ts b/backend/src/server/routes/v1/identity-oidc-auth-router.ts index 799784e45..7ce0b05b7 100644 --- a/backend/src/server/routes/v1/identity-oidc-auth-router.ts +++ b/backend/src/server/routes/v1/identity-oidc-auth-router.ts @@ -12,7 +12,7 @@ import { validateOidcBoundClaimsField } from "@app/services/identity-oidc-auth/identity-oidc-auth-validators"; -const IdentityOidcAuthResponseSchema = IdentityOidcAuthsSchema.omit({ +const IdentityOidcAuthResponseSchema = IdentityOidcAuthsSchema.pick({ id: true, accessTokenTTL: true, accessTokenMaxTTL: true,