@openforis/arena-server 2.8.6 → 2.8.7
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/db/dbMigrator/migration/public/migrations/20261029203749-add-column-user-2fa-device-last-used-time-step.d.ts +6 -0
- package/dist/db/dbMigrator/migration/public/migrations/20261029203749-add-column-user-2fa-device-last-used-time-step.js +43 -0
- package/dist/db/dbMigrator/migration/public/migrations/20261029203749-add-column-user-2fa-device-last-used-time-step.js.map +1 -0
- package/dist/db/dbMigrator/migration/public/migrations/sqls/20261029203749-add-column-user-2fa-device-last-used-time-step-down.sql +2 -0
- package/dist/db/dbMigrator/migration/public/migrations/sqls/20261029203749-add-column-user-2fa-device-last-used-time-step-up.sql +2 -0
- package/dist/db/table/schemaPublic/user2FADevice.d.ts +1 -0
- package/dist/db/table/schemaPublic/user2FADevice.js +2 -0
- package/dist/db/table/schemaPublic/user2FADevice.js.map +1 -1
- package/dist/model/user2FADevice/user2FADevice.d.ts +2 -1
- package/dist/repository/user2FADevice/consume.d.ts +10 -0
- package/dist/repository/user2FADevice/consume.js +31 -0
- package/dist/repository/user2FADevice/consume.js.map +1 -0
- package/dist/repository/user2FADevice/index.d.ts +3 -0
- package/dist/repository/user2FADevice/index.js +3 -0
- package/dist/repository/user2FADevice/index.js.map +1 -1
- package/dist/service/user2FA/user2FAService.js +12 -8
- package/dist/service/user2FA/user2FAService.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
var dbm;
|
|
3
|
+
var type;
|
|
4
|
+
var seed;
|
|
5
|
+
var fs = require('fs');
|
|
6
|
+
var path = require('path');
|
|
7
|
+
var Promise;
|
|
8
|
+
exports.setup = function (options, seedLink) {
|
|
9
|
+
dbm = options.dbmigrate;
|
|
10
|
+
type = dbm.dataType;
|
|
11
|
+
seed = seedLink;
|
|
12
|
+
Promise = options.Promise;
|
|
13
|
+
};
|
|
14
|
+
exports.up = function (db) {
|
|
15
|
+
var filePath = path.join(__dirname, 'sqls', '20261029203749-add-column-user-2fa-device-last-used-time-step-up.sql');
|
|
16
|
+
return new Promise(function (resolve, reject) {
|
|
17
|
+
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
|
|
18
|
+
if (err)
|
|
19
|
+
return reject(err);
|
|
20
|
+
console.log('received data: ' + data);
|
|
21
|
+
resolve(data);
|
|
22
|
+
});
|
|
23
|
+
}).then(function (data) {
|
|
24
|
+
return db.runSql(data);
|
|
25
|
+
});
|
|
26
|
+
};
|
|
27
|
+
exports.down = function (db) {
|
|
28
|
+
var filePath = path.join(__dirname, 'sqls', '20261029203749-add-column-user-2fa-device-last-used-time-step-down.sql');
|
|
29
|
+
return new Promise(function (resolve, reject) {
|
|
30
|
+
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
|
|
31
|
+
if (err)
|
|
32
|
+
return reject(err);
|
|
33
|
+
console.log('received data: ' + data);
|
|
34
|
+
resolve(data);
|
|
35
|
+
});
|
|
36
|
+
}).then(function (data) {
|
|
37
|
+
return db.runSql(data);
|
|
38
|
+
});
|
|
39
|
+
};
|
|
40
|
+
exports._meta = {
|
|
41
|
+
version: 1,
|
|
42
|
+
};
|
|
43
|
+
//# sourceMappingURL=20261029203749-add-column-user-2fa-device-last-used-time-step.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261029203749-add-column-user-2fa-device-last-used-time-step.js","sourceRoot":"","sources":["../../../../../../src/db/dbMigrator/migration/public/migrations/20261029203749-add-column-user-2fa-device-last-used-time-step.js"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,IAAI,GAAG,CAAA;AACP,IAAI,IAAI,CAAA;AACR,IAAI,IAAI,CAAA;AACR,IAAI,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;AACtB,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC1B,IAAI,OAAO,CAAA;AAMX,OAAO,CAAC,KAAK,GAAG,UAAU,OAAO,EAAE,QAAQ;IACzC,GAAG,GAAG,OAAO,CAAC,SAAS,CAAA;IACvB,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAA;IACnB,IAAI,GAAG,QAAQ,CAAA;IACf,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;AAC3B,CAAC,CAAA;AAED,OAAO,CAAC,EAAE,GAAG,UAAU,EAAE;IACvB,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,sEAAsE,CAAC,CAAA;IACnH,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC1C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,GAAG,EAAE,IAAI;YAC9D,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;YAErC,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE;IACzB,IAAI,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,wEAAwE,CAAC,CAAA;IACrH,OAAO,IAAI,OAAO,CAAC,UAAU,OAAO,EAAE,MAAM;QAC1C,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,UAAU,GAAG,EAAE,IAAI;YAC9D,IAAI,GAAG;gBAAE,OAAO,MAAM,CAAC,GAAG,CAAC,CAAA;YAC3B,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;YAErC,OAAO,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI;QACpB,OAAO,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACxB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAA;AAED,OAAO,CAAC,KAAK,GAAG;IACd,OAAO,EAAE,CAAC;CACX,CAAA"}
|
|
@@ -7,6 +7,7 @@ export declare class TableUser2FADevice extends TableSchemaPublic {
|
|
|
7
7
|
readonly secret: Column;
|
|
8
8
|
readonly enabled: Column;
|
|
9
9
|
readonly backupCodes: Column;
|
|
10
|
+
readonly lastUsedTimeStep: Column;
|
|
10
11
|
readonly dateCreated: Column;
|
|
11
12
|
readonly dateModified: Column;
|
|
12
13
|
constructor();
|
|
@@ -10,6 +10,7 @@ class TableUser2FADevice extends tableSchemaPublic_1.TableSchemaPublic {
|
|
|
10
10
|
secret = new column_1.Column(this, 'secret', column_1.ColumnType.varchar);
|
|
11
11
|
enabled = new column_1.Column(this, 'enabled', column_1.ColumnType.boolean);
|
|
12
12
|
backupCodes = new column_1.Column(this, 'backup_codes', column_1.ColumnType.jsonb);
|
|
13
|
+
lastUsedTimeStep = new column_1.Column(this, 'last_used_time_step', column_1.ColumnType.integer);
|
|
13
14
|
dateCreated = new column_1.Column(this, 'date_created', column_1.ColumnType.timeStamp);
|
|
14
15
|
dateModified = new column_1.Column(this, 'date_modified', column_1.ColumnType.timeStamp);
|
|
15
16
|
constructor() {
|
|
@@ -23,6 +24,7 @@ class TableUser2FADevice extends tableSchemaPublic_1.TableSchemaPublic {
|
|
|
23
24
|
this.secret,
|
|
24
25
|
this.enabled,
|
|
25
26
|
this.backupCodes,
|
|
27
|
+
this.lastUsedTimeStep,
|
|
26
28
|
this.dateCreated,
|
|
27
29
|
this.dateModified,
|
|
28
30
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user2FADevice.js","sourceRoot":"","sources":["../../../../src/db/table/schemaPublic/user2FADevice.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,2DAAuD;AAEvD,wBAAgC,SAAQ,qCAAiB;IAC9C,IAAI,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAU,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,WAAW,EAAE,mBAAU,CAAC,IAAI,CAAC,CAAA;IACjE,UAAU,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,aAAa,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IACxE,MAAM,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IAC/D,OAAO,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,SAAS,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IACjE,WAAW,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,cAAc,EAAE,mBAAU,CAAC,KAAK,CAAC,CAAA;IACxE,WAAW,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,cAAc,EAAE,mBAAU,CAAC,SAAS,CAAC,CAAA;IAC5E,YAAY,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,eAAe,EAAE,mBAAU,CAAC,SAAS,CAAC,CAAA;IAEvF;QACE,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAC1B,CAAC;IAED,IAAI,OAAO;QACT,OAAO;YACL,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,YAAY;SAClB,CAAA;IACH,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"user2FADevice.js","sourceRoot":"","sources":["../../../../src/db/table/schemaPublic/user2FADevice.ts"],"names":[],"mappings":";;;AAAA,yCAAiD;AACjD,2DAAuD;AAEvD,wBAAgC,SAAQ,qCAAiB;IAC9C,IAAI,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,MAAM,EAAE,mBAAU,CAAC,IAAI,CAAC,CAAA;IACxD,QAAQ,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,WAAW,EAAE,mBAAU,CAAC,IAAI,CAAC,CAAA;IACjE,UAAU,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,aAAa,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IACxE,MAAM,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IAC/D,OAAO,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,SAAS,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IACjE,WAAW,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,cAAc,EAAE,mBAAU,CAAC,KAAK,CAAC,CAAA;IACxE,gBAAgB,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,qBAAqB,EAAE,mBAAU,CAAC,OAAO,CAAC,CAAA;IACtF,WAAW,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,cAAc,EAAE,mBAAU,CAAC,SAAS,CAAC,CAAA;IAC5E,YAAY,GAAW,IAAI,eAAM,CAAC,IAAI,EAAE,eAAe,EAAE,mBAAU,CAAC,SAAS,CAAC,CAAA;IAEvF;QACE,KAAK,CAAC,iBAAiB,CAAC,CAAA;IAC1B,CAAC;IAED,IAAI,OAAO;QACT,OAAO;YACL,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,UAAU;YACf,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,OAAO;YACZ,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,gBAAgB;YACrB,IAAI,CAAC,WAAW;YAChB,IAAI,CAAC,YAAY;SAClB,CAAA;IACH,CAAC;CACF"}
|
|
@@ -5,10 +5,11 @@ export type User2FADevice = {
|
|
|
5
5
|
secret: string;
|
|
6
6
|
enabled: boolean;
|
|
7
7
|
backupCodes: string[];
|
|
8
|
+
lastUsedTimeStep?: number | null;
|
|
8
9
|
dateCreated: Date;
|
|
9
10
|
dateModified: Date;
|
|
10
11
|
};
|
|
11
|
-
export type User2FADeviceForClient = Omit<User2FADevice, 'secret' | 'backupCodes'>;
|
|
12
|
+
export type User2FADeviceForClient = Omit<User2FADevice, 'secret' | 'backupCodes' | 'lastUsedTimeStep'>;
|
|
12
13
|
export type User2FADeviceForClientFirstTimeSetup = User2FADeviceForClient & {
|
|
13
14
|
backupCodes: string[];
|
|
14
15
|
otpAuthUrl: string;
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { BaseProtocol } from '../../db';
|
|
2
|
+
export declare const markTimeStepUsed: (params: {
|
|
3
|
+
uuid: string;
|
|
4
|
+
timeStep: number;
|
|
5
|
+
}, client?: BaseProtocol) => Promise<boolean>;
|
|
6
|
+
export declare const replaceBackupCodes: (params: {
|
|
7
|
+
uuid: string;
|
|
8
|
+
expectedBackupCodes: string[];
|
|
9
|
+
backupCodes: string[];
|
|
10
|
+
}, client?: BaseProtocol) => Promise<boolean>;
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.replaceBackupCodes = exports.markTimeStepUsed = void 0;
|
|
4
|
+
const db_1 = require("../../db");
|
|
5
|
+
const markTimeStepUsed = async (params, client = db_1.DB) => {
|
|
6
|
+
const { uuid, timeStep } = params;
|
|
7
|
+
const table = new db_1.TableUser2FADevice();
|
|
8
|
+
const lastUsedTimeStep = table.lastUsedTimeStep.columnName;
|
|
9
|
+
const result = await client.result(`UPDATE ${table.nameQualified}
|
|
10
|
+
SET ${lastUsedTimeStep} = $/timeStep/, ${table.dateModified.columnName} = $/now/
|
|
11
|
+
WHERE ${table.uuid.columnName} = $/uuid/
|
|
12
|
+
AND (${lastUsedTimeStep} IS NULL OR ${lastUsedTimeStep} < $/timeStep/)`, { uuid, timeStep, now: new Date() });
|
|
13
|
+
return result.rowCount === 1;
|
|
14
|
+
};
|
|
15
|
+
exports.markTimeStepUsed = markTimeStepUsed;
|
|
16
|
+
const replaceBackupCodes = async (params, client = db_1.DB) => {
|
|
17
|
+
const { uuid, expectedBackupCodes, backupCodes } = params;
|
|
18
|
+
const table = new db_1.TableUser2FADevice();
|
|
19
|
+
const backupCodesColumn = table.backupCodes.columnName;
|
|
20
|
+
const result = await client.result(`UPDATE ${table.nameQualified}
|
|
21
|
+
SET ${backupCodesColumn} = $/backupCodes/::jsonb, ${table.dateModified.columnName} = $/now/
|
|
22
|
+
WHERE ${table.uuid.columnName} = $/uuid/ AND ${backupCodesColumn} = $/expectedBackupCodes/::jsonb`, {
|
|
23
|
+
uuid,
|
|
24
|
+
backupCodes: JSON.stringify(backupCodes),
|
|
25
|
+
expectedBackupCodes: JSON.stringify(expectedBackupCodes),
|
|
26
|
+
now: new Date(),
|
|
27
|
+
});
|
|
28
|
+
return result.rowCount === 1;
|
|
29
|
+
};
|
|
30
|
+
exports.replaceBackupCodes = replaceBackupCodes;
|
|
31
|
+
//# sourceMappingURL=consume.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"consume.js","sourceRoot":"","sources":["../../../src/repository/user2FADevice/consume.ts"],"names":[],"mappings":";;;AAAA,iCAA+D;AAUxD,MAAM,gBAAgB,GAAG,KAAK,EACnC,MAA0C,EAC1C,MAAM,GAAiB,OAAE,EACP,EAAE;IACpB,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAA;IACjC,MAAM,KAAK,GAAG,IAAI,uBAAkB,EAAE,CAAA;IACtC,MAAM,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAC,UAAU,CAAA;IAE1D,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAChC,UAAU,KAAK,CAAC,aAAa;WACtB,gBAAgB,mBAAmB,KAAK,CAAC,YAAY,CAAC,UAAU;aAC9D,KAAK,CAAC,IAAI,CAAC,UAAU;cACpB,gBAAgB,eAAe,gBAAgB,iBAAiB,EAC1E,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,IAAI,EAAE,EAAE,CACpC,CAAA;IACD,OAAO,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAA;AAC9B,CAAC,CAAA;AAhBY,QAAA,gBAAgB,GAAhB,gBAAgB,CAgB5B;AAUM,MAAM,kBAAkB,GAAG,KAAK,EACrC,MAA8E,EAC9E,MAAM,GAAiB,OAAE,EACP,EAAE;IACpB,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,WAAW,EAAE,GAAG,MAAM,CAAA;IACzD,MAAM,KAAK,GAAG,IAAI,uBAAkB,EAAE,CAAA;IACtC,MAAM,iBAAiB,GAAG,KAAK,CAAC,WAAW,CAAC,UAAU,CAAA;IAEtD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAChC,UAAU,KAAK,CAAC,aAAa;WACtB,iBAAiB,6BAA6B,KAAK,CAAC,YAAY,CAAC,UAAU;aACzE,KAAK,CAAC,IAAI,CAAC,UAAU,kBAAkB,iBAAiB,kCAAkC,EACnG;QACE,IAAI;QACJ,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;QACxC,mBAAmB,EAAE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC;QACxD,GAAG,EAAE,IAAI,IAAI,EAAE;KAChB,CACF,CAAA;IACD,OAAO,MAAM,CAAC,QAAQ,KAAK,CAAC,CAAA;AAC9B,CAAC,CAAA;AApBY,QAAA,kBAAkB,GAAlB,kBAAkB,CAoB9B"}
|
|
@@ -2,6 +2,7 @@ import { deleteByDeviceUuid, deleteByUserUuid } from './delete';
|
|
|
2
2
|
import { getByDeviceUuid } from './getByDeviceUuid';
|
|
3
3
|
import { getByUserUuid, getEnabledByUserUuid } from './getByUserUuid';
|
|
4
4
|
import { countByUserUuid } from './countByUserUuid';
|
|
5
|
+
import { markTimeStepUsed, replaceBackupCodes } from './consume';
|
|
5
6
|
import { insert } from './insert';
|
|
6
7
|
import { update } from './update';
|
|
7
8
|
export declare const User2FADeviceRepository: {
|
|
@@ -11,6 +12,8 @@ export declare const User2FADeviceRepository: {
|
|
|
11
12
|
getEnabledByUserUuid: typeof getEnabledByUserUuid;
|
|
12
13
|
countByUserUuid: typeof countByUserUuid;
|
|
13
14
|
update: typeof update;
|
|
15
|
+
markTimeStepUsed: typeof markTimeStepUsed;
|
|
16
|
+
replaceBackupCodes: typeof replaceBackupCodes;
|
|
14
17
|
deleteByDeviceUuid: typeof deleteByDeviceUuid;
|
|
15
18
|
deleteByUserUuid: typeof deleteByUserUuid;
|
|
16
19
|
};
|
|
@@ -5,6 +5,7 @@ const delete_1 = require("./delete");
|
|
|
5
5
|
const getByDeviceUuid_1 = require("./getByDeviceUuid");
|
|
6
6
|
const getByUserUuid_1 = require("./getByUserUuid");
|
|
7
7
|
const countByUserUuid_1 = require("./countByUserUuid");
|
|
8
|
+
const consume_1 = require("./consume");
|
|
8
9
|
const insert_1 = require("./insert");
|
|
9
10
|
const update_1 = require("./update");
|
|
10
11
|
exports.User2FADeviceRepository = {
|
|
@@ -14,6 +15,8 @@ exports.User2FADeviceRepository = {
|
|
|
14
15
|
getEnabledByUserUuid: getByUserUuid_1.getEnabledByUserUuid,
|
|
15
16
|
countByUserUuid: countByUserUuid_1.countByUserUuid,
|
|
16
17
|
update: update_1.update,
|
|
18
|
+
markTimeStepUsed: consume_1.markTimeStepUsed,
|
|
19
|
+
replaceBackupCodes: consume_1.replaceBackupCodes,
|
|
17
20
|
deleteByDeviceUuid: delete_1.deleteByDeviceUuid,
|
|
18
21
|
deleteByUserUuid: delete_1.deleteByUserUuid,
|
|
19
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/user2FADevice/index.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAC/D,uDAAmD;AACnD,mDAAqE;AACrE,uDAAmD;AACnD,qCAAiC;AACjC,qCAAiC;AAEpB,QAAA,uBAAuB,GAAG;IACrC,MAAM,EAAN,eAAM;IACN,aAAa,EAAb,6BAAa;IACb,eAAe,EAAf,iCAAe;IACf,oBAAoB,EAApB,oCAAoB;IACpB,eAAe,EAAf,iCAAe;IACf,MAAM,EAAN,eAAM;IACN,kBAAkB,EAAlB,2BAAkB;IAClB,gBAAgB,EAAhB,yBAAgB;CACjB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/repository/user2FADevice/index.ts"],"names":[],"mappings":";;;AAAA,qCAA+D;AAC/D,uDAAmD;AACnD,mDAAqE;AACrE,uDAAmD;AACnD,uCAAgE;AAChE,qCAAiC;AACjC,qCAAiC;AAEpB,QAAA,uBAAuB,GAAG;IACrC,MAAM,EAAN,eAAM;IACN,aAAa,EAAb,6BAAa;IACb,eAAe,EAAf,iCAAe;IACf,oBAAoB,EAApB,oCAAoB;IACpB,eAAe,EAAf,iCAAe;IACf,MAAM,EAAN,eAAM;IACN,gBAAgB,EAAhB,0BAAgB;IAChB,kBAAkB,EAAlB,4BAAkB;IAClB,kBAAkB,EAAlB,2BAAkB;IAClB,gBAAgB,EAAhB,yBAAgB;CACjB,CAAA"}
|
|
@@ -122,15 +122,19 @@ const generateBackupCodes = () => {
|
|
|
122
122
|
}
|
|
123
123
|
return codes;
|
|
124
124
|
};
|
|
125
|
-
const
|
|
126
|
-
const { secret, token } = options;
|
|
125
|
+
const verifyTokenTimeStep = (options) => {
|
|
126
|
+
const { secret, token, afterTimeStep } = options;
|
|
127
|
+
if (!/^\d{6}$/.test(token))
|
|
128
|
+
return null;
|
|
127
129
|
const result = (0, otplib_1.verifySync)({
|
|
128
130
|
secret,
|
|
129
131
|
token,
|
|
130
132
|
epochTolerance: 60,
|
|
133
|
+
afterTimeStep,
|
|
131
134
|
});
|
|
132
|
-
return result.valid;
|
|
135
|
+
return result.valid && 'timeStep' in result ? result.timeStep : null;
|
|
133
136
|
};
|
|
137
|
+
const verifyToken = (options) => verifyTokenTimeStep(options) !== null;
|
|
134
138
|
const to2FADeviceForClient = (device) => {
|
|
135
139
|
const { uuid, userUuid, deviceName, enabled, dateCreated, dateModified } = device;
|
|
136
140
|
return { uuid, userUuid, deviceName, enabled, dateCreated, dateModified };
|
|
@@ -210,15 +214,15 @@ const verifyLogin = async (options) => {
|
|
|
210
214
|
return false;
|
|
211
215
|
}
|
|
212
216
|
for (const device of enabledDevices) {
|
|
213
|
-
const { uuid: deviceUuid, backupCodes } = device;
|
|
217
|
+
const { uuid: deviceUuid, backupCodes, lastUsedTimeStep } = device;
|
|
214
218
|
const { matched, updatedCodes } = await findAndConsumeBackupCode(backupCodes, token);
|
|
215
219
|
if (matched) {
|
|
216
|
-
|
|
217
|
-
return true;
|
|
220
|
+
return repository_1.User2FADeviceRepository.replaceBackupCodes({ uuid: deviceUuid, expectedBackupCodes: backupCodes, backupCodes: updatedCodes ?? [] }, client);
|
|
218
221
|
}
|
|
219
222
|
const secret = decryptSecret(device.secret);
|
|
220
|
-
|
|
221
|
-
|
|
223
|
+
const timeStep = verifyTokenTimeStep({ secret, token, afterTimeStep: lastUsedTimeStep ?? undefined });
|
|
224
|
+
if (timeStep !== null) {
|
|
225
|
+
return repository_1.User2FADeviceRepository.markTimeStepUsed({ uuid: deviceUuid, timeStep }, client);
|
|
222
226
|
}
|
|
223
227
|
}
|
|
224
228
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user2FAService.js","sourceRoot":"","sources":["../../../src/service/user2FA/user2FAService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"user2FAService.js","sourceRoot":"","sources":["../../../src/service/user2FA/user2FAService.ts"],"names":[],"mappings":"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"}
|