@webda/core 1.2.1 → 1.6.0-beta.0

package/lib/services/asyncevents.js

@@ -9,8 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventService = exports.EventServiceParameters = void 0;
+exports.EventService = exports.EventServiceParameters = exports.AsyncEvent = void 0;
 const service_1 = require("./service");
+/**
+ * AsyncEvent representation
+ */
 class AsyncEvent {
     constructor(service, type, payload = {}) {
         this.service = service;
@@ -18,22 +21,63 @@ class AsyncEvent {
         this.payload = payload;
         this.time = new Date();
     }
-    static fromQueue(data) {
-        let evt = new AsyncEvent(data.service, data.type, data.payload);
+    /**
+     * Allow payload to contain Service but do not serialize them
+     * replacing them by a #Webda:Service:${service.getName()} so it
+     * can be revived
+     *
+     * @returns
+     */
+    toJSON() {
+        return Object.assign(Object.assign({}, this), { payload: JSON.stringify(this.payload, (key, value) => {
+                if (value instanceof service_1.Service) {
+                    return `${AsyncEvent.ServiceTag}${value.getName()}`;
+                }
+                return value;
+            }) });
+    }
+    /**
+     * Deserialize from the queue, reviving any detected service
+     *
+     * @param data
+     * @param service
+     * @returns
+     */
+    static fromQueue(data, service) {
+        let evt = new AsyncEvent(data.service, data.type, JSON.parse(data.payload, (key, value) => {
+            if (typeof value === "string" && value.startsWith(AsyncEvent.ServiceTag)) {
+                return service.getService(value.substr(AsyncEvent.ServiceTag.length));
+            }
+            return value;
+        }));
         evt.time = data.time;
         return evt;
     }
+    /**
+     * Mapper name
+     * @returns
+     */
     getMapper() {
         return this.service + "_" + this.type;
     }
 }
+exports.AsyncEvent = AsyncEvent;
+/**
+ * Used when serializing a service
+ */
+AsyncEvent.ServiceTag = "#Webda:Service:";
+/**
+ * @inheritdoc
+ */
 class EventServiceParameters extends service_1.ServiceParameters {
-    constructor() {
-        super(...arguments);
-        /**
-         * Make the event sending asynchronous
-         */
-        this.sync = false;
+    /**
+     * @inheritdoc
+     */
+    constructor(params) {
+        var _a, _b;
+        super(params);
+        (_a = this.queues) !== null && _a !== void 0 ? _a : (this.queues = {});
+        (_b = this.sync) !== null && _b !== void 0 ? _b : (this.sync = false);
     }
 }
 exports.EventServiceParameters = EventServiceParameters;
@@ -62,15 +106,13 @@ class EventService extends service_1.Service {
      */
     computeParameters() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.parameters.queues) {
-                Object.keys(this.parameters.queues).forEach(key => {
-                    // Define default as first queue
-                    if (!this._defaultQueue) {
-                        this._defaultQueue = key;
-                    }
-                    this._queues[key] = this.getService(this.parameters.queues[key]);
-                });
-            }
+            Object.keys(this.parameters.queues).forEach(key => {
+                // Define default as first queue
+                if (!this._defaultQueue) {
+                    this._defaultQueue = key;
+                }
+                this._queues[key] = this.getService(this.parameters.queues[key]);
+            });
             this._async = !this.parameters.sync;
             // Check we have at least one queue to handle asynchronous
             if (this._async && Object.keys(this._queues).length < 1) {
@@ -79,6 +121,30 @@ class EventService extends service_1.Service {
             }
         });
     }
+    /**
+     * Bind a asynchronous event
+     *
+     * ```mermaid
+     * sequenceDiagram
+     *  participant S as Service
+     *  participant As as AsyncEventService
+     *  participant Q as Queue
+     *  participant Aw as AsyncEventService Worker
+     *
+     *  As->>S: Bind event to a sendQueue listener
+     *  activate As
+     *  S->>As: Emit event
+     *  As->>Q: Push the event to the queue
+     *  deactivate As
+     *  Aw->>Q: Consume queue
+     *  Aw->>Aw: Call the original listener
+     * ```
+     *
+     * @param service
+     * @param event
+     * @param callback
+     * @param queue
+     */
     bindAsyncListener(service, event, callback, queue) {
         if (!this._async) {
             throw Error("EventService is not configured for asynchronous");
@@ -93,35 +159,64 @@ class EventService extends service_1.Service {
         }
         this._callbacks[mapper].push(callback);
     }
+    /**
+     * Synchronous Listener to proxy to async
+     *
+     * @param service
+     * @param type
+     * @param queue
+     * @param payload
+     * @returns
+     */
     pushEvent(service, type, queue, payload) {
-        let event = new AsyncEvent(service.getName(), type, payload);
-        if (this._async) {
-            return this._queues[queue].sendMessage(event);
-        }
-        else {
-            return this._handleEvent(event);
-        }
+        return __awaiter(this, void 0, void 0, function* () {
+            let event = new AsyncEvent(service.getName(), type, payload);
+            if (this._async) {
+                return this._queues[queue].sendMessage(event);
+            }
+            else {
+                return this.handleEvent(event);
+            }
+        });
     }
-    _handleEvent(event) {
-        if (!this._callbacks[event.getMapper()]) {
-            return Promise.reject("Callbacks should not be empty");
-        }
-        let promises = [];
-        this._callbacks[event.getMapper()].map(executor => {
-            promises.push(executor(event.payload, event));
+    /**
+     * Process one event
+     *
+     * @param event
+     * @returns
+     */
+    handleEvent(event) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this._callbacks[event.getMapper()]) {
+                return Promise.reject("Callbacks should not be empty, possible application version mismatch between emitter and worker");
+            }
+            let promises = [];
+            this._callbacks[event.getMapper()].map(executor => {
+                promises.push(executor(event.payload, event));
+            });
+            // Need to handle the failure
+            yield Promise.all(promises);
         });
-        // Need to handle the failure
-        return Promise.all(promises);
     }
-    _handleEvents(events) {
-        events.map(event => {
-            this._handleEvent(AsyncEvent.fromQueue(JSON.parse(event.Body)));
+    /**
+     *
+     * @param eventBody serialized event
+     * @returns
+     */
+    handleRawEvent(event) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.handleEvent(AsyncEvent.fromQueue(event, this));
         });
     }
-    worker(queue) {
+    /**
+     * Process asynchronous event on queue
+     * @param queue
+     * @returns
+     */
+    worker(queue = this._defaultQueue) {
         // Avoid loops
         this._async = false;
-        return this._queues[queue].worker(this._handleEvents);
+        return this._queues[queue].consume(this.handleRawEvent.bind(this));
     }
 }
 exports.EventService = EventService;

package/lib/services/asyncevents.js.map

@@ -1 +1 @@
-{"version":3,"file":"asyncevents.js","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"asyncevents.js","sourceRoot":"","sources":["../../src/services/asyncevents.ts"],"names":[],"mappings":"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"}

package/lib/services/asyncevents.spec.js

@@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const assert = require("assert");
 const mocha_1 = require("@testdeck/mocha");
 const test_1 = require("../test");
+const asyncevents_1 = require("./asyncevents");
+const sinon = require("sinon");
 let AsyncEventsTest = class AsyncEventsTest extends test_1.WebdaTest {
     simple() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -50,12 +52,14 @@ let AsyncEventsTest = class AsyncEventsTest extends test_1.WebdaTest {
             // We need to emulate the worker as it wont stop pulling from the queue
             assert.strictEqual(eventsCount, 0);
             assert.strictEqual(priorityEventsCount, 0);
-            let evt = yield defaultQueue.receiveMessage();
-            yield eventService._handleEvents(evt);
+            let evts = yield defaultQueue.receiveMessage();
+            // @ts-ignore
+            yield eventService.handleRawEvent(evts[0].Message);
             assert.strictEqual(eventsCount, 1);
             assert.strictEqual(priorityEventsCount, 0);
-            evt = yield priorityQueue.receiveMessage();
-            yield eventService._handleEvents(evt);
+            evts = yield priorityQueue.receiveMessage();
+            // @ts-ignore
+            yield eventService.handleRawEvent(evts[0].Message);
             assert.strictEqual(eventsCount, 1);
             assert.strictEqual(priorityEventsCount, 1);
             // Disable async and verify that it directly update now
@@ -71,10 +75,60 @@ let AsyncEventsTest = class AsyncEventsTest extends test_1.WebdaTest {
             assert.strictEqual(priorityEventsCount, 2);
         });
     }
+    worker() {
+        let eventService = this.webda.getService("AsyncEvents");
+        eventService._queues = {
+            plop: {
+                // @ts-ignore
+                consume: () => "ploper"
+            },
+            default: {
+                // @ts-ignore
+                consume: () => "default"
+            }
+        };
+        assert.strictEqual(eventService.worker("plop"), "ploper");
+        assert.strictEqual(eventService.worker(), "default");
+    }
+    computeParameters() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let evt = new asyncevents_1.EventService(this.webda, "none", { sync: false });
+            yield assert.rejects(() => evt.computeParameters(), /Need at least one queue for async to be ready/);
+        });
+    }
+    cov() {
+        return __awaiter(this, void 0, void 0, function* () {
+            let evt = new asyncevents_1.EventService(this.webda, "none", { sync: true });
+            assert.throws(() => evt.bindAsyncListener(evt, "plop", undefined, "plop"), /EventService is not configured for asynchronous/);
+            yield assert.rejects(
+            // @ts-ignore
+            () => evt.handleEvent({ getMapper: () => "plop" }), /Callbacks should not be empty, possible application version mismatch between emitter and worker/);
+            evt._async = true;
+            let stub = sinon.spy(this.webda.getService("users"), "on");
+            try {
+                evt.bindAsyncListener(this.webda.getService("users"), "plop", () => { }, "priority");
+                evt.bindAsyncListener(this.webda.getService("users"), "plop", () => { }, "priority");
+                // Should call 'on' only once
+                assert.strictEqual(stub.callCount, 1);
+            }
+            finally {
+                stub.restore();
+            }
+        });
+    }
 };
 __decorate([
     mocha_1.test
 ], AsyncEventsTest.prototype, "simple", null);
+__decorate([
+    mocha_1.test
+], AsyncEventsTest.prototype, "worker", null);
+__decorate([
+    mocha_1.test
+], AsyncEventsTest.prototype, "computeParameters", null);
+__decorate([
+    mocha_1.test
+], AsyncEventsTest.prototype, "cov", null);
 AsyncEventsTest = __decorate([
     mocha_1.suite
 ], AsyncEventsTest);

package/lib/services/asyncevents.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"asyncevents.spec.js","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"asyncevents.spec.js","sourceRoot":"","sources":["../../src/services/asyncevents.spec.ts"],"names":[],"mappings":"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"}

package/lib/services/authentication.d.ts

@@ -22,6 +22,12 @@ export interface EventAuthenticationRegister extends EventAuthenticationGetMe {
  */
 export interface EventAuthenticationLogout extends EventWithContext {
 }
+/**
+ * Sent when a user update his password
+ */
+export interface EventAuthenticationPasswordUpdate extends EventAuthenticationGetMe {
+    password: string;
+}
 /**
  * Emitted when user login
  */
@@ -29,7 +35,7 @@ export interface EventAuthenticationLogin extends EventWithContext {
     userId: string;
     user?: User;
     identId: string;
-    ident?: Ident;
+    ident: Ident;
 }
 /**
  * Export when a user failed to authenticate with his password
@@ -46,8 +52,9 @@ export interface PasswordVerifier extends Service {
      * return false
      *
      * @param password to verify
+     * @param user to verify from
      */
-    validate(password: string): Promise<boolean>;
+    validate(password: string, user?: User): Promise<boolean>;
 }
 /**
  * Information required to reset a password
@@ -105,6 +112,12 @@ export declare class AuthenticationParameters extends ServiceParameters {
          * @default 3600000 * 4
          */
         delay: number;
+        /**
+         * When a delay is added between two attempt to authenticate
+         *
+         * @default 3
+         */
+        failedLoginBeforeDelay: number;
     };
     password: {
         /**
@@ -129,6 +142,10 @@ export declare class AuthenticationParameters extends ServiceParameters {
      * Redirect to this page when email validation succeed
      */
     successRedirect: string;
+    /**
+     * Redirect to this page once email is validate to finish the registration process
+     */
+    registerRedirect: string;
     constructor(params: any);
 }
 /**
@@ -172,18 +189,41 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
      */
     computeParameters(): void;
     addProvider(name: string): void;
+    /**
+     * Send or resend an email to validate the email address
+     *
+     * @param ctx
+     * @throws 409 if ident is linked to someone else
+     * @throws 412 if the email is already validated
+     * @throws 429 if a validation email has been sent recently
+     */
     _sendEmailValidation(ctx: any): Promise<void>;
     _getMe(ctx: Context): Promise<void>;
     _listAuthentications(ctx: Context): Promise<void>;
-    _registerNewEmail(ctx: any): Promise<void>;
     onIdentLogin(ctx: Context, provider: string, identId: string, profile: any, tokens?: any): Promise<void>;
     registerUser(ctx: Context, datas: any, user?: any): Promise<any>;
     getPasswordRecoveryInfos(uuid: string | User, interval?: number): Promise<PasswordRecoveryInfos>;
     _passwordRecoveryEmail(ctx: Context): Promise<void>;
-    _verifyPassword(password: string): Promise<void>;
+    _verifyPassword(password: string, user?: User): Promise<void>;
     _passwordRecovery(ctx: Context): Promise<void>;
     _handleEmailCallback(ctx: Context): Promise<void>;
+    /**
+     * Send an email to recover the user password
+     *
+     * @param ctx
+     * @param user
+     * @param email
+     * @returns
+     */
     sendRecoveryEmail(ctx: Context, user: any, email: string): Promise<any>;
+    /**
+     * Send an email to validate the user email by sending a unique link to
+     * his email
+     *
+     * @param ctx
+     * @param email
+     * @returns
+     */
     sendValidationEmail(ctx: Context, email: string): Promise<any>;
     /**
      * Create a SHA256 of the info
@@ -215,9 +255,21 @@ declare class Authentication<T extends AuthenticationParameters = Authentication
      * @param ident
      * @returns
      */
-    login(ctx: Context, user: User | string, ident: Ident | string): Promise<any[]>;
+    login(ctx: Context, user: User | string, ident: Ident): Promise<any[]>;
     getMailMan(): Mailer;
+    /**
+     * Handle a user login request
+     *
+     * @param ctx
+     * @param ident
+     */
     protected handleLogin(ctx: Context, ident: Ident): Promise<void>;
+    /**
+     * Handle the POST /auth/email
+     *
+     * @param ctx
+     * @returns
+     */
     _handleEmail(ctx: Context): Promise<any>;
     generateEmailValidationToken(user: string, email: string): string;
     /** @inheritdoc */