diff --git a/backend/e2e-test/routes/v1/identity.spec.ts b/backend/e2e-test/routes/v1/identity.spec.ts index f30ba7b1e..16ebb444e 100644 --- a/backend/e2e-test/routes/v1/identity.spec.ts +++ b/backend/e2e-test/routes/v1/identity.spec.ts @@ -68,8 +68,8 @@ describe("Identity token secret ops", async () => { method: "POST", url: "/api/v1/auth/universal-auth/login", body: { - clientSecret: seedData1.machineIdentity.clientCred.secret, - clientId: seedData1.machineIdentity.clientCred.id + clientSecret: seedData1.machineIdentity.clientCredentials.secret, + clientId: seedData1.machineIdentity.clientCredentials.id } }); expect(identityLogin.statusCode).toBe(200); diff --git a/backend/e2e-test/routes/v3/secrets.spec.ts b/backend/e2e-test/routes/v3/secrets.spec.ts index 89935d432..02d239825 100644 --- a/backend/e2e-test/routes/v3/secrets.spec.ts +++ b/backend/e2e-test/routes/v3/secrets.spec.ts @@ -31,7 +31,7 @@ describe("Secret V3 Router", async () => { authorization: `Bearer ${jwtAuthToken}` } }); - const projectKeyEnc = JSON.parse(projectKeyRes.payload); + const projectKeyEncryptionDetails = JSON.parse(projectKeyRes.payload); const userInfoRes = await testServer.inject({ method: "GET", @@ -43,9 +43,9 @@ describe("Secret V3 Router", async () => { const { user: userInfo } = JSON.parse(userInfoRes.payload); const privateKey = await getUserPrivateKey(seedData1.password, userInfo); projectKey = decryptAsymmetric({ - ciphertext: projectKeyEnc.encryptedKey, - nonce: projectKeyEnc.nonce, - publicKey: projectKeyEnc.sender.publicKey, + ciphertext: projectKeyEncryptionDetails.encryptedKey, + nonce: projectKeyEncryptionDetails.nonce, + publicKey: projectKeyEncryptionDetails.sender.publicKey, privateKey }); diff --git a/backend/src/db/seed-data.ts b/backend/src/db/seed-data.ts index 60038bdf8..8745d7f02 100644 --- a/backend/src/db/seed-data.ts +++ b/backend/src/db/seed-data.ts @@ -35,7 +35,7 @@ export const seedData1 = { machineIdentity: { id: "88fa7aed-9288-401e-a4c9-fa9430be62a0", name: "mac1", - clientCred: { + clientCredentials: { id: "3f6135db-f237-421d-af66-a8f4e80d443b", secret: "da35a5a5a7b57f977a9a73394506e878a7175d06606df43dc93e1472b10cf339" } diff --git a/backend/src/db/seeds/4-machine-identity.ts b/backend/src/db/seeds/4-machine-identity.ts index e51a81b3b..149fba40a 100644 --- a/backend/src/db/seeds/4-machine-identity.ts +++ b/backend/src/db/seeds/4-machine-identity.ts @@ -23,7 +23,7 @@ export async function seed(knex: Knex): Promise { .insert([ { identityId: seedData1.machineIdentity.id, - clientId: seedData1.machineIdentity.clientCred.id, + clientId: seedData1.machineIdentity.clientCredentials.id, clientSecretTrustedIps: JSON.stringify([ { type: "ipv4", @@ -54,7 +54,7 @@ export async function seed(knex: Knex): Promise { } ]) .returning("*"); - const clientSecretHash = await bcrypt.hash(seedData1.machineIdentity.clientCred.secret, 10); + const clientSecretHash = await bcrypt.hash(seedData1.machineIdentity.clientCredentials.secret, 10); await knex(TableName.IdentityUaClientSecret).insert([ { identityUAId: identityUa[0].id, @@ -62,7 +62,7 @@ export async function seed(knex: Knex): Promise { clientSecretTTL: 0, clientSecretNumUses: 0, clientSecretNumUsesLimit: 0, - clientSecretPrefix: seedData1.machineIdentity.clientCred.secret.slice(0, 4), + clientSecretPrefix: seedData1.machineIdentity.clientCredentials.secret.slice(0, 4), clientSecretHash, isClientSecretRevoked: false }