spec-3nweb-server 1.7.0 → 1.7.5

package/build/3nstorage/3nstorage-app.d.ts

@@ -1,4 +1,7 @@
+import { Factory as UsersFactory } from './resources/users';
+import { SessionsFactory } from './resources/sessions';
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
 import { ErrLogger } from '../lib-server/middleware/error-handler';
 import { AppWithWSs } from '../lib-server/web-sockets/app';
-export declare function makeApp(dataFolder: string, domain: string, midAuthorizer: MidAuthorizer, errLogger?: ErrLogger): AppWithWSs;
+export declare function makeStorageApp(dataFolder: string, domain: string, midAuthorizer: MidAuthorizer, errLogger?: ErrLogger): AppWithWSs;
+export declare function makeStorageAppForLocker(users: UsersFactory, ownersSessions: SessionsFactory, sharingSessions: SessionsFactory, errLogger?: ErrLogger): AppWithWSs;

package/build/3nstorage/3nstorage-app.js

@@ -16,18 +16,18 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeApp = void 0;
+exports.makeStorageAppForLocker = exports.makeStorageApp = void 0;
 const users_1 = require("./resources/users");
 const sessions_1 = require("./resources/sessions");
 const error_handler_1 = require("../lib-server/middleware/error-handler");
 const app_1 = require("../lib-server/web-sockets/app");
-const owners = require("./owner");
-const sharing = require("./shared");
+const owner_1 = require("./owner");
+const shared_1 = require("./shared");
 const PATHS = {
     owner: '/owner/',
     shared: '/shared/'
 };
-function setupStaticEntryRoute(app) {
+function setupStaticStorageEntryRoute(app) {
     app.route('/')
         .get((req, res) => {
         let path = req.originalUrl;
@@ -42,16 +42,25 @@ function setupStaticEntryRoute(app) {
         res.status(200).json(json);
     });
 }
-function makeApp(dataFolder, domain, midAuthorizer, errLogger) {
+function makeStorageApp(dataFolder, domain, midAuthorizer, errLogger) {
     const app = new app_1.AppWithWSs();
     const ownersSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
     const sharingSessions = (0, sessions_1.makeSessionFactory)(20 * 60);
     const users = (0, users_1.makeFactory)(dataFolder);
-    setupStaticEntryRoute(app.http);
-    app.use(PATHS.owner, owners.makeApp(domain, ownersSessions, users, midAuthorizer));
-    app.http.use(PATHS.shared, sharing.makeApp(sharingSessions, users));
+    setupStaticStorageEntryRoute(app.http);
+    app.use(PATHS.owner, (0, owner_1.makeOwnerStorageApp)(domain, ownersSessions, users, midAuthorizer));
+    app.http.use(PATHS.shared, (0, shared_1.makeSharedStorageApp)(sharingSessions, users));
     app.http.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
-exports.makeApp = makeApp;
+exports.makeStorageApp = makeStorageApp;
+function makeStorageAppForLocker(users, ownersSessions, sharingSessions, errLogger) {
+    const app = new app_1.AppWithWSs();
+    setupStaticStorageEntryRoute(app.http);
+    app.use(PATHS.owner, (0, owner_1.makeOwnerStorageForLocker)(ownersSessions, users));
+    app.http.use(PATHS.shared, (0, shared_1.makeSharedStorageApp)(sharingSessions, users));
+    app.http.use((0, error_handler_1.makeErrHandler)(errLogger));
+    return app;
+}
+exports.makeStorageAppForLocker = makeStorageAppForLocker;
 Object.freeze(exports);

package/build/3nstorage/owner.d.ts

@@ -1,5 +1,6 @@
 import { AppWithWSs } from '../lib-server/web-sockets/app';
 import { SessionsFactory } from './resources/sessions';
-import { Factory as usersFactory } from './resources/users';
+import { Factory as UsersFactory } from './resources/users';
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
-export declare function makeApp(domain: string, sessions: SessionsFactory, users: usersFactory, midAuthorizer: MidAuthorizer): AppWithWSs;
+export declare function makeOwnerStorageApp(domain: string, sessions: SessionsFactory, users: UsersFactory, midAuthorizer: MidAuthorizer): AppWithWSs;
+export declare function makeOwnerStorageForLocker(sessions: SessionsFactory, users: UsersFactory): AppWithWSs;

package/build/3nstorage/owner.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2022, 2024 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -13,20 +13,13 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeApp = void 0;
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express 3NStorage owners' application.
- */
-// Internal libs
+exports.makeOwnerStorageForLocker = exports.makeOwnerStorageApp = void 0;
 const body_parsers_1 = require("../lib-server/middleware/body-parsers");
 const app_1 = require("../lib-server/web-sockets/app");
 const server_events_1 = require("../lib-server/web-sockets/server-events");
-// routes
-const mid_auth_1 = require("../lib-server/routes/sessions/mid-auth");
-const start_1 = require("../lib-server/routes/sessions/start");
 const close_1 = require("../lib-server/routes/sessions/close");
 const session_params_1 = require("./routes/owner/session-params");
 const param_getter_1 = require("./routes/owner/param-getter");
@@ -39,13 +32,28 @@ const delete_obj_1 = require("./routes/owner/delete-obj");
 const archive_obj_version_1 = require("./routes/owner/archive-obj-version");
 const get_obj_status_1 = require("./routes/owner/get-obj-status");
 const api = require("../lib-common/service-api/3nstorage/owner");
-function makeApp(domain, sessions, users, midAuthorizer) {
+const mid_access_1 = require("../lib-server/mid-access");
+function makeOwnerStorageApp(domain, sessions, users, midAuthorizer) {
     const app = new app_1.AppWithWSs();
-    setHttpPart(app, domain, sessions, users, midAuthorizer);
+    const setupLoginRoutes = (app, urlPrefix) => (0, mid_access_1.addMailerIdLoginRoutes)(app, domain, urlPrefix, sessions, users.exists, midAuthorizer);
+    setHttpPart(app.http, setupLoginRoutes, sessions, users);
     setWSPart(app, sessions, users);
     return app;
 }
-exports.makeApp = makeApp;
+exports.makeOwnerStorageApp = makeOwnerStorageApp;
+function makeOwnerStorageForLocker(sessions, users) {
+    const app = new app_1.AppWithWSs();
+    // XXX WIP
+    // const setupLoginRoutes: SetupLoginRoutes = (
+    // 	app, urlPrefix
+    // ) => addPKLLoginRoutes(
+    // 	app, urlPrefix, getUserParamsAndKey, sessions, calcNaClBoxSharedKey
+    // );
+    // setHttpPart(app.http, setupLoginRoutes, sessions, users);
+    setWSPart(app, sessions, users);
+    return app;
+}
+exports.makeOwnerStorageForLocker = makeOwnerStorageForLocker;
 function setWSPart(app, sessions, users) {
     const sockets = new app_1.UserSockets(sessions.ensureAuthorizedSessionForSocketStart());
     const storageEvents = new server_events_1.ServerEvents(undefined, api.events.all, sockets.socketGetter);
@@ -55,49 +63,48 @@ function setWSPart(app, sessions, users) {
     app.addWS(api.wsEventChannel.URL_END, sockets);
 }
 const MAX_CHUNK_SIZE = '0.5mb';
-function setHttpPart(app, domain, sessions, users, midAuthorizer) {
-    app.http.disable('etag');
+function setHttpPart(app, setupLoginRoutes, sessions, users) {
+    app.disable('etag');
     // Login
-    app.http.post('/' + api.midLogin.START_URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_1.startSession)(users.exists, sessions.generate));
-    app.http.post('/' + api.midLogin.AUTH_URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.json)('4kb'), (0, mid_auth_1.midLogin)(domain, midAuthorizer));
+    setupLoginRoutes(app, '/' + api.midLogin.URL_PART);
     // *** Require authorized session for everything below ***
-    app.http.use(sessions.ensureAuthorizedSession());
-    app.http.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
+    app.use(sessions.ensureAuthorizedSession());
+    app.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
     // Session params
-    app.http.get('/' + api.sessionParams.URL_END, (0, session_params_1.sessionParams)(MAX_CHUNK_SIZE));
+    app.get('/' + api.sessionParams.URL_END, (0, session_params_1.sessionParams)(MAX_CHUNK_SIZE));
     // Key derivation params
-    app.http.route('/' + api.keyDerivParams.URL_END)
+    app.route('/' + api.keyDerivParams.URL_END)
         .get((0, param_getter_1.getParam)(users.getKeyDerivParams))
         .put((0, body_parsers_1.json)('1kb'), (0, param_setter_1.setParam)(users.setKeyDerivParams));
     // Transaction canceling
-    app.http.post('/' + api.cancelTransaction.EXPRESS_URL_END, (0, body_parsers_1.emptyBody)(), (0, cancel_trans_1.cancelTransaction)(false, users.cancelTransaction));
-    app.http.post('/' + api.cancelRootTransaction.EXPRESS_URL_END, (0, body_parsers_1.emptyBody)(), (0, cancel_trans_1.cancelTransaction)(true, users.cancelTransaction));
+    app.post('/' + api.cancelTransaction.EXPRESS_URL_END, (0, body_parsers_1.emptyBody)(), (0, cancel_trans_1.cancelTransaction)(false, users.cancelTransaction));
+    app.post('/' + api.cancelRootTransaction.EXPRESS_URL_END, (0, body_parsers_1.emptyBody)(), (0, cancel_trans_1.cancelTransaction)(true, users.cancelTransaction));
     // Getting and updating current root object
-    app.http.route('/' + api.currentRootObj.EXPRESS_URL_END)
+    app.route('/' + api.currentRootObj.EXPRESS_URL_END)
         .get((0, get_current_obj_1.getCurrentObj)(true, users.getCurrentRootObj))
         .put((0, put_current_obj_1.saveCurrentObj)(true, users.saveNewRootVersion, MAX_CHUNK_SIZE));
     // Getting, updating and removing current non-root objects
-    app.http.route('/' + api.currentObj.EXPRESS_URL_END)
+    app.route('/' + api.currentObj.EXPRESS_URL_END)
         .get((0, get_current_obj_1.getCurrentObj)(false, users.getCurrentObj))
         .delete((0, delete_obj_1.deleteCurrentObjVer)(users.deleteCurrentObjVersion))
         .put((0, put_current_obj_1.saveCurrentObj)(false, users.saveNewObjVersion, MAX_CHUNK_SIZE));
     // Getting root archived versions
-    app.http.route('/' + api.archivedRootVersion.EXPRESS_URL_END)
+    app.route('/' + api.archivedRootVersion.EXPRESS_URL_END)
         .get((0, get_archived_obj_ver_1.getArchivedObjVersion)(true, users.getArchivedRootVersion));
     // Getting non-root object archived versions
-    app.http.route('/' + api.archivedObjVersion.EXPRESS_URL_END)
+    app.route('/' + api.archivedObjVersion.EXPRESS_URL_END)
         .get((0, get_archived_obj_ver_1.getArchivedObjVersion)(false, users.getArchivedObjVersion));
     // Archive root's current version
-    app.http.route('/' + api.archiveRoot.EXPRESS_URL_END)
+    app.route('/' + api.archiveRoot.EXPRESS_URL_END)
         .post((0, body_parsers_1.emptyBody)(), (0, archive_obj_version_1.archiveCurrentObjVersion)(true, users.archiveObjVersion))
         .delete((0, delete_obj_1.deleteArchivedObjVer)(true, users.deleteArchivedObjVersion));
     // Archive non-root object's current version
-    app.http.route('/' + api.archiveObj.EXPRESS_URL_END)
+    app.route('/' + api.archiveObj.EXPRESS_URL_END)
         .post((0, body_parsers_1.emptyBody)(), (0, archive_obj_version_1.archiveCurrentObjVersion)(false, users.archiveObjVersion))
         .delete((0, delete_obj_1.deleteArchivedObjVer)(false, users.deleteArchivedObjVersion));
     // Getting root object status
-    app.http.get('/' + api.rootStatus.EXPRESS_URL_END, (0, get_obj_status_1.getObjStatus)(true, users.getObjStatus));
+    app.get('/' + api.rootStatus.EXPRESS_URL_END, (0, get_obj_status_1.getObjStatus)(true, users.getObjStatus));
     // Getting object status
-    app.http.get('/' + api.objStatus.EXPRESS_URL_END, (0, get_obj_status_1.getObjStatus)(false, users.getObjStatus));
+    app.get('/' + api.objStatus.EXPRESS_URL_END, (0, get_obj_status_1.getObjStatus)(false, users.getObjStatus));
 }
 Object.freeze(exports);

package/build/3nstorage/resources/sessions.d.ts

@@ -1,6 +1,6 @@
 import { Request as Req, SessionParams, Factory } from '../../lib-server/resources/sessions';
-export declare type SessionsFactory = Factory<SessionParams>;
-export declare type Request = Req<SessionParams>;
+export type SessionsFactory = Factory<SessionParams>;
+export type Request = Req<SessionParams>;
 /**
  * This returns factory, that works properly in a single process application,
  * clearing up sessions that past given timeout.

package/build/3nstorage/resources/sessions.js

@@ -13,7 +13,8 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSessionFactory = void 0;
 const mem_backed_sessions_factory_1 = require("../../lib-server/resources/mem-backed-sessions-factory");

package/build/3nstorage/resources/store.d.ts

@@ -5,7 +5,7 @@ import { UserFiles, ObjReader } from '../../lib-server/resources/user-files';
 import { DiffInfo, events, ObjStatus } from '../../lib-common/service-api/3nstorage/owner';
 export { DiffInfo } from '../../lib-common/service-api/3nstorage/owner';
 export { ObjPipe, ObjReader } from '../../lib-server/resources/user-files';
-export declare type StorageEventsSink = (userId: string, channel: events.EventNameType, event: events.AllTypes) => void;
+export type StorageEventsSink = (userId: string, channel: events.EventNameType, event: events.AllTypes) => void;
 export declare const SC: {
     USER_UNKNOWN: string;
     OBJ_EXIST: string;
@@ -36,7 +36,10 @@ export interface TransactionInfo extends TransactionParams {
     transactionType: 'write' | 'remove' | 'archive';
     transactionId: string;
 }
-export declare class Store extends UserFiles {
+export interface StorageParams {
+    "key-deriv": any;
+}
+export declare class Store extends UserFiles<StorageParams> {
     private storageEventsSink;
     private objVerFiles;
     private statuses;
@@ -112,8 +115,5 @@ export declare class Store extends UserFiles {
     private rmObjFiles;
     archiveCurrentObjVersion(objId: string, version: number): Promise<void>;
     getObjStatus(objId: string): Promise<ObjStatus>;
-    static getSpaceQuota(store: Store): Promise<number>;
-    static getKeyDerivParams(store: Store): Promise<any>;
-    static setKeyDerivParams(store: Store, params: any, setDefault: boolean): Promise<boolean>;
-    getKeyDerivParams(): Promise<any>;
+    setKeyDerivParams(params: any, setDefault: boolean): Promise<boolean>;
 }

package/build/3nstorage/resources/store.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2019 - 2020, 2022 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2019 - 2020, 2022, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -422,25 +422,16 @@ class Store extends user_files_1.UserFiles {
             archived: status.archivedVersions
         };
     }
-    static getSpaceQuota(store) {
-        return store.getSpaceQuota();
-    }
-    static getKeyDerivParams(store) {
-        return store.getParam('key-deriv');
-    }
-    static async setKeyDerivParams(store, params, setDefault) {
+    async setKeyDerivParams(params, setDefault) {
         if (setDefault) {
             params = {};
         }
         else if ((typeof params !== 'object') || Array.isArray(params)) {
             return false;
         }
-        await store.setParam('key-deriv', params);
+        await this.setParam('key-deriv', params);
         return true;
     }
-    getKeyDerivParams() {
-        return this.getParam('key-deriv');
-    }
 }
 exports.Store = Store;
 Object.freeze(Store.prototype);

package/build/3nstorage/resources/users.d.ts

@@ -5,27 +5,27 @@
  * which is created by this module.
  */
 import { Readable as ReadableStream } from 'stream';
-import { ObjReader, StorageEventsSink } from './store';
+import { ObjReader, StorageEventsSink, StorageParams } from './store';
 import { PutObjFirstQueryOpts, PutObjSecondQueryOpts, DiffInfo, ObjStatus } from '../../lib-common/service-api/3nstorage/owner';
 export { SC, ObjReader, MismatchedObjVerException } from './store';
-export declare type UserExists = (userId: string) => Promise<boolean>;
-export declare type GetCurrentObj = (userId: string, objId: string | null, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<{
+export type UserExists = (userId: string) => Promise<boolean>;
+export type GetCurrentObj = (userId: string, objId: string | null, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<{
     version: number;
     reader: ObjReader;
 }>;
-export declare type SaveNewObjVersion = (userId: string, objId: string | null, fstReq: PutObjFirstQueryOpts | undefined, diff: DiffInfo | undefined, sndReq: PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: ReadableStream) => Promise<string | undefined>;
-export declare type GetArchivedObjVersion = (userId: string, objId: string | null, version: number, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
-export declare type CancelTransaction = (userId: string, objId: string, transactionId?: string) => Promise<void>;
-export declare type ArchiveObjCurrentVersion = (userId: string, objId: string, version: number) => Promise<void>;
-export declare type GetObjStatus = (userId: string, objId: string) => Promise<ObjStatus>;
-export declare type DeleteCurrentObjVersion = (userId: string, objId: string, version?: number) => Promise<void>;
-export declare type DeleteArchivedObjVersion = (userId: string, objId: string | null, version: number) => Promise<void>;
-declare type GetParam<T> = (userId: string) => Promise<T>;
-declare type SetParam<T> = (userId: string, param: T) => Promise<boolean>;
-export declare type GetSpaceQuota = GetParam<number>;
-export declare type GetKeyDerivParams = GetParam<any>;
-export declare type SetKeyDerivParams = SetParam<any>;
-export declare type EventsSink = StorageEventsSink;
+export type SaveNewObjVersion = (userId: string, objId: string | null, fstReq: PutObjFirstQueryOpts | undefined, diff: DiffInfo | undefined, sndReq: PutObjSecondQueryOpts | undefined, bytesLen: number, bytes: ReadableStream) => Promise<string | undefined>;
+export type GetArchivedObjVersion = (userId: string, objId: string | null, version: number, header: boolean, segsOffset: number, segsLimit: number | undefined) => Promise<ObjReader>;
+export type CancelTransaction = (userId: string, objId: string, transactionId?: string) => Promise<void>;
+export type ArchiveObjCurrentVersion = (userId: string, objId: string, version: number) => Promise<void>;
+export type GetObjStatus = (userId: string, objId: string) => Promise<ObjStatus>;
+export type DeleteCurrentObjVersion = (userId: string, objId: string, version?: number) => Promise<void>;
+export type DeleteArchivedObjVersion = (userId: string, objId: string | null, version: number) => Promise<void>;
+export type GetSpaceQuota = (userId: string) => Promise<number>;
+type GetParam<P extends keyof StorageParams> = (userId: string) => Promise<StorageParams[P]>;
+type SetParam<P extends keyof StorageParams> = (userId: string, param: StorageParams[P]) => Promise<boolean>;
+export type GetKeyDerivParams = GetParam<'key-deriv'>;
+export type SetKeyDerivParams = SetParam<'key-deriv'>;
+export type EventsSink = StorageEventsSink;
 /**
  * This is an external interface, behind which all storage machinery is hidding.
  */

package/build/3nstorage/resources/users.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2017, 2020 3NSoft Inc.
+ Copyright (C) 2015 - 2017, 2020, 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -46,18 +46,6 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
             return store;
         }
     }
-    function makeParamGetter(staticGetter) {
-        return async (userId) => {
-            const store = await getStore(userId);
-            return staticGetter(store);
-        };
-    }
-    function makeParamSetter(staticSetter) {
-        return async (userId, param, setDefault) => {
-            const store = await getStore(userId);
-            return staticSetter(store, param, !!setDefault);
-        };
-    }
     function makeCurrentObjGetter(isRoot) {
         return async (userId, objId, header, segsOffset, segsLimit) => {
             if ((isRoot && objId) || (!isRoot && !objId)) {
@@ -112,9 +100,18 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
                 return false;
             }
         },
-        getSpaceQuota: makeParamGetter(store_1.Store.getSpaceQuota),
-        getKeyDerivParams: makeParamGetter(store_1.Store.getKeyDerivParams),
-        setKeyDerivParams: makeParamSetter(store_1.Store.setKeyDerivParams),
+        getSpaceQuota: async (userId) => {
+            const store = await getStore(userId);
+            return await store.getSpaceQuota();
+        },
+        getKeyDerivParams: async (userId) => {
+            const store = await getStore(userId);
+            return await store.getParam('key-deriv');
+        },
+        setKeyDerivParams: async (userId, keyParams) => {
+            const store = await getStore(userId);
+            return await store.setKeyDerivParams(keyParams, false);
+        },
         getCurrentRootObj: makeCurrentObjGetter(true),
         getCurrentObj: makeCurrentObjGetter(false),
         getArchivedRootVersion: makeArchivedObjGetter(true),

package/build/3nstorage/shared.d.ts

@@ -1,8 +1,4 @@
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express 3NStorage sharing application.
- */
 import * as express from 'express';
-import { Factory as usersFactory } from './resources/users';
+import { Factory as UsersFactory } from './resources/users';
 import { SessionsFactory } from './resources/sessions';
-export declare function makeApp(sessions: SessionsFactory, users: usersFactory): express.Express;
+export declare function makeSharedStorageApp(sessions: SessionsFactory, users: UsersFactory): express.Express;

package/build/3nstorage/shared.js

@@ -13,17 +13,13 @@
  See the GNU General Public License for more details.
  
  You should have received a copy of the GNU General Public License along with
- this program. If not, see <http://www.gnu.org/licenses/>. */
+ this program. If not, see <http://www.gnu.org/licenses/>.
+*/
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeApp = void 0;
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express 3NStorage sharing application.
- */
+exports.makeSharedStorageApp = void 0;
 const express = require("express");
-// routes
 //import * as api from '../../lib-common/service-api/3nstorage/shared';
-function makeApp(sessions, users) {
+function makeSharedStorageApp(sessions, users) {
     const app = express();
     app.disable('etag');
     // TODO add sharing routes with proper session creation for authorities/capabilities
@@ -36,5 +32,5 @@ function makeApp(sessions, users) {
     //  and file keys.
     return app;
 }
-exports.makeApp = makeApp;
+exports.makeSharedStorageApp = makeSharedStorageApp;
 Object.freeze(exports);

package/build/asmail/asmail-app.d.ts

@@ -1,4 +1,4 @@
 import { AppWithWSs } from '../lib-server/web-sockets/app';
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
 import { ErrLogger } from '../lib-server/middleware/error-handler';
-export declare function makeApp(rootFolder: string, domain: string, midAuthorizer: MidAuthorizer, errLogger?: ErrLogger): AppWithWSs;
+export declare function makeASMailApp(rootFolder: string, domain: string, midAuthorizer: MidAuthorizer, errLogger?: ErrLogger): AppWithWSs;

package/build/asmail/asmail-app.js

@@ -16,7 +16,7 @@
  this program. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeApp = void 0;
+exports.makeASMailApp = void 0;
 const app_1 = require("../lib-server/web-sockets/app");
 const delivery_sessions_1 = require("./resources/delivery-sessions");
 const sessions_1 = require("./resources/sessions");
@@ -46,7 +46,7 @@ function setupStaticEntryRoute(app) {
         res.status(200).json(json);
     });
 }
-function makeApp(rootFolder, domain, midAuthorizer, errLogger) {
+function makeASMailApp(rootFolder, domain, midAuthorizer, errLogger) {
     const app = new app_1.AppWithWSs();
     const mailDeliverySessions = delivery_sessions_1.DeliverySessions.make(5 * 60);
     const recipientsSessions = (0, sessions_1.makeSessionFactory)(10 * 60);
@@ -59,5 +59,5 @@ function makeApp(rootFolder, domain, midAuthorizer, errLogger) {
     app.http.use((0, error_handler_1.makeErrHandler)(errLogger));
     return app;
 }
-exports.makeApp = makeApp;
+exports.makeASMailApp = makeASMailApp;
 Object.freeze(exports);

package/build/asmail/config.d.ts

@@ -1,9 +1,5 @@
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express ASMail-Configuration application.
- */
 import * as express from 'express';
 import { SessionsFactory } from './resources/sessions';
-import { Factory as usersFactory } from './resources/recipients';
+import { Factory as UsersFactory } from './resources/recipients';
 import { MidAuthorizer } from '../lib-server/routes/sessions/mid-auth';
-export declare function makeApp(domain: string, sessions: SessionsFactory, recipients: usersFactory, midAuthorizer: MidAuthorizer): express.Express;
+export declare function makeApp(domain: string, sessions: SessionsFactory, recipients: UsersFactory, midAuthorizer: MidAuthorizer): express.Express;

package/build/asmail/config.js

@@ -1,6 +1,6 @@
 "use strict";
 /*
- Copyright (C) 2015 - 2016 3NSoft Inc.
+ Copyright (C) 2015 - 2016, 2024 - 2025 3NSoft Inc.
  
  This program is free software: you can redistribute it and/or modify it under
  the terms of the GNU General Public License as published by the Free Software
@@ -17,34 +17,42 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeApp = void 0;
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express ASMail-Configuration application.
- */
 const express = require("express");
-// Internal libs
 const body_parsers_1 = require("../lib-server/middleware/body-parsers");
-// routes
-const mid_auth_1 = require("../lib-server/routes/sessions/mid-auth");
-const start_1 = require("../lib-server/routes/sessions/start");
 const close_1 = require("../lib-server/routes/sessions/close");
 const param_getter_1 = require("./routes/config/param-getter");
 const param_setter_1 = require("./routes/config/param-setter");
 const api = require("../lib-common/service-api/asmail/config");
+const mid_access_1 = require("../lib-server/mid-access");
 function makeApp(domain, sessions, recipients, midAuthorizer) {
     const app = express();
     app.disable('etag');
-    app.post('/' + api.midLogin.START_URL_END, sessions.checkSession(), (0, body_parsers_1.json)('1kb'), (0, start_1.startSession)(recipients.exists, sessions.generate));
-    app.post('/' + api.midLogin.AUTH_URL_END, sessions.ensureOpenedSession(), (0, body_parsers_1.json)('4kb'), (0, mid_auth_1.midLogin)(domain, midAuthorizer));
+    // Login
+    (0, mid_access_1.addMailerIdLoginRoutes)(app, domain, '/' + api.midLogin.URL_PART, sessions, recipients.exists, midAuthorizer);
     // *** Require authorized session for everything below ***
     app.use(sessions.ensureAuthorizedSession());
     app.post('/' + api.closeSession.URL_END, (0, body_parsers_1.emptyBody)(), (0, close_1.closeSession)());
     app.route('/' + api.p.initPubKey.URL_END)
         .get((0, param_getter_1.getParam)(recipients.getPubKey))
         .put((0, body_parsers_1.json)('4kb', true), (0, param_setter_1.setParam)(recipients.setPubKey));
+    app.route('/' + api.p.anonSenderPolicy.URL_END)
+        .get((0, param_getter_1.getParam)(recipients.getAnonSenderInvites))
+        .put((0, body_parsers_1.json)('40kb', true), (0, param_setter_1.setParam)(recipients.setAnonSenderInvites));
     app.route('/' + api.p.anonSenderInvites.URL_END)
         .get((0, param_getter_1.getParam)(recipients.getAnonSenderInvites))
-        .put((0, body_parsers_1.json)('4kb', true), (0, param_setter_1.setParam)(recipients.setAnonSenderInvites));
+        .put((0, body_parsers_1.json)('40kb', true), (0, param_setter_1.setParam)(recipients.setAnonSenderInvites));
+    app.route('/' + api.p.authSenderPolicy.URL_END)
+        .get((0, param_getter_1.getParam)(recipients.getAuthSenderPolicy))
+        .put((0, body_parsers_1.json)('4kb', true), (0, param_setter_1.setParam)(recipients.setAuthSenderPolicy));
+    app.route('/' + api.p.authSenderInvites.URL_END)
+        .get((0, param_getter_1.getParam)(recipients.getAuthSenderInvites))
+        .put((0, body_parsers_1.json)('40kb', true), (0, param_setter_1.setParam)(recipients.setAuthSenderInvites));
+    app.route('/' + api.p.authSenderWhitelist.URL_END)
+        .get((0, param_getter_1.getParam)(recipients.getAuthSenderWhitelist))
+        .put((0, body_parsers_1.json)('40kb', true), (0, param_setter_1.setParam)(recipients.setAuthSenderWhitelist));
+    app.route('/' + api.p.authSenderBlacklist.URL_END)
+        .get((0, param_getter_1.getParam)(recipients.getAuthSenderBlacklist))
+        .put((0, body_parsers_1.json)('40kb', true), (0, param_setter_1.setParam)(recipients.setAuthSenderBlacklist));
     return app;
 }
 exports.makeApp = makeApp;

package/build/asmail/delivery.d.ts

@@ -1,9 +1,5 @@
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express ASMail application.
- */
 import * as express from 'express';
 import { SessionsFactory } from './resources/delivery-sessions';
-import { Factory as recipFactory } from './resources/recipients';
+import { Factory as RecipFactory } from './resources/recipients';
 import { IMidAuthorizer } from './routes/delivery/sender-authorization';
-export declare function makeApp(domain: string, sessions: SessionsFactory, recipients: recipFactory, midAuthorizer: IMidAuthorizer): express.Express;
+export declare function makeApp(domain: string, sessions: SessionsFactory, recipients: RecipFactory, midAuthorizer: IMidAuthorizer): express.Express;

package/build/asmail/delivery.js

@@ -17,14 +17,8 @@
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeApp = void 0;
-/**
- * This module gives a function that creates a mountable, or app.use()-able,
- * express ASMail application.
- */
 const express = require("express");
-// Internal libs
 const body_parsers_1 = require("../lib-server/middleware/body-parsers");
-// Modules for ASMail delivery protocol
 const start_session_1 = require("./routes/delivery/start-session");
 const pre_flight_1 = require("./routes/delivery/pre-flight");
 const restart_session_1 = require("./routes/delivery/restart-session");

package/build/asmail/resources/delivery-sessions.d.ts

@@ -11,9 +11,9 @@ export interface SessionParams {
     currentMsgLength: number;
     msgId: string;
 }
-export declare type Request = Req<SessionParams>;
-export declare type GenerateSession = GenSession<SessionParams>;
-export declare type GetSessionForMsg = (recipient: string, msgId: string) => Promise<Session<SessionParams> | undefined>;
+export type Request = Req<SessionParams>;
+export type GenerateSession = GenSession<SessionParams>;
+export type GetSessionForMsg = (recipient: string, msgId: string) => Promise<Session<SessionParams> | undefined>;
 export interface SessionsFactory extends Factory<SessionParams> {
     getSessionForMsg: GetSessionForMsg;
 }

package/build/asmail/resources/delivery-sessions.js

@@ -22,7 +22,6 @@ exports.DeliverySessions = void 0;
  */
 const mem_backed_sessions_factory_1 = require("../../lib-server/resources/mem-backed-sessions-factory");
 const sessions_1 = require("../../lib-server/resources/sessions");
-const binding_1 = require("../../lib-common/binding");
 class DeliverySessions extends mem_backed_sessions_factory_1.InMemorySessions {
     constructor(timeoutSecs) {
         super(timeoutSecs, sessionId => this.makeSessionParams(sessionId));
@@ -84,7 +83,7 @@ class DeliverySessions extends mem_backed_sessions_factory_1.InMemorySessions {
     static make(timeout) {
         const factory = new DeliverySessions(timeout);
         const wrap = (0, sessions_1.wrapFactory)(factory);
-        wrap.getSessionForMsg = (0, binding_1.bind)(factory, factory.getSessionForMsg);
+        wrap.getSessionForMsg = factory.getSessionForMsg.bind(factory);
         return Object.freeze(wrap);
     }
 }