@webda/core 2.0.0-beta.0 → 2.0.0-beta.3
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/lib/application.d.ts +40 -18
- package/lib/application.js +20 -6
- package/lib/application.js.map +1 -1
- package/lib/application.spec.js +12 -0
- package/lib/application.spec.js.map +1 -1
- package/lib/core.d.ts +69 -19
- package/lib/core.js +90 -38
- package/lib/core.js.map +1 -1
- package/lib/core.spec.js +42 -35
- package/lib/core.spec.js.map +1 -1
- package/lib/index.d.ts +4 -0
- package/lib/index.js +5 -0
- package/lib/index.js.map +1 -1
- package/lib/models/aclmodel.js +3 -2
- package/lib/models/aclmodel.js.map +1 -1
- package/lib/models/aclmodel.spec.js +7 -4
- package/lib/models/aclmodel.spec.js.map +1 -1
- package/lib/models/coremodel.d.ts +82 -9
- package/lib/models/coremodel.js +49 -0
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/coremodel.spec.js +21 -2
- package/lib/models/coremodel.spec.js.map +1 -1
- package/lib/models/ident.d.ts +4 -2
- package/lib/models/ident.js.map +1 -1
- package/lib/models/ident.spec.js +1 -1
- package/lib/models/ident.spec.js.map +1 -1
- package/lib/models/ownermodel.d.ts +11 -1
- package/lib/models/ownermodel.js +16 -1
- package/lib/models/ownermodel.js.map +1 -1
- package/lib/models/ownermodel.spec.js +32 -13
- package/lib/models/ownermodel.spec.js.map +1 -1
- package/lib/models/rolemodel.d.ts +1 -1
- package/lib/models/rolemodel.spec.js +3 -1
- package/lib/models/rolemodel.spec.js.map +1 -1
- package/lib/models/user.d.ts +3 -3
- package/lib/models/user.js.map +1 -1
- package/lib/models/user.spec.js +1 -1
- package/lib/models/user.spec.js.map +1 -1
- package/lib/queues/filequeue.js +2 -2
- package/lib/queues/filequeue.js.map +1 -1
- package/lib/queues/filequeue.spec.js +2 -2
- package/lib/queues/filequeue.spec.js.map +1 -1
- package/lib/queues/memoryqueue.spec.js +1 -1
- package/lib/queues/memoryqueue.spec.js.map +1 -1
- package/lib/queues/queue.spec.js +1 -1
- package/lib/queues/queue.spec.js.map +1 -1
- package/lib/queues/queueservice.d.ts +2 -2
- package/lib/queues/queueservice.js +1 -0
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/router.d.ts +6 -1
- package/lib/router.js +3 -12
- package/lib/router.js.map +1 -1
- package/lib/router.spec.js +5 -5
- package/lib/router.spec.js.map +1 -1
- package/lib/services/asyncevents.spec.js +2 -2
- package/lib/services/asyncevents.spec.js.map +1 -1
- package/lib/services/authentication.d.ts +33 -14
- package/lib/services/authentication.js +24 -36
- package/lib/services/authentication.js.map +1 -1
- package/lib/services/authentication.spec.js +16 -16
- package/lib/services/authentication.spec.js.map +1 -1
- package/lib/services/binary.d.ts +3 -3
- package/lib/services/binary.js +24 -17
- package/lib/services/binary.js.map +1 -1
- package/lib/services/binary.spec.d.ts +1 -1
- package/lib/services/binary.spec.js +5 -5
- package/lib/services/binary.spec.js.map +1 -1
- package/lib/services/cloudbinary.d.ts +2 -2
- package/lib/services/cloudbinary.js +3 -3
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/cloudbinary.spec.js +8 -1
- package/lib/services/cloudbinary.spec.js.map +1 -1
- package/lib/services/configuration.d.ts +5 -2
- package/lib/services/configuration.js +4 -2
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/configuration.spec.js +2 -2
- package/lib/services/configuration.spec.js.map +1 -1
- package/lib/services/cron.d.ts +1 -1
- package/lib/services/cron.js +1 -1
- package/lib/services/cron.js.map +1 -1
- package/lib/services/cron.spec.js +3 -3
- package/lib/services/cron.spec.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +253 -0
- package/lib/services/cryptoservice.js +346 -0
- package/lib/services/cryptoservice.js.map +1 -0
- package/lib/services/cryptoservice.spec.d.ts +1 -0
- package/lib/services/cryptoservice.spec.js +164 -0
- package/lib/services/cryptoservice.spec.js.map +1 -0
- package/lib/services/debugmailer.spec.js +1 -1
- package/lib/services/debugmailer.spec.js.map +1 -1
- package/lib/services/echo.d.ts +1 -1
- package/lib/services/echo.spec.js +3 -3
- package/lib/services/echo.spec.js.map +1 -1
- package/lib/services/filebinary.d.ts +16 -6
- package/lib/services/filebinary.js +45 -22
- package/lib/services/filebinary.js.map +1 -1
- package/lib/services/filebinary.spec.js +7 -11
- package/lib/services/filebinary.spec.js.map +1 -1
- package/lib/services/fileconfiguration.d.ts +1 -1
- package/lib/services/fileconfiguration.js +3 -2
- package/lib/services/fileconfiguration.js.map +1 -1
- package/lib/services/fileconfiguration.spec.js +2 -2
- package/lib/services/fileconfiguration.spec.js.map +1 -1
- package/lib/services/invitationservice.d.ts +28 -6
- package/lib/services/invitationservice.js +8 -5
- package/lib/services/invitationservice.js.map +1 -1
- package/lib/services/invitationservice.spec.js +4 -4
- package/lib/services/invitationservice.spec.js.map +1 -1
- package/lib/services/kubernetesconfiguration.d.ts +1 -1
- package/lib/services/kubernetesconfiguration.js +3 -2
- package/lib/services/kubernetesconfiguration.js.map +1 -1
- package/lib/services/kubernetesconfiguration.spec.js +4 -4
- package/lib/services/kubernetesconfiguration.spec.js.map +1 -1
- package/lib/services/mailer.js.map +1 -1
- package/lib/services/mailer.spec.js +3 -3
- package/lib/services/mailer.spec.js.map +1 -1
- package/lib/services/notificationservice.d.ts +1 -1
- package/lib/services/notificationservice.js +2 -0
- package/lib/services/notificationservice.js.map +1 -1
- package/lib/services/notificationservice.spec.js +2 -2
- package/lib/services/notificationservice.spec.js.map +1 -1
- package/lib/services/oauth.d.ts +30 -4
- package/lib/services/oauth.js +19 -10
- package/lib/services/oauth.js.map +1 -1
- package/lib/services/oauth.spec.js +30 -23
- package/lib/services/oauth.spec.js.map +1 -1
- package/lib/services/proxy.d.ts +78 -0
- package/lib/services/proxy.js +139 -0
- package/lib/services/proxy.js.map +1 -0
- package/lib/services/proxy.spec.d.ts +1 -0
- package/lib/services/proxy.spec.js +78 -0
- package/lib/services/proxy.spec.js.map +1 -0
- package/lib/services/resource.d.ts +17 -0
- package/lib/services/resource.js +20 -6
- package/lib/services/resource.js.map +1 -1
- package/lib/services/resource.spec.js +4 -3
- package/lib/services/resource.spec.js.map +1 -1
- package/lib/services/service.d.ts +10 -7
- package/lib/services/service.js +7 -3
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +2 -2
- package/lib/services/service.spec.js.map +1 -1
- package/lib/services/version.d.ts +1 -1
- package/lib/services/version.spec.js +1 -1
- package/lib/services/version.spec.js.map +1 -1
- package/lib/stores/aggregator.d.ts +1 -1
- package/lib/stores/aggregator.js +1 -0
- package/lib/stores/aggregator.js.map +1 -1
- package/lib/stores/file.d.ts +9 -1
- package/lib/stores/file.js +7 -4
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.d.ts +3 -1
- package/lib/stores/file.spec.js +30 -7
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/mapper.d.ts +1 -1
- package/lib/stores/mapper.js +2 -0
- package/lib/stores/mapper.js.map +1 -1
- package/lib/stores/mapper.spec.js +1 -1
- package/lib/stores/mapper.spec.js.map +1 -1
- package/lib/stores/memory.d.ts +65 -4
- package/lib/stores/memory.js +85 -1
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/memory.spec.d.ts +2 -1
- package/lib/stores/memory.spec.js +47 -4
- package/lib/stores/memory.spec.js.map +1 -1
- package/lib/stores/store.d.ts +27 -5
- package/lib/stores/store.js +107 -22
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.d.ts +4 -3
- package/lib/stores/store.spec.js +37 -14
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLLexer.js +2 -2
- package/lib/stores/webdaql/WebdaQLLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserLexer.js +2 -2
- package/lib/stores/webdaql/WebdaQLParserLexer.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserListener.d.ts +1 -25
- package/lib/stores/webdaql/WebdaQLParserParser.d.ts +1 -1
- package/lib/stores/webdaql/WebdaQLParserParser.js +2 -2
- package/lib/stores/webdaql/WebdaQLParserParser.js.map +1 -1
- package/lib/stores/webdaql/WebdaQLParserVisitor.d.ts +1 -25
- package/lib/stores/webdaql/query.d.ts +3 -3
- package/lib/stores/webdaql/query.js +4 -4
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +1 -1
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.d.ts +6 -8
- package/lib/test.js +12 -18
- package/lib/test.js.map +1 -1
- package/lib/unpackedapplication.js +24 -7
- package/lib/unpackedapplication.js.map +1 -1
- package/lib/utils/abstractdeployer.spec.js +1 -1
- package/lib/utils/abstractdeployer.spec.js.map +1 -1
- package/lib/utils/context.d.ts +61 -73
- package/lib/utils/context.js +81 -159
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +79 -40
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/cookie.d.ts +65 -44
- package/lib/utils/cookie.js +75 -145
- package/lib/utils/cookie.js.map +1 -1
- package/lib/utils/cookie.spec.js +203 -199
- package/lib/utils/cookie.spec.js.map +1 -1
- package/lib/utils/httpcontext.d.ts +182 -0
- package/lib/utils/httpcontext.js +325 -0
- package/lib/utils/httpcontext.js.map +1 -0
- package/lib/utils/httpcontext.spec.d.ts +5 -0
- package/lib/utils/httpcontext.spec.js +90 -0
- package/lib/utils/httpcontext.spec.js.map +1 -0
- package/lib/utils/logger.d.ts +2 -2
- package/lib/utils/logger.js +1 -1
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/logger.spec.js.map +1 -1
- package/lib/utils/serializers.js +1 -1
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +3 -3
- package/lib/utils/serializers.spec.js.map +1 -1
- package/lib/utils/session.d.ts +120 -0
- package/lib/utils/session.js +177 -0
- package/lib/utils/session.js.map +1 -0
- package/lib/utils/session.spec.d.ts +1 -0
- package/lib/utils/session.spec.js +79 -0
- package/lib/utils/session.spec.js.map +1 -0
- package/lib/utils/waiter.js.map +1 -1
- package/lib/utils/waiter.spec.js +2 -2
- package/lib/utils/waiter.spec.js.map +1 -1
- package/package.json +10 -7
- package/test/config.json +4 -2
- package/test/models/task.js +0 -1
- package/webda.module.json +3 -2
package/lib/router.spec.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.spec.js","sourceRoot":"","sources":["../src/router.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,iCAAiC;AACjC,2CAA8C;AAC9C,iCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"router.spec.js","sourceRoot":"","sources":["../src/router.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,11 +15,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
|
+
const sinon = require("sinon");
|
|
20
21
|
const test_1 = require("../test");
|
|
21
22
|
const asyncevents_1 = require("./asyncevents");
|
|
22
|
-
const sinon = require("sinon");
|
|
23
23
|
let AsyncEventsTest = class AsyncEventsTest extends test_1.WebdaTest {
|
|
24
24
|
simple() {
|
|
25
25
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asyncevents.spec.js","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"asyncevents.spec.js","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { User } from "../models/user";
|
|
|
4
4
|
import { Service, ServiceParameters } from "../services/service";
|
|
5
5
|
import { Store } from "../stores/store";
|
|
6
6
|
import { Context } from "../utils/context";
|
|
7
|
+
import CryptoService from "./cryptoservice";
|
|
7
8
|
import { Mailer } from "./mailer";
|
|
8
9
|
/**
|
|
9
10
|
* Emitted when the /me route is called
|
|
@@ -15,7 +16,7 @@ export interface EventAuthenticationGetMe extends EventWithContext {
|
|
|
15
16
|
* Emitted when new user registered
|
|
16
17
|
*/
|
|
17
18
|
export interface EventAuthenticationRegister extends EventAuthenticationGetMe {
|
|
18
|
-
|
|
19
|
+
data: any;
|
|
19
20
|
identId: string;
|
|
20
21
|
}
|
|
21
22
|
/**
|
|
@@ -60,7 +61,7 @@ export interface PasswordVerifier extends Service {
|
|
|
60
61
|
/**
|
|
61
62
|
* Information required to reset a password
|
|
62
63
|
*/
|
|
63
|
-
export
|
|
64
|
+
export interface PasswordRecoveryInfos {
|
|
64
65
|
/**
|
|
65
66
|
* Links are short lived
|
|
66
67
|
*/
|
|
@@ -74,6 +75,26 @@ export declare class PasswordRecoveryInfos {
|
|
|
74
75
|
*/
|
|
75
76
|
login: string;
|
|
76
77
|
}
|
|
78
|
+
interface PasswordRecoveryBody extends PasswordRecoveryInfos {
|
|
79
|
+
/**
|
|
80
|
+
* Password to set
|
|
81
|
+
*/
|
|
82
|
+
password: string;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Login info
|
|
86
|
+
*
|
|
87
|
+
* If register = true, you can add many other information
|
|
88
|
+
*
|
|
89
|
+
* @SchemaAdditionalProperties
|
|
90
|
+
*/
|
|
91
|
+
interface LoginBody {
|
|
92
|
+
login: string;
|
|
93
|
+
register?: boolean;
|
|
94
|
+
token?: string;
|
|
95
|
+
email?: string;
|
|
96
|
+
password?: string;
|
|
97
|
+
}
|
|
77
98
|
export declare class AuthenticationParameters extends ServiceParameters {
|
|
78
99
|
/**
|
|
79
100
|
* Idents store for authentication identifiers
|
|
@@ -184,6 +205,10 @@ export declare type AuthenticationEvents = {
|
|
|
184
205
|
declare class Authentication<T extends AuthenticationParameters = AuthenticationParameters, E extends AuthenticationEvents = AuthenticationEvents> extends Service<T, E> {
|
|
185
206
|
_identsStore: Store<Ident>;
|
|
186
207
|
_usersStore: Store<User>;
|
|
208
|
+
/**
|
|
209
|
+
* Used for hmac
|
|
210
|
+
*/
|
|
211
|
+
cryptoService: CryptoService;
|
|
187
212
|
_passwordVerifier: PasswordVerifier;
|
|
188
213
|
providers: Set<string>;
|
|
189
214
|
/**
|
|
@@ -245,11 +270,11 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
245
270
|
* @param ident
|
|
246
271
|
*/
|
|
247
272
|
createUserWithIdent(provider: string, identId: string, profile?: any): Promise<void>;
|
|
248
|
-
registerUser(ctx: Context,
|
|
273
|
+
registerUser(ctx: Context, data: any, identId: string, user?: any): Promise<any>;
|
|
249
274
|
getPasswordRecoveryInfos(uuid: string | User, interval?: number): Promise<PasswordRecoveryInfos>;
|
|
250
275
|
_passwordRecoveryEmail(ctx: Context): Promise<void>;
|
|
251
276
|
_verifyPassword(password: string, user?: User): Promise<void>;
|
|
252
|
-
_passwordRecovery(ctx: Context): Promise<void>;
|
|
277
|
+
_passwordRecovery(ctx: Context<PasswordRecoveryBody>): Promise<void>;
|
|
253
278
|
_handleEmailCallback(ctx: Context): Promise<void>;
|
|
254
279
|
/**
|
|
255
280
|
* Send an email to recover the user password
|
|
@@ -269,18 +294,12 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
269
294
|
* @returns
|
|
270
295
|
*/
|
|
271
296
|
sendValidationEmail(ctx: Context, email: string): Promise<any>;
|
|
272
|
-
/**
|
|
273
|
-
* Create a SHA256 of the info
|
|
274
|
-
*
|
|
275
|
-
* @param info to hash
|
|
276
|
-
*/
|
|
277
|
-
hashInfo(info: string): string;
|
|
278
297
|
/**
|
|
279
298
|
* Check the password match the stored hash
|
|
280
299
|
* @param hash generate prior by hashPassword
|
|
281
300
|
* @param password as entered by the user
|
|
282
301
|
*/
|
|
283
|
-
checkPassword(hash:
|
|
302
|
+
checkPassword(hash: string, pass: string): boolean;
|
|
284
303
|
/**
|
|
285
304
|
* Hash the password according to good practices
|
|
286
305
|
*
|
|
@@ -307,14 +326,14 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
|
|
|
307
326
|
* @param ctx
|
|
308
327
|
* @param ident
|
|
309
328
|
*/
|
|
310
|
-
protected handleLogin(ctx: Context
|
|
329
|
+
protected handleLogin(ctx: Context<LoginBody>, ident: Ident): Promise<void>;
|
|
311
330
|
/**
|
|
312
331
|
* Handle the POST /auth/email
|
|
313
332
|
*
|
|
314
333
|
* @param ctx
|
|
315
334
|
* @returns
|
|
316
335
|
*/
|
|
317
|
-
_handleEmail(ctx: Context): Promise<any>;
|
|
318
|
-
generateEmailValidationToken(user: string, email: string): string
|
|
336
|
+
_handleEmail(ctx: Context<LoginBody>): Promise<any>;
|
|
337
|
+
generateEmailValidationToken(user: string, email: string): Promise<string>;
|
|
319
338
|
}
|
|
320
339
|
export { Authentication };
|
|
@@ -15,17 +15,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.Authentication = exports.AuthenticationParameters =
|
|
19
|
-
const crypto = require("crypto");
|
|
18
|
+
exports.Authentication = exports.AuthenticationParameters = void 0;
|
|
20
19
|
const bcrypt = require("bcryptjs");
|
|
21
20
|
const service_1 = require("../services/service");
|
|
22
|
-
const
|
|
23
|
-
/**
|
|
24
|
-
* Information required to reset a password
|
|
25
|
-
*/
|
|
26
|
-
class PasswordRecoveryInfos {
|
|
27
|
-
}
|
|
28
|
-
exports.PasswordRecoveryInfos = PasswordRecoveryInfos;
|
|
21
|
+
const httpcontext_1 = require("../utils/httpcontext");
|
|
29
22
|
class AuthenticationParameters extends service_1.ServiceParameters {
|
|
30
23
|
constructor(params) {
|
|
31
24
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -389,18 +382,18 @@ class Authentication extends service_1.Service {
|
|
|
389
382
|
if (yield this._identsStore.exists(`${identId}_${provider}`)) {
|
|
390
383
|
throw new Error("Ident is already known");
|
|
391
384
|
}
|
|
392
|
-
let ctx = yield this._webda.newContext(new
|
|
385
|
+
let ctx = yield this._webda.newContext(new httpcontext_1.HttpContext("fake", "GET", "/"));
|
|
393
386
|
// Pretend we logged in with the ident
|
|
394
387
|
yield this.onIdentLogin(ctx, provider, identId, profile);
|
|
395
388
|
});
|
|
396
389
|
}
|
|
397
|
-
registerUser(ctx,
|
|
390
|
+
registerUser(ctx, data, identId, user = this._usersStore.initModel()) {
|
|
398
391
|
return __awaiter(this, void 0, void 0, function* () {
|
|
399
|
-
user.email =
|
|
392
|
+
user.email = data.email;
|
|
400
393
|
user.locale = ctx.getLocale();
|
|
401
394
|
yield this.emitSync("Authentication.Register", {
|
|
402
395
|
user: user,
|
|
403
|
-
|
|
396
|
+
data: data,
|
|
404
397
|
context: ctx,
|
|
405
398
|
identId
|
|
406
399
|
});
|
|
@@ -423,7 +416,7 @@ class Authentication extends service_1.Service {
|
|
|
423
416
|
return {
|
|
424
417
|
expire: expire,
|
|
425
418
|
// Might want to add more alea not coming from the db to avoid exploitation of stolen db
|
|
426
|
-
token: this.
|
|
419
|
+
token: yield this.cryptoService.hmac(user.uuid + expire + user.getPassword()),
|
|
427
420
|
login: user.uuid
|
|
428
421
|
};
|
|
429
422
|
});
|
|
@@ -463,7 +456,7 @@ class Authentication extends service_1.Service {
|
|
|
463
456
|
}
|
|
464
457
|
_passwordRecovery(ctx) {
|
|
465
458
|
return __awaiter(this, void 0, void 0, function* () {
|
|
466
|
-
let body = ctx.getRequestBody();
|
|
459
|
+
let body = yield ctx.getRequestBody();
|
|
467
460
|
if (body.password === undefined ||
|
|
468
461
|
body.login === undefined ||
|
|
469
462
|
body.token === undefined ||
|
|
@@ -474,7 +467,7 @@ class Authentication extends service_1.Service {
|
|
|
474
467
|
if (!user) {
|
|
475
468
|
throw 403;
|
|
476
469
|
}
|
|
477
|
-
if (
|
|
470
|
+
if (!(yield this.cryptoService.hmacVerify(body.login.toLowerCase() + body.expire + user.getPassword(), body.token))) {
|
|
478
471
|
throw 403;
|
|
479
472
|
}
|
|
480
473
|
if (body.expire < Date.now()) {
|
|
@@ -498,8 +491,7 @@ class Authentication extends service_1.Service {
|
|
|
498
491
|
if (!ctx.parameter("token")) {
|
|
499
492
|
throw 400;
|
|
500
493
|
}
|
|
501
|
-
|
|
502
|
-
if (validation !== this.generateEmailValidationToken(ctx.parameter("user"), ctx.parameter("email"))) {
|
|
494
|
+
if (!(yield this.cryptoService.hmacVerify(`${ctx.parameter("email")}_${ctx.parameter("user")}`, ctx.parameter("token")))) {
|
|
503
495
|
ctx.writeHead(302, {
|
|
504
496
|
Location: this.parameters.failureRedirect + "?reason=badToken"
|
|
505
497
|
});
|
|
@@ -572,7 +564,7 @@ class Authentication extends service_1.Service {
|
|
|
572
564
|
var mailer = this.getMailMan();
|
|
573
565
|
let replacements = Object.assign(Object.assign({}, this.parameters.email), { context: ctx, url: ctx
|
|
574
566
|
.getHttpContext()
|
|
575
|
-
.getAbsoluteUrl(`${this.parameters.url}/email/callback?email=${email}&token=${this.generateEmailValidationToken(ctx.getCurrentUserId(), email)}`) });
|
|
567
|
+
.getAbsoluteUrl(`${this.parameters.url}/email/callback?email=${email}&token=${yield this.generateEmailValidationToken(ctx.getCurrentUserId(), email)}`) });
|
|
576
568
|
let userId = ctx.getCurrentUserId();
|
|
577
569
|
if (userId && userId.length > 0) {
|
|
578
570
|
replacements.url += "&user=" + userId;
|
|
@@ -586,15 +578,6 @@ class Authentication extends service_1.Service {
|
|
|
586
578
|
return mailer.send(mailOptions);
|
|
587
579
|
});
|
|
588
580
|
}
|
|
589
|
-
/**
|
|
590
|
-
* Create a SHA256 of the info
|
|
591
|
-
*
|
|
592
|
-
* @param info to hash
|
|
593
|
-
*/
|
|
594
|
-
hashInfo(info) {
|
|
595
|
-
var hash = crypto.createHash("sha256");
|
|
596
|
-
return hash.update(info).digest("hex");
|
|
597
|
-
}
|
|
598
581
|
/**
|
|
599
582
|
* Check the password match the stored hash
|
|
600
583
|
* @param hash generate prior by hashPassword
|
|
@@ -619,7 +602,7 @@ class Authentication extends service_1.Service {
|
|
|
619
602
|
yield this.emitSync("Authentication.Logout", {
|
|
620
603
|
context: ctx
|
|
621
604
|
});
|
|
622
|
-
ctx.
|
|
605
|
+
ctx.newSession();
|
|
623
606
|
});
|
|
624
607
|
}
|
|
625
608
|
/**
|
|
@@ -665,7 +648,7 @@ class Authentication extends service_1.Service {
|
|
|
665
648
|
let updates = {};
|
|
666
649
|
let user = yield this._usersStore.get(ident.getUser());
|
|
667
650
|
// Check password
|
|
668
|
-
if (this.checkPassword(user.getPassword(), ctx.getRequestBody().password)) {
|
|
651
|
+
if (this.checkPassword(user.getPassword(), (yield ctx.getRequestBody()).password)) {
|
|
669
652
|
if (ident._failedLogin > 0) {
|
|
670
653
|
ident._failedLogin = 0;
|
|
671
654
|
}
|
|
@@ -706,7 +689,7 @@ class Authentication extends service_1.Service {
|
|
|
706
689
|
if (ctx.getCurrentUserId() !== undefined) {
|
|
707
690
|
throw 410;
|
|
708
691
|
}
|
|
709
|
-
let body = ctx.getRequestBody();
|
|
692
|
+
let body = yield ctx.getRequestBody();
|
|
710
693
|
if (body.login === undefined) {
|
|
711
694
|
throw 400;
|
|
712
695
|
}
|
|
@@ -731,7 +714,7 @@ class Authentication extends service_1.Service {
|
|
|
731
714
|
var validation = undefined;
|
|
732
715
|
// Need to check email before creation
|
|
733
716
|
if (!mailConfig.postValidation) {
|
|
734
|
-
if (body.token
|
|
717
|
+
if (body.token && (yield this.cryptoService.hmacVerify(`${email}_${ctx.getCurrentUserId()}`, body.token))) {
|
|
735
718
|
validation = new Date();
|
|
736
719
|
}
|
|
737
720
|
else {
|
|
@@ -744,16 +727,16 @@ class Authentication extends service_1.Service {
|
|
|
744
727
|
throw 400;
|
|
745
728
|
}
|
|
746
729
|
// Store with a _
|
|
747
|
-
|
|
730
|
+
let __password = this.hashPassword(body.password);
|
|
748
731
|
yield this._verifyPassword(body.password);
|
|
749
732
|
// Remove useless attributes
|
|
750
733
|
delete body.password;
|
|
751
734
|
delete body.register;
|
|
752
735
|
delete body.token;
|
|
753
|
-
let user = yield this.registerUser(ctx, {}, uuid, body);
|
|
736
|
+
let user = yield this.registerUser(ctx, {}, uuid, Object.assign(Object.assign({}, body), { __password }));
|
|
754
737
|
yield this.emitSync("Authentication.PasswordCreate", {
|
|
755
738
|
user,
|
|
756
|
-
password:
|
|
739
|
+
password: __password,
|
|
757
740
|
context: ctx
|
|
758
741
|
});
|
|
759
742
|
user = yield this._usersStore.save(user);
|
|
@@ -781,7 +764,9 @@ class Authentication extends service_1.Service {
|
|
|
781
764
|
});
|
|
782
765
|
}
|
|
783
766
|
generateEmailValidationToken(user, email) {
|
|
784
|
-
return this
|
|
767
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
768
|
+
return this.cryptoService.hmac(email + "_" + user);
|
|
769
|
+
});
|
|
785
770
|
}
|
|
786
771
|
}
|
|
787
772
|
__decorate([
|
|
@@ -790,5 +775,8 @@ __decorate([
|
|
|
790
775
|
__decorate([
|
|
791
776
|
(0, service_1.Inject)("userStore", "users")
|
|
792
777
|
], Authentication.prototype, "_usersStore", void 0);
|
|
778
|
+
__decorate([
|
|
779
|
+
(0, service_1.Inject)("CryptoService")
|
|
780
|
+
], Authentication.prototype, "cryptoService", void 0);
|
|
793
781
|
exports.Authentication = Authentication;
|
|
794
782
|
//# sourceMappingURL=authentication.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"authentication.js","sourceRoot":"","sources":["../../src/services/authentication.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
15
15
|
});
|
|
16
16
|
};
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
const assert = require("assert");
|
|
19
18
|
const mocha_1 = require("@testdeck/mocha");
|
|
19
|
+
const assert = require("assert");
|
|
20
20
|
const __1 = require("..");
|
|
21
21
|
const test_1 = require("../test");
|
|
22
22
|
const authentication_1 = require("./authentication");
|
|
@@ -135,7 +135,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
135
135
|
ctx.newSession();
|
|
136
136
|
yield executor.execute(ctx);
|
|
137
137
|
// Should not authentified as we need to check email
|
|
138
|
-
assert.strictEqual(ctx.getSession().
|
|
138
|
+
assert.strictEqual(ctx.getSession().identUsed, undefined);
|
|
139
139
|
// Email is sent
|
|
140
140
|
assert.strictEqual(this.mailer.sent.length, 1);
|
|
141
141
|
// Ident is created pending validation
|
|
@@ -146,10 +146,10 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
146
146
|
// With postValidation on the user will be create on first request
|
|
147
147
|
yield this.registerTest2(ctx);
|
|
148
148
|
assert.strictEqual(this.events, 2); // Register + Login
|
|
149
|
-
userId = ctx.getSession().
|
|
150
|
-
assert.notStrictEqual(ctx.getSession().
|
|
149
|
+
userId = ctx.getSession().userId;
|
|
150
|
+
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
151
151
|
assert.strictEqual(this.mailer.sent.length, 2);
|
|
152
|
-
let user = yield this.userStore.get(ctx.getSession().
|
|
152
|
+
let user = yield this.userStore.get(ctx.getSession().userId);
|
|
153
153
|
assert.notStrictEqual(user, undefined);
|
|
154
154
|
assert.notStrictEqual(user.getPassword(), undefined);
|
|
155
155
|
assert.strictEqual(user.locale, "en");
|
|
@@ -159,7 +159,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
159
159
|
yield executor.execute(ctx);
|
|
160
160
|
// Now validate first user
|
|
161
161
|
ctx.getExecutor().getParameters().email.postValidation = false;
|
|
162
|
-
assert.strictEqual(ctx.getSession().
|
|
162
|
+
assert.strictEqual(ctx.getSession().userId, undefined);
|
|
163
163
|
var match = this.mailer.sent[0].replacements.url.match(validationUrl);
|
|
164
164
|
assert.notStrictEqual(match, undefined);
|
|
165
165
|
assert.strictEqual(match[1], "test@webda.io");
|
|
@@ -172,8 +172,8 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
172
172
|
});
|
|
173
173
|
yield executor.execute(ctx);
|
|
174
174
|
// Should create it with the dat provided
|
|
175
|
-
assert.notStrictEqual(ctx.getSession().
|
|
176
|
-
ident = yield this.identStore.get(ctx.getSession().
|
|
175
|
+
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
176
|
+
ident = yield this.identStore.get(ctx.getSession().identUsed);
|
|
177
177
|
// Email should be already validate
|
|
178
178
|
assert.notStrictEqual(ident._validation, undefined);
|
|
179
179
|
assert.strictEqual(this.mailer.sent.length, 2);
|
|
@@ -210,7 +210,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
210
210
|
// No new email has been sent
|
|
211
211
|
assert.strictEqual(this.mailer.sent.length, 3);
|
|
212
212
|
assert.strictEqual(this.events, 2); // Register + Login
|
|
213
|
-
assert.notStrictEqual(ctx.getSession().
|
|
213
|
+
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
214
214
|
// Register while logged-in should fail with 410
|
|
215
215
|
yield assert.rejects(() => executor.execute(ctx), /410/);
|
|
216
216
|
});
|
|
@@ -273,7 +273,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
273
273
|
password: "testtest"
|
|
274
274
|
});
|
|
275
275
|
yield assert.rejects(() => executor.execute(ctx), res => res == 404);
|
|
276
|
-
assert.strictEqual(ctx.getSession().
|
|
276
|
+
assert.strictEqual(ctx.getSession().userId, undefined);
|
|
277
277
|
// As it has not been validate
|
|
278
278
|
ctx.getHttpContext().setBody({
|
|
279
279
|
login: "test2@webda.io",
|
|
@@ -283,9 +283,9 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
283
283
|
ctx.newSession();
|
|
284
284
|
yield executor.execute(ctx);
|
|
285
285
|
assert.strictEqual(this.events, 1); // Login
|
|
286
|
-
assert.notStrictEqual(ctx.getSession().
|
|
286
|
+
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
287
287
|
// Verify ident type
|
|
288
|
-
let ident = yield this.identStore.get(ctx.getSession().
|
|
288
|
+
let ident = yield this.identStore.get(ctx.getSession().identUsed);
|
|
289
289
|
assert.strictEqual(ident._type, "email");
|
|
290
290
|
ctx.getHttpContext().setBody({
|
|
291
291
|
login: "test2@webda.io",
|
|
@@ -294,7 +294,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
294
294
|
ctx.reinit();
|
|
295
295
|
ctx.newSession();
|
|
296
296
|
yield assert.rejects(() => executor.execute(ctx), res => res == 403);
|
|
297
|
-
assert.strictEqual(ctx.getSession().
|
|
297
|
+
assert.strictEqual(ctx.getSession().userId, undefined);
|
|
298
298
|
assert.strictEqual(this.events, 1);
|
|
299
299
|
assert.strictEqual(yield (yield this.identStore.get("test2@webda.io_email"))._failedLogin, 1);
|
|
300
300
|
// Re log to reinit failedLogin
|
|
@@ -315,7 +315,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
315
315
|
yield this.registerTest2(ctx);
|
|
316
316
|
this.mailer.sent = [];
|
|
317
317
|
this.events = 0;
|
|
318
|
-
userId = ctx.getSession().
|
|
318
|
+
userId = ctx.getSession().userId;
|
|
319
319
|
ctx.newSession();
|
|
320
320
|
let executor = this.getExecutor(ctx, "test.webda.io", "POST", "/auth/email/passwordRecovery", {
|
|
321
321
|
login: userId,
|
|
@@ -371,7 +371,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
371
371
|
password: "retesttest"
|
|
372
372
|
});
|
|
373
373
|
yield executor.execute(ctx);
|
|
374
|
-
assert.notStrictEqual(ctx.getSession().
|
|
374
|
+
assert.notStrictEqual(ctx.getSession().userId, undefined);
|
|
375
375
|
executor = this.getExecutor(ctx, "test.webda.io", "GET", "/auth/email/test2@webda.io/recover");
|
|
376
376
|
yield executor.execute(ctx);
|
|
377
377
|
assert.strictEqual(this.mailer.sent.length, 1);
|
|
@@ -466,7 +466,7 @@ let AuthenticationTest = class AuthenticationTest extends test_1.WebdaTest {
|
|
|
466
466
|
}
|
|
467
467
|
redirectEmailRegister() {
|
|
468
468
|
return __awaiter(this, void 0, void 0, function* () {
|
|
469
|
-
let token = this.authentication.generateEmailValidationToken(undefined, "test@webda.io");
|
|
469
|
+
let token = yield this.authentication.generateEmailValidationToken(undefined, "test@webda.io");
|
|
470
470
|
let ctx = yield this.newContext();
|
|
471
471
|
let executor = this.getExecutor(ctx, "test.webda.io", "GET", `/auth/email/callback?email=test@webda.io&token=${token}`);
|
|
472
472
|
yield executor.execute(ctx);
|