From 21bd4683078f9beb8830267d60e4b53b3198abfb Mon Sep 17 00:00:00 2001 From: = Date: Wed, 12 Jun 2024 23:04:10 +0530 Subject: [PATCH] feat: change field password to hashedPassword --- .../db/migrations/20240609133400_private-key-handoff.ts | 8 ++++---- backend/src/db/schemas/user-encryption-keys.ts | 2 +- backend/src/services/auth/auth-login-service.ts | 2 +- backend/src/services/auth/auth-password-service.ts | 2 +- backend/src/services/auth/auth-signup-service.ts | 4 ++-- backend/src/services/super-admin/super-admin-service.ts | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/src/db/migrations/20240609133400_private-key-handoff.ts b/backend/src/db/migrations/20240609133400_private-key-handoff.ts index 8c71eab80..9741c6029 100644 --- a/backend/src/db/migrations/20240609133400_private-key-handoff.ts +++ b/backend/src/db/migrations/20240609133400_private-key-handoff.ts @@ -3,7 +3,7 @@ import { Knex } from "knex"; import { TableName } from "../schemas"; export async function up(knex: Knex): Promise { - const doesPasswordFieldExist = await knex.schema.hasColumn(TableName.UserEncryptionKey, "password"); + const doesPasswordFieldExist = await knex.schema.hasColumn(TableName.UserEncryptionKey, "hashedPassword"); const doesPrivateKeyFieldExist = await knex.schema.hasColumn( TableName.UserEncryptionKey, "serverEncryptedPrivateKey" @@ -22,7 +22,7 @@ export async function up(knex: Knex): Promise { ); if (await knex.schema.hasTable(TableName.UserEncryptionKey)) { await knex.schema.alterTable(TableName.UserEncryptionKey, (t) => { - if (!doesPasswordFieldExist) t.string("password"); + if (!doesPasswordFieldExist) t.string("hashedPassword"); if (!doesPrivateKeyFieldExist) t.text("serverEncryptedPrivateKey"); if (!doesPrivateKeyIVFieldExist) t.text("serverEncryptedPrivateKeyIV"); if (!doesPrivateKeyTagFieldExist) t.text("serverEncryptedPrivateKeyTag"); @@ -32,7 +32,7 @@ export async function up(knex: Knex): Promise { } export async function down(knex: Knex): Promise { - const doesPasswordFieldExist = await knex.schema.hasColumn(TableName.UserEncryptionKey, "password"); + const doesPasswordFieldExist = await knex.schema.hasColumn(TableName.UserEncryptionKey, "hashedPassword"); const doesPrivateKeyFieldExist = await knex.schema.hasColumn( TableName.UserEncryptionKey, "serverEncryptedPrivateKey" @@ -51,7 +51,7 @@ export async function down(knex: Knex): Promise { ); if (await knex.schema.hasTable(TableName.UserEncryptionKey)) { await knex.schema.alterTable(TableName.UserEncryptionKey, (t) => { - if (doesPasswordFieldExist) t.dropColumn("password"); + if (doesPasswordFieldExist) t.dropColumn("hashedPassword"); if (doesPrivateKeyFieldExist) t.dropColumn("serverEncryptedPrivateKey"); if (doesPrivateKeyIVFieldExist) t.dropColumn("serverEncryptedPrivateKeyIV"); if (doesPrivateKeyTagFieldExist) t.dropColumn("serverEncryptedPrivateKeyTag"); diff --git a/backend/src/db/schemas/user-encryption-keys.ts b/backend/src/db/schemas/user-encryption-keys.ts index 6afab529d..fd9d21a9d 100644 --- a/backend/src/db/schemas/user-encryption-keys.ts +++ b/backend/src/db/schemas/user-encryption-keys.ts @@ -22,7 +22,7 @@ export const UserEncryptionKeysSchema = z.object({ salt: z.string(), verifier: z.string(), userId: z.string().uuid(), - password: z.string().nullable().optional(), + hashedPassword: z.string().nullable().optional(), serverEncryptedPrivateKey: z.string().nullable().optional(), serverEncryptedPrivateKeyIV: z.string().nullable().optional(), serverEncryptedPrivateKeyTag: z.string().nullable().optional(), diff --git a/backend/src/services/auth/auth-login-service.ts b/backend/src/services/auth/auth-login-service.ts index 27cec06ff..29a2a176f 100644 --- a/backend/src/services/auth/auth-login-service.ts +++ b/backend/src/services/auth/auth-login-service.ts @@ -264,7 +264,7 @@ export const authLoginServiceFactory = ({ await userDAL.updateUserEncryptionByUserId(userEnc.userId, { serverPrivateKey: null, clientPublicKey: null, - password: hashedPassword, + hashedPassword, serverEncryptedPrivateKey: ciphertext, serverEncryptedPrivateKeyIV: iv, serverEncryptedPrivateKeyTag: tag, diff --git a/backend/src/services/auth/auth-password-service.ts b/backend/src/services/auth/auth-password-service.ts index 8423e3708..0e6558966 100644 --- a/backend/src/services/auth/auth-password-service.ts +++ b/backend/src/services/auth/auth-password-service.ts @@ -92,7 +92,7 @@ export const authPaswordServiceFactory = ({ verifier, serverPrivateKey: null, clientPublicKey: null, - password: hashedPassword + hashedPassword }); if (tokenVersionId) { diff --git a/backend/src/services/auth/auth-signup-service.ts b/backend/src/services/auth/auth-signup-service.ts index a574c6050..8cf2c9d34 100644 --- a/backend/src/services/auth/auth-signup-service.ts +++ b/backend/src/services/auth/auth-signup-service.ts @@ -183,7 +183,7 @@ export const authSignupServiceFactory = ({ encryptedPrivateKey, iv: encryptedPrivateKeyIV, tag: encryptedPrivateKeyTag, - password: hashedPassword, + hashedPassword, serverEncryptedPrivateKeyEncoding: encoding, serverEncryptedPrivateKeyTag: tag, serverEncryptedPrivateKeyIV: iv, @@ -344,7 +344,7 @@ export const authSignupServiceFactory = ({ encryptedPrivateKey, iv: encryptedPrivateKeyIV, tag: encryptedPrivateKeyTag, - password: hashedPassword, + hashedPassword, serverEncryptedPrivateKeyEncoding: encoding, serverEncryptedPrivateKeyTag: tag, serverEncryptedPrivateKeyIV: iv, diff --git a/backend/src/services/super-admin/super-admin-service.ts b/backend/src/services/super-admin/super-admin-service.ts index 199f97bce..f1d931b20 100644 --- a/backend/src/services/super-admin/super-admin-service.ts +++ b/backend/src/services/super-admin/super-admin-service.ts @@ -136,7 +136,7 @@ export const superAdminServiceFactory = ({ tag: encryptedPrivateKeyTag, verifier, userId: newUser.id, - password: hashedPassword, + hashedPassword, serverEncryptedPrivateKey: ciphertext, serverEncryptedPrivateKeyIV: iv, serverEncryptedPrivateKeyTag: tag,