@cheqd/studio 3.6.8-develop.1 → 3.6.8-develop.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/controllers/admin/api-key.d.ts.map +1 -1
- package/dist/controllers/admin/api-key.js +9 -9
- package/dist/controllers/admin/api-key.js.map +1 -1
- package/dist/controllers/api/account.js +2 -2
- package/dist/controllers/api/account.js.map +1 -1
- package/dist/database/entities/api.key.entity.d.ts +2 -1
- package/dist/database/entities/api.key.entity.d.ts.map +1 -1
- package/dist/database/entities/api.key.entity.js +11 -2
- package/dist/database/entities/api.key.entity.js.map +1 -1
- package/dist/database/migrations/InsertFingerprintApiKeyTable.d.ts +6 -0
- package/dist/database/migrations/InsertFingerprintApiKeyTable.d.ts.map +1 -0
- package/dist/database/migrations/InsertFingerprintApiKeyTable.js +38 -0
- package/dist/database/migrations/InsertFingerprintApiKeyTable.js.map +1 -0
- package/dist/database/types/types.d.ts.map +1 -1
- package/dist/database/types/types.js +3 -0
- package/dist/database/types/types.js.map +1 -1
- package/dist/middleware/auth/user-info-fetcher/api-token.d.ts.map +1 -1
- package/dist/middleware/auth/user-info-fetcher/api-token.js +7 -4
- package/dist/middleware/auth/user-info-fetcher/api-token.js.map +1 -1
- package/dist/services/admin/api-key.d.ts +5 -4
- package/dist/services/admin/api-key.d.ts.map +1 -1
- package/dist/services/admin/api-key.js +41 -18
- package/dist/services/admin/api-key.js.map +1 -1
- package/dist/services/api/identifier.d.ts +3 -3
- package/dist/services/api/identifier.d.ts.map +1 -1
- package/dist/services/api/identifier.js +4 -4
- package/dist/services/api/identifier.js.map +1 -1
- package/dist/services/api/key.d.ts +3 -3
- package/dist/services/api/key.d.ts.map +1 -1
- package/dist/services/api/key.js +4 -4
- package/dist/services/api/key.js.map +1 -1
- package/dist/services/api/operation.d.ts +3 -3
- package/dist/services/api/operation.d.ts.map +1 -1
- package/dist/services/api/operation.js +5 -5
- package/dist/services/api/operation.js.map +1 -1
- package/dist/services/api/payment-account.d.ts +5 -5
- package/dist/services/api/payment-account.d.ts.map +1 -1
- package/dist/services/api/payment-account.js +4 -4
- package/dist/services/api/payment-account.js.map +1 -1
- package/dist/services/api/payment.d.ts +6 -6
- package/dist/services/api/payment.d.ts.map +1 -1
- package/dist/services/api/payment.js +5 -5
- package/dist/services/api/payment.js.map +1 -1
- package/dist/services/api/resource.d.ts +3 -3
- package/dist/services/api/resource.d.ts.map +1 -1
- package/dist/services/api/resource.js +4 -4
- package/dist/services/api/resource.js.map +1 -1
- package/dist/services/api/user.d.ts +3 -3
- package/dist/services/api/user.d.ts.map +1 -1
- package/dist/services/api/user.js +4 -4
- package/dist/services/api/user.js.map +1 -1
- package/dist/services/identity/abstract.d.ts +1 -1
- package/dist/services/identity/abstract.d.ts.map +1 -1
- package/dist/services/identity/index.d.ts +1 -1
- package/dist/services/identity/index.d.ts.map +1 -1
- package/dist/services/identity/postgres.d.ts +1 -1
- package/dist/services/identity/postgres.d.ts.map +1 -1
- package/dist/services/identity/postgres.js +7 -13
- package/dist/services/identity/postgres.js.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +4 -0
- package/dist/utils/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.d.ts","sourceRoot":"","sources":["../../../src/controllers/admin/api-key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA4BjD,qBAAa,gBAAgB;IAC5B,MAAM,CAAC,qBAAqB,yTAsB1B;IACF,MAAM,CAAC,qBAAqB,yTAwB1B;IACF,MAAM,CAAC,qBAAqB,yTAQ1B;IACF,MAAM,CAAC,mBAAmB,UAExB;IACF,MAAM,CAAC,kBAAkB,yTAAiF;IAE1G;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IAEU,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IAwCxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IAEU,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IAwCxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IAEU,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IA4BxD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IAEU,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IA6BtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IAEU,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"api-key.d.ts","sourceRoot":"","sources":["../../../src/controllers/admin/api-key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA4BjD,qBAAa,gBAAgB;IAC5B,MAAM,CAAC,qBAAqB,yTAsB1B;IACF,MAAM,CAAC,qBAAqB,yTAwB1B;IACF,MAAM,CAAC,qBAAqB,yTAQ1B;IACF,MAAM,CAAC,mBAAmB,UAExB;IACF,MAAM,CAAC,kBAAkB,yTAAiF;IAE1G;;;;;;;;;;;;;;;;;;;;;;;;;;OA0BG;IAEU,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IAwCxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IAEU,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IAwCxD;;;;;;;;;;;;;;;;;;;;;;;;;;;OA2BG;IAEU,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IA4BxD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IAEU,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;IA6BtD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8BG;IAEU,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ;CAkDrD"}
|
|
@@ -345,23 +345,23 @@ export class APIKeyController {
|
|
|
345
345
|
});
|
|
346
346
|
}
|
|
347
347
|
// Otherwise try to get the latest not revoked API key
|
|
348
|
-
const
|
|
348
|
+
const key = await APIKeyService.instance.findOne({
|
|
349
349
|
customer: response.locals.customer,
|
|
350
350
|
revoked: false,
|
|
351
|
-
}, {
|
|
351
|
+
}, undefined, options, {
|
|
352
352
|
createdAt: 'DESC',
|
|
353
|
-
}
|
|
354
|
-
if (
|
|
353
|
+
});
|
|
354
|
+
if (!key) {
|
|
355
355
|
return response.status(StatusCodes.NOT_FOUND).json({
|
|
356
356
|
error: 'API key not found',
|
|
357
357
|
});
|
|
358
358
|
}
|
|
359
359
|
return response.status(StatusCodes.OK).json({
|
|
360
|
-
apiKey:
|
|
361
|
-
name:
|
|
362
|
-
createdAt:
|
|
363
|
-
expiresAt:
|
|
364
|
-
revoked:
|
|
360
|
+
apiKey: key.apiKey,
|
|
361
|
+
name: key.name,
|
|
362
|
+
createdAt: key.createdAt.toISOString(),
|
|
363
|
+
expiresAt: key.expiresAt.toISOString(),
|
|
364
|
+
revoked: key.revoked,
|
|
365
365
|
});
|
|
366
366
|
}
|
|
367
367
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.js","sourceRoot":"","sources":["../../../src/controllers/admin/api-key.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api-key.js","sourceRoot":"","sources":["../../../src/controllers/admin/api-key.ts"],"names":[],"mappings":"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"}
|
|
@@ -177,7 +177,7 @@ export class AccountController {
|
|
|
177
177
|
// 2. Check if such row exists in the DB
|
|
178
178
|
// eslint-disable-next-line prefer-const
|
|
179
179
|
let [userEntity, [customerEntity], logtoHelperSetup] = await Promise.all([
|
|
180
|
-
UserService.instance.get(logToUserId),
|
|
180
|
+
UserService.instance.get(logToUserId, { customer: true }),
|
|
181
181
|
CustomerService.instance.find({ email: logToUserEmail }),
|
|
182
182
|
logToHelper.setup(),
|
|
183
183
|
]);
|
|
@@ -269,7 +269,7 @@ export class AccountController {
|
|
|
269
269
|
}
|
|
270
270
|
}
|
|
271
271
|
// 6. Check is paymentAccount exists for the customer
|
|
272
|
-
const accounts = await PaymentAccountService.instance.find({ customer: customerEntity },
|
|
272
|
+
const accounts = await PaymentAccountService.instance.find({ customer: customerEntity }, { key: true });
|
|
273
273
|
const mainnetAccountResponse = await AccountController.provisionCustomerAccount(CheqdNetwork.Mainnet, accounts, customerEntity);
|
|
274
274
|
if (!mainnetAccountResponse.success) {
|
|
275
275
|
return response.status(mainnetAccountResponse.status).json({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/controllers/api/account.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/controllers/api/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,10 @@ export declare class APIKeyEntity {
|
|
|
10
10
|
updatedAt: Date;
|
|
11
11
|
customer: CustomerEntity;
|
|
12
12
|
user: UserEntity;
|
|
13
|
+
fingerprint: string;
|
|
13
14
|
setCreatedAt(): void;
|
|
14
15
|
setUpdateAt(): void;
|
|
15
16
|
isExpired(): boolean;
|
|
16
|
-
constructor(apiKeyHash: string, apiKey: string, name: string, expiresAt: Date, customer: CustomerEntity, user: UserEntity, revoked
|
|
17
|
+
constructor(apiKeyHash: string, apiKey: string, name: string, expiresAt: Date, customer: CustomerEntity, user: UserEntity, revoked: boolean | undefined, fingerprint: string);
|
|
17
18
|
}
|
|
18
19
|
//# sourceMappingURL=api.key.entity.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.key.entity.d.ts","sourceRoot":"","sources":["../../../src/database/entities/api.key.entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,qBACa,YAAY;IAMxB,UAAU,EAAG,MAAM,CAAC;IAMpB,MAAM,EAAG,MAAM,CAAC;IAMhB,IAAI,EAAG,MAAM,CAAC;IAMd,OAAO,EAAG,OAAO,CAAC;IAMlB,SAAS,EAAG,IAAI,CAAC;IAMjB,SAAS,EAAG,IAAI,CAAC;IAMjB,SAAS,EAAG,IAAI,CAAC;IAIjB,QAAQ,EAAG,cAAc,CAAC;IAI1B,IAAI,EAAG,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"api.key.entity.d.ts","sourceRoot":"","sources":["../../../src/database/entities/api.key.entity.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,qBACa,YAAY;IAMxB,UAAU,EAAG,MAAM,CAAC;IAMpB,MAAM,EAAG,MAAM,CAAC;IAMhB,IAAI,EAAG,MAAM,CAAC;IAMd,OAAO,EAAG,OAAO,CAAC;IAMlB,SAAS,EAAG,IAAI,CAAC;IAMjB,SAAS,EAAG,IAAI,CAAC;IAMjB,SAAS,EAAG,IAAI,CAAC;IAIjB,QAAQ,EAAG,cAAc,CAAC;IAI1B,IAAI,EAAG,UAAU,CAAC;IAOlB,WAAW,EAAG,MAAM,CAAC;IAGrB,YAAY;IAKZ,WAAW;IAIJ,SAAS,IAAI,OAAO;gBAK1B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,IAAI,EACf,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,UAAU,EAChB,OAAO,qBAAQ,EACf,WAAW,EAAE,MAAM;CAWpB"}
|
|
@@ -4,7 +4,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
4
4
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
5
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
6
|
};
|
|
7
|
-
import { BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, ManyToOne } from 'typeorm';
|
|
7
|
+
import { BeforeInsert, BeforeUpdate, Column, Entity, Index, JoinColumn, ManyToOne } from 'typeorm';
|
|
8
8
|
import * as dotenv from 'dotenv';
|
|
9
9
|
import { CustomerEntity } from './customer.entity.js';
|
|
10
10
|
import { UserEntity } from './user.entity.js';
|
|
@@ -19,6 +19,7 @@ let APIKeyEntity = class APIKeyEntity {
|
|
|
19
19
|
updatedAt;
|
|
20
20
|
customer;
|
|
21
21
|
user;
|
|
22
|
+
fingerprint;
|
|
22
23
|
setCreatedAt() {
|
|
23
24
|
this.createdAt = new Date();
|
|
24
25
|
}
|
|
@@ -28,7 +29,7 @@ let APIKeyEntity = class APIKeyEntity {
|
|
|
28
29
|
isExpired() {
|
|
29
30
|
return this.expiresAt < new Date();
|
|
30
31
|
}
|
|
31
|
-
constructor(apiKeyHash, apiKey, name, expiresAt, customer, user, revoked = false) {
|
|
32
|
+
constructor(apiKeyHash, apiKey, name, expiresAt, customer, user, revoked = false, fingerprint) {
|
|
32
33
|
this.apiKeyHash = apiKeyHash;
|
|
33
34
|
this.apiKey = apiKey;
|
|
34
35
|
this.name = name;
|
|
@@ -36,6 +37,7 @@ let APIKeyEntity = class APIKeyEntity {
|
|
|
36
37
|
this.customer = customer;
|
|
37
38
|
this.user = user;
|
|
38
39
|
this.revoked = revoked;
|
|
40
|
+
this.fingerprint = fingerprint;
|
|
39
41
|
}
|
|
40
42
|
};
|
|
41
43
|
__decorate([
|
|
@@ -89,6 +91,13 @@ __decorate([
|
|
|
89
91
|
ManyToOne(() => UserEntity, (user) => user.logToId, { onDelete: 'CASCADE' }),
|
|
90
92
|
JoinColumn({ name: 'userId' })
|
|
91
93
|
], APIKeyEntity.prototype, "user", void 0);
|
|
94
|
+
__decorate([
|
|
95
|
+
Index({ unique: true }),
|
|
96
|
+
Column({
|
|
97
|
+
type: 'varchar',
|
|
98
|
+
nullable: false,
|
|
99
|
+
})
|
|
100
|
+
], APIKeyEntity.prototype, "fingerprint", void 0);
|
|
92
101
|
__decorate([
|
|
93
102
|
BeforeInsert()
|
|
94
103
|
], APIKeyEntity.prototype, "setCreatedAt", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.key.entity.js","sourceRoot":"","sources":["../../../src/database/entities/api.key.entity.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"api.key.entity.js","sourceRoot":"","sources":["../../../src/database/entities/api.key.entity.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { type MigrationInterface, type QueryRunner } from 'typeorm';
|
|
2
|
+
export declare class InsertFingerprintAPIKeyTable1746780465032 implements MigrationInterface {
|
|
3
|
+
up(queryRunner: QueryRunner): Promise<void>;
|
|
4
|
+
down(queryRunner: QueryRunner): Promise<void>;
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=InsertFingerprintApiKeyTable.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"InsertFingerprintApiKeyTable.d.ts","sourceRoot":"","sources":["../../../src/database/migrations/InsertFingerprintApiKeyTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,kBAAkB,EAAE,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAIjF,qBAAa,yCAA0C,YAAW,kBAAkB;IACtE,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA0C3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAI1D"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { TableColumn } from 'typeorm';
|
|
2
|
+
import { SecretBox } from '@veramo/kms-local';
|
|
3
|
+
import { createHash } from 'crypto';
|
|
4
|
+
export class InsertFingerprintAPIKeyTable1746780465032 {
|
|
5
|
+
async up(queryRunner) {
|
|
6
|
+
const tableName = 'apiKey';
|
|
7
|
+
const secretBox = new SecretBox(process.env.EXTERNAL_DB_ENCRYPTION_KEY);
|
|
8
|
+
// Step 1: Add the fingerprint column (nullable, no default)
|
|
9
|
+
await queryRunner.addColumn(tableName, new TableColumn({
|
|
10
|
+
name: 'fingerprint',
|
|
11
|
+
type: 'varchar',
|
|
12
|
+
isNullable: true,
|
|
13
|
+
}));
|
|
14
|
+
// Step 2: Add fingerprints for non-revoked keys
|
|
15
|
+
const records = await queryRunner.query(`SELECT "apiKey", "apiKeyHash" FROM "${tableName}"`);
|
|
16
|
+
for (const record of records) {
|
|
17
|
+
const decryptedKey = await secretBox.decrypt(record.apiKey);
|
|
18
|
+
const fingerprint = createHash('sha256').update(decryptedKey).digest('hex');
|
|
19
|
+
await queryRunner.query(`UPDATE "${tableName}" SET "fingerprint" = $1 WHERE "apiKeyHash" = $2`, [
|
|
20
|
+
fingerprint,
|
|
21
|
+
record.apiKeyHash,
|
|
22
|
+
]);
|
|
23
|
+
}
|
|
24
|
+
// Step 3: Make the fingerprint column non-nullable (to allow unique index)
|
|
25
|
+
await queryRunner.changeColumn(tableName, 'fingerprint', new TableColumn({
|
|
26
|
+
name: 'fingerprint',
|
|
27
|
+
type: 'varchar',
|
|
28
|
+
isNullable: false,
|
|
29
|
+
}));
|
|
30
|
+
// Step 4: Add a unique index on fingerprint
|
|
31
|
+
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_apiKey_c5fdf6760b38094e0905ac85e4" ON "${tableName}" ("fingerprint") `);
|
|
32
|
+
}
|
|
33
|
+
async down(queryRunner) {
|
|
34
|
+
await queryRunner.query(`DROP INDEX "IDX_apiKey_c5fdf6760b38094e0905ac85e4"`);
|
|
35
|
+
await queryRunner.dropColumn('apiKey', 'fingerprint');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=InsertFingerprintApiKeyTable.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"InsertFingerprintApiKeyTable.js","sourceRoot":"","sources":["../../../src/database/migrations/InsertFingerprintApiKeyTable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAA6C,MAAM,SAAS,CAAC;AACjF,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC,MAAM,OAAO,yCAAyC;IAC9C,KAAK,CAAC,EAAE,CAAC,WAAwB;QACvC,MAAM,SAAS,GAAG,QAAQ,CAAC;QAC3B,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QAExE,4DAA4D;QAC5D,MAAM,WAAW,CAAC,SAAS,CAC1B,SAAS,EACT,IAAI,WAAW,CAAC;YACf,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,IAAI;SAChB,CAAC,CACF,CAAC;QAEF,gDAAgD;QAChD,MAAM,OAAO,GAAU,MAAM,WAAW,CAAC,KAAK,CAAC,uCAAuC,SAAS,GAAG,CAAC,CAAC;QACpG,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC9B,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC5E,MAAM,WAAW,CAAC,KAAK,CAAC,WAAW,SAAS,kDAAkD,EAAE;gBAC/F,WAAW;gBACX,MAAM,CAAC,UAAU;aACjB,CAAC,CAAC;QACJ,CAAC;QAED,2EAA2E;QAC3E,MAAM,WAAW,CAAC,YAAY,CAC7B,SAAS,EACT,aAAa,EACb,IAAI,WAAW,CAAC;YACf,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;YACf,UAAU,EAAE,KAAK;SACjB,CAAC,CACF,CAAC;QAEF,4CAA4C;QAC5C,MAAM,WAAW,CAAC,KAAK,CACtB,mEAAmE,SAAS,oBAAoB,CAChG,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,WAAwB;QACzC,MAAM,WAAW,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;QAC9E,MAAM,WAAW,CAAC,UAAU,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACvD,CAAC;CACD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/database/types/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/database/types/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAgDrC,MAAM,WAAW,gBAAgB;IAChC,KAAK,IAAI,UAAU,CAAC;CACpB;AAED,qBAAa,MAAO,YAAW,gBAAgB;IAC9C,KAAK,IAAI,UAAU;CAWnB;AAED,qBAAa,QAAS,YAAW,gBAAgB;IAChD,KAAK,IAAI,UAAU;CA8EnB"}
|
|
@@ -38,6 +38,7 @@ import { AlterAPIKeyTable1695740346004 } from '../migrations/AlterAPIKeyTable.js
|
|
|
38
38
|
import { AlterCustomerTableAddEmail1695740346005 } from '../migrations/AlterCustomerTableAddEmail.js';
|
|
39
39
|
import { AlterCustomerTableUpdateEmail1695740346006 } from '../migrations/AlterCustomerTableUniqueEmail.js';
|
|
40
40
|
import { IndexPaymentAccountTable1746513196390 } from '../migrations/IndexPaymentAccountTable.js';
|
|
41
|
+
import { InsertFingerprintAPIKeyTable1746780465032 } from '../migrations/InsertFingerprintApiKeyTable.js';
|
|
41
42
|
dotenv.config();
|
|
42
43
|
const { EXTERNAL_DB_CONNECTION_URL, EXTERNAL_DB_CERT } = process.env;
|
|
43
44
|
export class Memory {
|
|
@@ -110,6 +111,8 @@ export class Postgres {
|
|
|
110
111
|
AlterCustomerTableUpdateEmail1695740346006,
|
|
111
112
|
// Add unique index in PaymentAccount table
|
|
112
113
|
IndexPaymentAccountTable1746513196390,
|
|
114
|
+
// Add fingerprint in APIKey table
|
|
115
|
+
InsertFingerprintAPIKeyTable1746780465032,
|
|
113
116
|
],
|
|
114
117
|
entities: [
|
|
115
118
|
...Entities,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/database/types/types.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,sBAAsB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE1D,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAE7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,iCAAiC,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,iCAAiC,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,sCAAsC,EAAE,MAAM,4CAA4C,CAAC;AACpG,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAChE,OAAO,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AACxF,OAAO,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AACxF,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,iCAAiC,EAAE,MAAM,uCAAuC,CAAC;AAC1F,OAAO,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,8BAA8B,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AACxF,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,2CAA2C,EAAE,MAAM,iDAAiD,CAAC;AAC9G,OAAO,EAAE,+BAA+B,EAAE,MAAM,qCAAqC,CAAC;AACtF,OAAO,EAAE,gCAAgC,EAAE,MAAM,iDAAiD,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,EAAE,oCAAoC,EAAE,MAAM,0CAA0C,CAAC;AAChG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,uCAAuC,EAAE,MAAM,6CAA6C,CAAC;AACtG,OAAO,EAAE,0CAA0C,EAAE,MAAM,gDAAgD,CAAC;AAC5G,OAAO,EAAE,qCAAqC,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/database/types/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-token.d.ts","sourceRoot":"","sources":["../../../../src/middleware/auth/user-info-fetcher/api-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"api-token.d.ts","sourceRoot":"","sources":["../../../../src/middleware/auth/user-info-fetcher/api-token.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,KAAK,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAO3D,qBAAa,uBAAwB,SAAQ,cAAe,YAAW,gBAAgB;IACtF,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,aAAa,CAAiB;gBAE1B,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc;IAMlD,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;IAIhF;;;;;OAKG;IACU,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,GAAG,SAAS,CAAC;CAsC3E"}
|
|
@@ -2,7 +2,6 @@ import { StatusCodes } from 'http-status-codes';
|
|
|
2
2
|
import { UserInfoHelper } from './base.js';
|
|
3
3
|
import * as dotenv from 'dotenv';
|
|
4
4
|
import { APIKeyService } from '../../../services/admin/api-key.js';
|
|
5
|
-
import { UserService } from '../../../services/api/user.js';
|
|
6
5
|
dotenv.config();
|
|
7
6
|
export class APITokenUserInfoFetcher extends UserInfoHelper {
|
|
8
7
|
token;
|
|
@@ -23,7 +22,10 @@ export class APITokenUserInfoFetcher extends UserInfoHelper {
|
|
|
23
22
|
*/
|
|
24
23
|
async verifyToken(response) {
|
|
25
24
|
try {
|
|
25
|
+
// fetches api, customer and user entity
|
|
26
26
|
const apiEntity = await APIKeyService.instance.get(this.token);
|
|
27
|
+
const userEntity = apiEntity.user;
|
|
28
|
+
const customerEntity = apiEntity.customer;
|
|
27
29
|
if (!apiEntity) {
|
|
28
30
|
return response.status(StatusCodes.UNAUTHORIZED).json({
|
|
29
31
|
error: `Unauthorized error: API Key not found.`,
|
|
@@ -34,8 +36,7 @@ export class APITokenUserInfoFetcher extends UserInfoHelper {
|
|
|
34
36
|
error: `Unauthorized error: API Key is revoked.`,
|
|
35
37
|
});
|
|
36
38
|
}
|
|
37
|
-
|
|
38
|
-
if (!userEntity) {
|
|
39
|
+
if (!userEntity || !customerEntity) {
|
|
39
40
|
return response.status(StatusCodes.UNAUTHORIZED).json({
|
|
40
41
|
error: `Unauthorized error: User not found.`,
|
|
41
42
|
});
|
|
@@ -48,7 +49,9 @@ export class APITokenUserInfoFetcher extends UserInfoHelper {
|
|
|
48
49
|
}
|
|
49
50
|
// Set global context
|
|
50
51
|
this.setScopes(_resp.data, response);
|
|
51
|
-
|
|
52
|
+
response.locals.user = userEntity;
|
|
53
|
+
response.locals.customer = customerEntity;
|
|
54
|
+
return;
|
|
52
55
|
}
|
|
53
56
|
catch (error) {
|
|
54
57
|
return response.status(StatusCodes.INTERNAL_SERVER_ERROR).json({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-token.js","sourceRoot":"","sources":["../../../../src/middleware/auth/user-info-fetcher/api-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAyB,MAAM,WAAW,CAAC;AAGlE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"api-token.js","sourceRoot":"","sources":["../../../../src/middleware/auth/user-info-fetcher/api-token.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAyB,MAAM,WAAW,CAAC;AAGlE,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,MAAM,CAAC,MAAM,EAAE,CAAC;AAEhB,MAAM,OAAO,uBAAwB,SAAQ,cAAc;IAC1D,KAAK,CAAS;IACN,aAAa,CAAiB;IAEtC,YAAY,KAAa,EAAE,aAA6B;QACvD,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,OAAgB,EAAE,QAAkB;QAC/C,OAAO,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IACnC,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,WAAW,CAAC,QAAkB;QAC1C,IAAI,CAAC;YACJ,wCAAwC;YACxC,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC/D,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;YAClC,MAAM,cAAc,GAAG,SAAS,CAAC,QAAQ,CAAC;YAC1C,IAAI,CAAC,SAAS,EAAE,CAAC;gBAChB,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;oBACrD,KAAK,EAAE,wCAAwC;iBACZ,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;gBACvB,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;oBACrD,KAAK,EAAE,yCAAyC;iBACb,CAAC,CAAC;YACvC,CAAC;YACD,IAAI,CAAC,UAAU,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpC,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;oBACrD,KAAK,EAAE,qCAAqC;iBACT,CAAC,CAAC;YACvC,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,OAAiB,CAAC,CAAC;YACnF,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;gBAC1B,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;oBACrD,KAAK,EAAE,qDAAqD,UAAU,CAAC,OAAO,EAAE;iBAC7C,CAAC,CAAC;YACvC,CAAC;YACD,qBAAqB;YACrB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACrC,QAAQ,CAAC,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC;YAClC,QAAQ,CAAC,MAAM,CAAC,QAAQ,GAAG,cAAc,CAAC;YAC1C,OAAO;QACR,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC;gBAC9D,KAAK,EAAE,8CAA8C,KAAK,EAAE;aACzB,CAAC,CAAC;QACvC,CAAC;IACF,CAAC;CACD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { Repository } from 'typeorm';
|
|
1
|
+
import type { FindOptionsOrder, FindOptionsRelations, FindOptionsWhere, Repository } from 'typeorm';
|
|
2
2
|
import type { CustomerEntity } from '../../database/entities/customer.entity.js';
|
|
3
|
-
import { APIKeyEntity } from '../../database/entities/api.key.entity.js';
|
|
4
3
|
import type { UserEntity } from '../../database/entities/user.entity.js';
|
|
5
4
|
import type { APIServiceOptions } from '../../types/admin.js';
|
|
5
|
+
import { APIKeyEntity } from '../../database/entities/api.key.entity.js';
|
|
6
6
|
export declare class APIKeyService {
|
|
7
7
|
apiKeyRepository: Repository<APIKeyEntity>;
|
|
8
8
|
private secretBox;
|
|
@@ -20,8 +20,9 @@ export declare class APIKeyService {
|
|
|
20
20
|
revoke(apiKey: string, options?: APIServiceOptions): Promise<APIKeyEntity>;
|
|
21
21
|
decryptAPIKey(apiKey: string): Promise<string>;
|
|
22
22
|
encryptAPIKey(apiKey: string): Promise<string>;
|
|
23
|
-
get(apiKey: string, options?: APIServiceOptions): Promise<APIKeyEntity
|
|
24
|
-
find(where:
|
|
23
|
+
get(apiKey: string, options?: APIServiceOptions): Promise<APIKeyEntity>;
|
|
24
|
+
find(where: FindOptionsWhere<APIKeyEntity>, relations?: FindOptionsRelations<APIKeyEntity>, options?: APIServiceOptions, order?: FindOptionsOrder<APIKeyEntity>): Promise<APIKeyEntity[]>;
|
|
25
|
+
findOne(where: FindOptionsWhere<APIKeyEntity>, relations?: FindOptionsRelations<APIKeyEntity>, options?: APIServiceOptions, order?: FindOptionsOrder<APIKeyEntity>): Promise<APIKeyEntity | null>;
|
|
25
26
|
static generateAPIKey(userId: string): string;
|
|
26
27
|
static getExpiryDateJWT(apiKey: string): Date;
|
|
27
28
|
static hashAPIKey(apiKey: string): Promise<string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.d.ts","sourceRoot":"","sources":["../../../src/services/admin/api-key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"api-key.d.ts","sourceRoot":"","sources":["../../../src/services/admin/api-key.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAM9D,OAAO,EAAE,YAAY,EAAE,MAAM,2CAA2C,CAAC;AAMzE,qBAAa,aAAa;IAClB,gBAAgB,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;IAClD,OAAO,CAAC,SAAS,CAAY;IAE7B,OAAc,QAAQ,gBAAuB;;IAUhC,MAAM,CAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,UAAU,EAChB,SAAS,CAAC,EAAE,IAAI,EAChB,OAAO,UAAQ,EACf,OAAO,CAAC,EAAE,iBAAiB,GACzB,OAAO,CAAC,YAAY,CAAC;IA8CX,MAAM,CAClB,IAAI,EAAE;QACL,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,SAAS,CAAC,EAAE,IAAI,CAAC;QACjB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,cAAc,CAAC;QAC1B,IAAI,CAAC,EAAE,UAAU,CAAC;KAClB,EACD,OAAO,CAAC,EAAE,iBAAiB;IAiCf,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IAUlD,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,aAAa,CAAC,MAAM,EAAE,MAAM;IAI5B,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB;IA4B/C,IAAI,CAChB,KAAK,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACrC,SAAS,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,EAC9C,OAAO,CAAC,EAAE,iBAAiB,EAC3B,KAAK,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC;IAoB1B,OAAO,CACnB,KAAK,EAAE,gBAAgB,CAAC,YAAY,CAAC,EACrC,SAAS,CAAC,EAAE,oBAAoB,CAAC,YAAY,CAAC,EAC9C,OAAO,CAAC,EAAE,iBAAiB,EAC3B,KAAK,CAAC,EAAE,gBAAgB,CAAC,YAAY,CAAC;WAgBzB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;WAOtC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;WAKhC,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WAI3C,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAGjF"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { decodeJWT } from 'did-jwt';
|
|
2
2
|
import bcrypt from 'bcrypt';
|
|
3
3
|
import { randomBytes, createHmac } from 'crypto';
|
|
4
|
+
import { SecretBox } from '@veramo/kms-local';
|
|
4
5
|
import { Connection } from '../../database/connection/connection.js';
|
|
5
|
-
import * as dotenv from 'dotenv';
|
|
6
6
|
import { APIKeyEntity } from '../../database/entities/api.key.entity.js';
|
|
7
|
-
import { SecretBox } from '@veramo/kms-local';
|
|
8
7
|
import { API_SECRET_KEY_LENGTH, API_KEY_PREFIX, API_KEY_EXPIRATION } from '../../types/constants.js';
|
|
8
|
+
import { sha256 } from '../../utils/index.js';
|
|
9
|
+
import * as dotenv from 'dotenv';
|
|
9
10
|
dotenv.config();
|
|
10
11
|
export class APIKeyService {
|
|
11
12
|
apiKeyRepository;
|
|
@@ -18,11 +19,14 @@ export class APIKeyService {
|
|
|
18
19
|
// ToDo: Maybe we also need to store not the API key but the hash of it?
|
|
19
20
|
// But in that case the API key will be shown once and then it will be lost.
|
|
20
21
|
async create(apiKey, name, user, expiresAt, revoked = false, options) {
|
|
21
|
-
const apiKeyHash = await APIKeyService.hashAPIKey(apiKey);
|
|
22
22
|
const { decryptionNeeded } = options || {};
|
|
23
23
|
if (!apiKey) {
|
|
24
24
|
throw new Error('API key is not specified');
|
|
25
25
|
}
|
|
26
|
+
// fingerprint
|
|
27
|
+
const fingerprint = sha256(apiKey);
|
|
28
|
+
// slow - hash
|
|
29
|
+
const apiKeyHash = await APIKeyService.hashAPIKey(apiKey);
|
|
26
30
|
if (!name) {
|
|
27
31
|
throw new Error('API key name is not specified');
|
|
28
32
|
}
|
|
@@ -33,9 +37,10 @@ export class APIKeyService {
|
|
|
33
37
|
expiresAt = new Date();
|
|
34
38
|
expiresAt.setMonth(expiresAt.getDay() + API_KEY_EXPIRATION);
|
|
35
39
|
}
|
|
40
|
+
// encrypt the key
|
|
36
41
|
const encryptedAPIKey = await this.encryptAPIKey(apiKey);
|
|
37
42
|
// Create entity
|
|
38
|
-
const apiKeyEntity = new APIKeyEntity(apiKeyHash, encryptedAPIKey, name, expiresAt, user.customer, user, revoked);
|
|
43
|
+
const apiKeyEntity = new APIKeyEntity(apiKeyHash, encryptedAPIKey, name, expiresAt, user.customer, user, revoked, fingerprint);
|
|
39
44
|
const apiKeyRecord = (await this.apiKeyRepository.insert(apiKeyEntity)).identifiers[0];
|
|
40
45
|
if (!apiKeyRecord)
|
|
41
46
|
throw new Error(`Cannot create a new API key`);
|
|
@@ -85,25 +90,32 @@ export class APIKeyService {
|
|
|
85
90
|
return await this.secretBox.encrypt(apiKey);
|
|
86
91
|
}
|
|
87
92
|
async get(apiKey, options) {
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
}
|
|
93
|
+
// fingerprint
|
|
94
|
+
const fingerprint = sha256(apiKey);
|
|
95
|
+
// fetch the api key entity
|
|
96
|
+
const apiKeyEntity = await APIKeyService.instance.findOne({
|
|
97
|
+
fingerprint,
|
|
98
|
+
}, { customer: true, user: true }, options);
|
|
99
|
+
if (!apiKeyEntity) {
|
|
100
|
+
throw new Error('Invalid API key');
|
|
97
101
|
}
|
|
98
|
-
|
|
102
|
+
// validate expiry
|
|
103
|
+
if (apiKeyEntity.revoked) {
|
|
104
|
+
throw new Error('API Key is expired');
|
|
105
|
+
}
|
|
106
|
+
// bcrypt comparison
|
|
107
|
+
const isValid = await APIKeyService.compareAPIKey(apiKey, apiKeyEntity.apiKeyHash);
|
|
108
|
+
if (!isValid)
|
|
109
|
+
throw new Error('Invalid API key');
|
|
110
|
+
return apiKeyEntity;
|
|
99
111
|
}
|
|
100
|
-
async find(where,
|
|
112
|
+
async find(where, relations, options, order) {
|
|
101
113
|
try {
|
|
102
114
|
const { decryptionNeeded } = options || {};
|
|
103
115
|
const apiKeyList = await this.apiKeyRepository.find({
|
|
104
|
-
where
|
|
105
|
-
relations
|
|
106
|
-
order
|
|
116
|
+
where,
|
|
117
|
+
relations,
|
|
118
|
+
order,
|
|
107
119
|
});
|
|
108
120
|
if (decryptionNeeded) {
|
|
109
121
|
for (const apiKey of apiKeyList) {
|
|
@@ -116,6 +128,17 @@ export class APIKeyService {
|
|
|
116
128
|
return [];
|
|
117
129
|
}
|
|
118
130
|
}
|
|
131
|
+
async findOne(where, relations, options, order) {
|
|
132
|
+
const apiKeyEntity = await this.apiKeyRepository.findOne({
|
|
133
|
+
where,
|
|
134
|
+
relations,
|
|
135
|
+
order,
|
|
136
|
+
});
|
|
137
|
+
if (apiKeyEntity && options?.decryptionNeeded) {
|
|
138
|
+
apiKeyEntity.apiKey = await this.decryptAPIKey(apiKeyEntity.apiKey);
|
|
139
|
+
}
|
|
140
|
+
return apiKeyEntity;
|
|
141
|
+
}
|
|
119
142
|
// Utils
|
|
120
143
|
static generateAPIKey(userId) {
|
|
121
144
|
const apiKey = createHmac('sha512', randomBytes(API_SECRET_KEY_LENGTH).toString('hex'))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-key.js","sourceRoot":"","sources":["../../../src/services/admin/api-key.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api-key.js","sourceRoot":"","sources":["../../../src/services/admin/api-key.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Repository } from 'typeorm';
|
|
1
|
+
import type { FindOptionsRelations, Repository } from 'typeorm';
|
|
2
2
|
import { IdentifierEntity } from '../../database/entities/identifier.entity.js';
|
|
3
3
|
import type { CustomerEntity } from '../../database/entities/customer.entity.js';
|
|
4
4
|
export declare class IdentifierService {
|
|
@@ -6,7 +6,7 @@ export declare class IdentifierService {
|
|
|
6
6
|
static instance: IdentifierService;
|
|
7
7
|
constructor();
|
|
8
8
|
update(did: string, customer: CustomerEntity): Promise<IdentifierEntity>;
|
|
9
|
-
get(did?: string): Promise<IdentifierEntity | null>;
|
|
10
|
-
find(where: Record<string, unknown>): Promise<IdentifierEntity[]>;
|
|
9
|
+
get(did?: string, relations?: FindOptionsRelations<IdentifierEntity>): Promise<IdentifierEntity | null>;
|
|
10
|
+
find(where: Record<string, unknown>, relations?: FindOptionsRelations<IdentifierEntity>): Promise<IdentifierEntity[]>;
|
|
11
11
|
}
|
|
12
12
|
//# sourceMappingURL=identifier.d.ts.map
|