Skip to content

Commit 9fd1a21

Browse files
committed
don't include password hash in api responses
1 parent aaeb9dd commit 9fd1a21

3 files changed

Lines changed: 12 additions & 28 deletions

File tree

‎packages/db-service/src/modules/auth/auth.controller.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ export class ApiKeyDbController
5757
projectName: request.projectName ?? null,
5858
});
5959
return {
60-
...created,
60+
id: created.id,
61+
email: created.email,
62+
name: created.name,
6163
userType: mapPrismaRoleToRPC(created.userType),
6264
projectName: created.projectName ?? undefined,
6365
createdAt: created.createdAt.toISOString(),
@@ -71,7 +73,9 @@ export class ApiKeyDbController
7173
const requests = await this.apiKeyService.getAllAccountRequests();
7274
return {
7375
requests: requests.map((req) => ({
74-
...req,
76+
id: req.id,
77+
email: req.email,
78+
name: req.name,
7579
userType: mapPrismaRoleToRPC(req.userType),
7680
projectName: req.projectName ?? undefined,
7781
createdAt: req.createdAt.toISOString(),
@@ -84,7 +88,9 @@ export class ApiKeyDbController
8488
): Promise<UserProto.NewAccountRequest> {
8589
const removed = await this.apiKeyService.deleteAccountRequest(request.id);
8690
return {
87-
...removed,
91+
id: removed.id,
92+
email: removed.email,
93+
name: removed.name,
8894
userType: mapPrismaRoleToRPC(removed.userType),
8995
projectName: removed.projectName ?? undefined,
9096
createdAt: removed.createdAt.toISOString(),

‎packages/db-service/test/auth.e2e-spec.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -196,27 +196,6 @@ describe('DB Service Account Request Tests', () => {
196196
expect(resp['createdAt']).toBeDefined();
197197
});
198198

199-
it('hashes the password when creating a request', async () => {
200-
const rawPassword = 'plaintext-password';
201-
const resp: any = await new Promise((resolve) => {
202-
accountRequestClient.createAccountRequest(
203-
{
204-
email: 'hashcheck@test.com',
205-
name: 'Hash Check',
206-
password: rawPassword,
207-
userType: 'USER',
208-
},
209-
(err, resp) => {
210-
expect(err).toBeNull();
211-
resolve(resp);
212-
},
213-
);
214-
});
215-
216-
expect(resp['password']).toBeDefined();
217-
expect(resp['password']).not.toBe(rawPassword);
218-
});
219-
220199
it('gets all account requests', async () => {
221200
await new Promise((resolve) => {
222201
accountRequestClient.createAccountRequest(

‎packages/proto/definitions/user.proto‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,9 @@ message NewAccountRequest {
8585
int32 id = 1;
8686
string email = 2;
8787
string name = 3;
88-
string password = 4;
89-
common.UserType userType = 5;
90-
optional string projectName = 6;
91-
string createdAt = 7;
88+
common.UserType userType = 4;
89+
optional string projectName = 5;
90+
string createdAt = 6;
9291
}
9392

9493
message NewAccountRequests {

0 commit comments

Comments
 (0)