@webda/core 2.0.0-beta.0 → 2.0.0-beta.3

package/lib/utils/session.d.ts

@@ -0,0 +1,120 @@
+import { CoreModel } from "../models/coremodel";
+import CryptoService, { JWTOptions } from "../services/cryptoservice";
+import { DeepPartial, Service, ServiceParameters } from "../services/service";
+import { Store } from "../stores/store";
+import { Context } from "./context";
+import { CookieOptions } from "./cookie";
+/**
+ * Manage load and save of sessions
+ */
+export declare abstract class SessionManager<T extends ServiceParameters = ServiceParameters> extends Service<T> {
+    /**
+     * Load a session based on context
+     * @param context
+     */
+    abstract load(context: Context): Promise<Session>;
+    /**
+     * Save the session within the context
+     * @param context
+     * @param session
+     */
+    abstract save(context: Context, session: Session): Promise<void>;
+}
+export declare class CookieSessionParameters extends ServiceParameters {
+    /**
+     * Options for issue JWT token
+     */
+    jwt?: JWTOptions;
+    /**
+     * Cookie configuration for session
+     */
+    cookie?: CookieOptions;
+    constructor(params: any);
+}
+/**
+ * SessionManager that store info in a cookie
+ *
+ * If SessionStore service exists, only uuid is in the cookie
+ * the rest of data is stored within the session store
+ *
+ * @WebdaModda
+ */
+export declare class CookieSessionManager<T extends CookieSessionParameters = CookieSessionParameters> extends SessionManager<T> {
+    cryptoService: CryptoService;
+    sessionStore: Store<CoreModel & {
+        session: any;
+    }>;
+    /**
+     * @override
+     */
+    loadParameters(params: DeepPartial<T>): ServiceParameters;
+    /**
+     * @override
+     */
+    resolve(): this;
+    /**
+     * @override
+     */
+    load(context: Context): Promise<Session>;
+    /**
+     * @override
+     */
+    save(context: Context, session: Session): Promise<void>;
+}
+/**
+ * Session model
+ *
+ * @WebdaModel
+ */
+export declare class Session {
+    protected changed: boolean;
+    /**
+     * Session uuid
+     */
+    uuid: string;
+    /**
+     * User id
+     */
+    userId: string;
+    /**
+     * Ident used
+     */
+    identUsed: string;
+    /**
+     * User current roles
+     */
+    roles: string[];
+    /**
+     * Login
+     * @param userId
+     * @param identUsed
+     */
+    login(userId: string, identUsed: string): void;
+    /**
+     * Logout
+     */
+    logout(): void;
+    /**
+     * If session is authenticated
+     */
+    isLogged(): boolean;
+    /**
+     * Session is dirty and requires save
+     * @returns
+     */
+    isDirty(): boolean;
+    /**
+     * Get the proxy to be able to track modification
+     * @returns
+     */
+    getProxy(): this;
+}
+/**
+ * Unknown session that allows all keys
+ */
+export declare class UnknownSession extends Session {
+    /**
+     * Allow any type of fields
+     */
+    [key: string]: any;
+}

package/lib/utils/session.js

@@ -0,0 +1,177 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnknownSession = exports.Session = exports.CookieSessionManager = exports.CookieSessionParameters = exports.SessionManager = void 0;
+const coremodel_1 = require("../models/coremodel");
+const service_1 = require("../services/service");
+const cookie_1 = require("./cookie");
+/**
+ * Manage load and save of sessions
+ */
+class SessionManager extends service_1.Service {
+}
+exports.SessionManager = SessionManager;
+class CookieSessionParameters extends service_1.ServiceParameters {
+    constructor(params) {
+        var _a;
+        super(params);
+        (_a = this.cookie) !== null && _a !== void 0 ? _a : (this.cookie = new cookie_1.CookieOptions({}));
+    }
+}
+exports.CookieSessionParameters = CookieSessionParameters;
+/**
+ * SessionManager that store info in a cookie
+ *
+ * If SessionStore service exists, only uuid is in the cookie
+ * the rest of data is stored within the session store
+ *
+ * @WebdaModda
+ */
+class CookieSessionManager extends SessionManager {
+    /**
+     * @override
+     */
+    loadParameters(params) {
+        return new CookieSessionParameters(params);
+    }
+    /**
+     * @override
+     */
+    resolve() {
+        super.resolve();
+        if (this.sessionStore && this.sessionStore.getParameters().expose) {
+            throw new Error("SessionStore should not be exposed");
+        }
+        return this;
+    }
+    /**
+     * @override
+     */
+    load(context) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const session = new Session();
+            let cookie = yield cookie_1.SecureCookie.load(this.parameters.cookie.name, context, this.parameters.jwt);
+            if (this.sessionStore) {
+                if (cookie.sub) {
+                    Object.assign(session, (_a = (yield this.sessionStore.get(cookie.sub))) === null || _a === void 0 ? void 0 : _a.session);
+                }
+                (_b = session.uuid) !== null && _b !== void 0 ? _b : (session.uuid = context.getWebda().getUuid("base64"));
+            }
+            else {
+                Object.assign(session, cookie);
+            }
+            return session;
+        });
+    }
+    /**
+     * @override
+     */
+    save(context, session) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // If store is found session info are stored in db
+            if (this.sessionStore) {
+                yield this.sessionStore.save({
+                    uuid: session.uuid,
+                    session,
+                    ttl: Date.now() + this.parameters.cookie.maxAge * 1000
+                });
+                cookie_1.SecureCookie.save(this.parameters.cookie.name, context, {}, Object.assign(Object.assign({}, this.parameters.jwt), { subject: session.uuid }));
+                return;
+            }
+            cookie_1.SecureCookie.save(this.parameters.cookie.name, context, session, this.parameters.jwt);
+        });
+    }
+}
+__decorate([
+    (0, service_1.Inject)("CryptoService")
+], CookieSessionManager.prototype, "cryptoService", void 0);
+__decorate([
+    (0, service_1.Inject)("SessionStore", true)
+], CookieSessionManager.prototype, "sessionStore", void 0);
+exports.CookieSessionManager = CookieSessionManager;
+/**
+ * Session model
+ *
+ * @WebdaModel
+ */
+class Session {
+    constructor() {
+        this.changed = false;
+    }
+    /**
+     * Login
+     * @param userId
+     * @param identUsed
+     */
+    login(userId, identUsed) {
+        this.userId = userId;
+        this.identUsed = identUsed;
+    }
+    /**
+     * Logout
+     */
+    logout() {
+        delete this.userId;
+        delete this.identUsed;
+        delete this.roles;
+    }
+    /**
+     * If session is authenticated
+     */
+    isLogged() {
+        return this.userId !== undefined;
+    }
+    /**
+     * Session is dirty and requires save
+     * @returns
+     */
+    isDirty() {
+        return this.changed;
+    }
+    /**
+     * Get the proxy to be able to track modification
+     * @returns
+     */
+    getProxy() {
+        const proxyHandler = {
+            set: (obj, property, value) => {
+                this.changed = true;
+                obj[property] = value;
+                return true;
+            },
+            get: (obj, property) => {
+                if (typeof obj[property] === "object") {
+                    return new Proxy(obj[property], proxyHandler);
+                }
+                return obj[property];
+            }
+        };
+        return new Proxy(this, proxyHandler);
+    }
+}
+__decorate([
+    coremodel_1.NotEnumerable
+], Session.prototype, "changed", void 0);
+exports.Session = Session;
+/**
+ * Unknown session that allows all keys
+ */
+class UnknownSession extends Session {
+}
+exports.UnknownSession = UnknownSession;
+//# sourceMappingURL=session.js.map

package/lib/utils/session.js.map

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

package/lib/utils/session.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/utils/session.spec.js

@@ -0,0 +1,79 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mocha_1 = require("@testdeck/mocha");
+const assert = require("assert");
+const memory_1 = require("../stores/memory");
+const test_1 = require("../test");
+const session_1 = require("./session");
+let SessionTest = class SessionTest {
+    basic() {
+        let session = new session_1.UnknownSession().getProxy();
+        session.plop = "test";
+        assert.ok(session.isDirty());
+        assert.ok(!session.isLogged());
+        session.login("user1", "ident1");
+        assert.ok(session.isLogged());
+        session.logout();
+        assert.ok(!session.isLogged());
+    }
+};
+__decorate([
+    mocha_1.test
+], SessionTest.prototype, "basic", null);
+SessionTest = __decorate([
+    mocha_1.suite
+], SessionTest);
+let SessionStoreTest = class SessionStoreTest extends test_1.WebdaTest {
+    sessionStore() {
+        return __awaiter(this, void 0, void 0, function* () {
+            // Test MemoryStore
+            const store = (this.webda.getServices()["sessionstore"] = yield new memory_1.MemoryStore(this.webda, "SessionStore", {})
+                .resolve()
+                .init());
+            store.getParameters().expose = { url: "url" };
+            assert.throws(() => this.getService("SessionManager").resolve(), /SessionStore should not be exposed/);
+            store.getParameters().expose = undefined;
+            this.getService("SessionManager").resolve();
+            let ctx = yield this.newContext();
+            ctx.getSession().identUsed = "bouzouf";
+            yield ctx.end();
+            let sessions = yield store.getAll();
+            assert.strictEqual(sessions.length, 1);
+            let cookie = yield this.webda.getCrypto().jwtVerify(ctx.getResponseCookies()["test"].value);
+            assert.strictEqual(cookie.uuid, undefined);
+            assert.strictEqual(cookie.identUsed, undefined);
+            assert.strictEqual(cookie.sub, sessions[0].getUuid());
+            let ctx2 = yield this.newContext();
+            ctx2.getHttpContext().cookies = {
+                test: ctx.getResponseCookies()["test"].value
+            };
+            yield ctx2.init();
+            let session = ctx2.getSession();
+            assert.strictEqual(session.uuid, sessions[0].getUuid());
+            assert.strictEqual(session.identUsed, "bouzouf");
+            assert.strictEqual(session.sub, undefined);
+        });
+    }
+};
+__decorate([
+    mocha_1.test
+], SessionStoreTest.prototype, "sessionStore", null);
+SessionStoreTest = __decorate([
+    mocha_1.suite
+], SessionStoreTest);
+//# sourceMappingURL=session.spec.js.map

package/lib/utils/session.spec.js.map

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

package/lib/utils/waiter.js.map

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

package/lib/utils/waiter.spec.js

@@ -16,10 +16,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const mocha_1 = require("@testdeck/mocha");
-const logger_1 = require("./logger");
 const assert = require("assert");
-const waiter_1 = require("./waiter");
 const sinon = require("sinon");
+const logger_1 = require("./logger");
+const waiter_1 = require("./waiter");
 let WaiterTest = class WaiterTest {
     cancellablePromise() {
         return __awaiter(this, void 0, void 0, function* () {

package/lib/utils/waiter.spec.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/core",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.3",
   "description": "Expose API with Lambda",
   "keywords": [
     "aws",
@@ -17,11 +17,11 @@
     "pretest": "npm run build",
     "lint": "prettier --check src/**/*",
     "lint:fix": "prettier --write src/**/*",
-    "test": "nyc mocha --recursive --exit --timeout=100000 -r ../../node_modules/ts-node/register src/**/*.spec.ts src/*.spec.ts src/**/**/*.spec.ts"
+    "test": "nyc mocha --recursive --exit --timeout=30000 -r ../../node_modules/ts-node/register src/**/*.spec.ts src/*.spec.ts src/**/**/*.spec.ts"
   },
   "dependencies": {
     "@types/json-schema": "^7.0.8",
-    "@webda/workout": "^2.0.0-beta.0",
+    "@webda/workout": "^2.0.0-beta.3",
     "accept-language": "^3.0.18",
     "ajv": "^8.6.2",
     "ajv-formats": "^2.1.1",
@@ -41,10 +41,13 @@
     "mime-types": "^2.1.31",
     "mustache": "^4.2.0",
     "node-cron": "^3.0.0",
+    "node-machine-id": "^1.1.12",
     "nodemailer": "^6.6.3",
-    "openapi-types": "^11.0.0",
+    "openapi-types": "^12.0.0",
+    "pem-jwk": "^2.0.0",
     "sanitize-html": "^2.4.0",
     "semver": "^7.3.5",
+    "stream-buffers": "^3.0.2",
     "ts-method-cache": "^3.3.1",
     "uri-templates": "^0.2.0",
     "uuid": "^8.3.2",
@@ -61,10 +64,10 @@
     "mocha": "^10.0.0",
     "nyc": "^15.1.0",
     "prettier": "^2.3.2",
-    "sinon": "^13.0.1",
+    "sinon": "^14.0.0",
     "source-map-support": "^0.5.19",
     "ts-node": "^10.1.0",
-    "typescript": "~4.6.3"
+    "typescript": "~4.7.2"
   },
   "files": [
     "lib",
@@ -94,5 +97,5 @@
   "webda": {
     "namespace": "Webda"
   },
-  "gitHead": "5a559bca55832e9a6526794117e2f78188eba3d0"
+  "gitHead": "f95827566d42d22c32aed524b74d0446fff66ed4"
 }

package/test/config.json

@@ -2,7 +2,8 @@
   "version": 2,
   "parameters": {
     "cookie": {
-      "sameSite": "None"
+      "sameSite": "None",
+      "name": "test"
     },
     "TEST": "Global",
     "region": "us-east-1",
@@ -20,7 +21,8 @@
   "services": {
     "ResourceService": {
       "type": "Webda/ResourceService",
-      "folder": "test"
+      "folder": "test",
+      "indexFallback": false
     },
     "VersionService": {
       "type": "Webda/VersionService"

package/test/models/task.js

@@ -1,7 +1,6 @@
 "use strict";
 const Webda = require("../../src/index");
 const OwnerModel = Webda.OwnerModel;
-const Context = Webda.Context;
 
 /**
  * @class

package/webda.module.json

@@ -3,9 +3,11 @@
     "webda/aggregator": "lib/stores/aggregator:default",
     "webda/asyncevents": "lib/services/asyncevents:EventService",
     "webda/authentication": "lib/services/authentication:Authentication",
+    "webda/cookiesessionmanager": "lib/utils/session:CookieSessionManager",
     "webda/configurationservice": "lib/services/configuration:default",
     "webda/consolelogger": "lib/utils/logger:ConsoleLoggerService",
     "webda/cronservice": "lib/services/cron:CronService",
+    "webda/cryptoservice": "lib/services/cryptoservice:CryptoService",
     "webda/debugmailer": "lib/services/debugmailer:default",
     "webda/echoservice": "lib/services/echo:EchoService",
     "webda/filebinary": "lib/services/filebinary:FileBinary",
@@ -31,8 +33,7 @@
     "webda/coremodel": "lib/models/coremodel:CoreModel",
     "webda/ident": "lib/models/ident:Ident",
     "webda/ownermodel": "lib/models/ownermodel:OwnerModel",
-    "webda/securecookie": "lib/utils/cookie:SecureCookie",
-    "webda/sessioncookie": "lib/utils/cookie:SessionCookie",
+    "webda/session": "lib/utils/session:Session",
     "webda/user": "lib/models/user:User"
   },
   "deployers": {},