spec-3nweb-server 1.7.7 → 1.7.8

package/build/asmail/config.js

@@ -37,22 +37,22 @@ function makeApp(domain, sessions, recipients, midAuthorizer) {
         .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.getAnonSenderPolicy))
-        .put((0, body_parsers_1.json)('40kb', true), (0, param_setter_1.setParam)(recipients.setAnonSenderPolicy));
+        .put((0, body_parsers_1.json)('40kb'), (0, param_setter_1.setParam)(recipients.setAnonSenderPolicy));
     app.route('/' + api.p.anonSenderInvites.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));
+        .put((0, body_parsers_1.json)('40kb'), (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));
+        .put((0, body_parsers_1.json)('4kb'), (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));
+        .put((0, body_parsers_1.json)('40kb'), (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));
+        .put((0, body_parsers_1.json)('40kb'), (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));
+        .put((0, body_parsers_1.json)('40kb'), (0, param_setter_1.setParam)(recipients.setAuthSenderBlacklist));
     return app;
 }
 exports.makeApp = makeApp;

package/build/asmail/resources/inbox.d.ts

@@ -23,7 +23,7 @@ export declare const SC: {
     OBJ_FILE_INCOMPLETE: string;
 };
 export interface InboxParams {
-    "pubkey": deliveryApi.initPubKey.Reply;
+    "pubkey": deliveryApi.initPubKey.Reply | null;
     "anonymous/policy": AnonSenderPolicy;
     "anonymous/invites": AnonSenderInvites;
     "authenticated/policy": AuthSenderPolicy;
@@ -107,16 +107,14 @@ export declare class Inbox extends UserFiles<InboxParams> {
     getObj(msgId: string, objId: string, header: boolean, segsOfs: number, segsLimit: number | undefined): Promise<ObjReader>;
     /**
      * @param initKeyCerts
-     * @param setDefault when it is true, sets default values -- null --
-     * in place of an object with certs.
      * @return a promise, resolvable to true, when certs are set, or
      * resolvable to false, when given certs do not pass sanitization.
      */
-    setPubKey(initKeyCerts: deliveryApi.initPubKey.Reply, setDefault: boolean): Promise<boolean>;
-    setAnonSenderPolicy(policy: AnonSenderPolicy, setDefault: boolean): Promise<boolean>;
-    setAnonSenderInvites(invites: AnonSenderInvites, setDefault: boolean): Promise<boolean>;
-    setAuthSenderPolicy(policy: AuthSenderPolicy, setDefault: boolean): Promise<boolean>;
-    setAuthSenderBlacklist(list: Blacklist, setDefault: boolean): Promise<boolean>;
-    setAuthSenderWhitelist(list: Whitelist, setDefault: boolean): Promise<boolean>;
-    setAuthSenderInvites(invites: AuthSenderInvites, setDefault: boolean): Promise<boolean>;
+    setPubKey(initKeyCerts: deliveryApi.initPubKey.Reply | null): Promise<boolean>;
+    setAnonSenderPolicy(policy: AnonSenderPolicy): Promise<boolean>;
+    setAnonSenderInvites(invites: AnonSenderInvites): Promise<boolean>;
+    setAuthSenderPolicy(policy: AuthSenderPolicy): Promise<boolean>;
+    setAuthSenderBlacklist(list: Blacklist): Promise<boolean>;
+    setAuthSenderWhitelist(list: Whitelist): Promise<boolean>;
+    setAuthSenderInvites(invites: AuthSenderInvites): Promise<boolean>;
 }

package/build/asmail/resources/inbox.js

@@ -330,140 +330,96 @@ class Inbox extends user_files_1.UserFiles {
     }
     /**
      * @param initKeyCerts
-     * @param setDefault when it is true, sets default values -- null --
-     * in place of an object with certs.
      * @return a promise, resolvable to true, when certs are set, or
      * resolvable to false, when given certs do not pass sanitization.
      */
-    async setPubKey(initKeyCerts, setDefault) {
-        if (setDefault) {
-            initKeyCerts = null;
+    async setPubKey(initKeyCerts) {
+        let isOK;
+        if (initKeyCerts === null) {
+            isOK = true;
         }
         else {
-            const isOK = (typeof initKeyCerts === 'object') && !!initKeyCerts &&
+            isOK = ((typeof initKeyCerts === 'object') &&
                 (0, jwkeys_1.isLikeSignedKeyCert)(initKeyCerts.pkeyCert) &&
                 (0, jwkeys_1.isLikeSignedKeyCert)(initKeyCerts.userCert) &&
-                (0, jwkeys_1.isLikeSignedKeyCert)(initKeyCerts.provCert);
-            if (!isOK) {
-                return false;
-            }
-        }
-        await this.setParam('pubkey', initKeyCerts);
-        return true;
-    }
-    async setAnonSenderPolicy(policy, setDefault) {
-        if (setDefault) {
-            policy = {
-                accept: true,
-                acceptWithInvitesOnly: false,
-                defaultMsgSize: 1024 * 1024
-            };
+                (0, jwkeys_1.isLikeSignedKeyCert)(initKeyCerts.provCert));
         }
-        else {
-            const isOK = ('object' === typeof policy) && !!policy &&
-                ('boolean' === typeof policy.accept) &&
-                ('boolean' === typeof policy.acceptWithInvitesOnly) &&
-                ('number' === typeof policy.defaultMsgSize) &&
-                (policy.defaultMsgSize > 500);
-            if (!isOK) {
-                false;
-            }
-        }
-        await this.setParam('anonymous/policy', policy);
-        return true;
-    }
-    async setAnonSenderInvites(invites, setDefault) {
-        if (setDefault) {
-            invites = {};
-        }
-        else {
-            const isOK = ('object' === typeof invites) && !!invites;
-            if (!isOK) {
-                return false;
-            }
-            for (var invite in invites) {
-                const msgMaxSize = invites[invite];
-                const isOK = ('number' === typeof msgMaxSize) && (msgMaxSize > 500);
-                if (!isOK) {
-                    return false;
-                }
-            }
+        if (isOK) {
+            await this.setParam('pubkey', initKeyCerts);
         }
-        await this.setParam('anonymous/invites', invites);
-        return true;
+        return isOK;
     }
-    async setAuthSenderPolicy(policy, setDefault) {
-        if (setDefault) {
-            policy = {
-                acceptWithInvitesOnly: false,
-                acceptFromWhiteListOnly: false,
-                applyBlackList: true,
-                defaultMsgSize: 100 * 1024 * 1024,
-            };
-        }
-        else {
-            const isOK = ('object' === typeof policy) && !!policy &&
-                ('boolean' === typeof policy.applyBlackList) &&
-                ('boolean' === typeof policy.acceptFromWhiteListOnly) &&
-                ('boolean' === typeof policy.acceptWithInvitesOnly) &&
-                ('number' === typeof policy.defaultMsgSize) &&
-                (policy.defaultMsgSize > 500);
-            if (!isOK) {
-                return false;
-            }
+    async setAnonSenderPolicy(policy) {
+        const isOK = (('object' === typeof policy) && !!policy &&
+            ('boolean' === typeof policy.accept) &&
+            ('boolean' === typeof policy.acceptWithInvitesOnly) &&
+            ('number' === typeof policy.defaultMsgSize) &&
+            (policy.defaultMsgSize > 500));
+        if (isOK) {
+            await this.setParam('anonymous/policy', policy);
         }
-        await this.setParam('authenticated/policy', policy);
-        return true;
+        return isOK;
     }
-    async setAuthSenderBlacklist(list, setDefault) {
-        if (setDefault) {
-            list = {};
+    async setAnonSenderInvites(invites) {
+        const isOK = ('object' === typeof invites) && !!invites;
+        if (!isOK) {
+            return false;
         }
-        else {
-            const isOK = ('object' === typeof list) && !!list;
+        for (var invite in invites) {
+            const msgMaxSize = invites[invite];
+            const isOK = ('number' === typeof msgMaxSize) && (msgMaxSize > 500);
             if (!isOK) {
                 return false;
             }
         }
-        await this.setParam('authenticated/blacklist', list);
+        await this.setParam('anonymous/invites', invites);
         return true;
     }
-    async setAuthSenderWhitelist(list, setDefault) {
-        if (setDefault) {
-            list = {};
-        }
-        else {
-            const isOK = ('object' === typeof list) && !!list;
+    async setAuthSenderPolicy(policy) {
+        const isOK = (('object' === typeof policy) && !!policy &&
+            ('boolean' === typeof policy.applyBlackList) &&
+            ('boolean' === typeof policy.acceptFromWhiteListOnly) &&
+            ('boolean' === typeof policy.acceptWithInvitesOnly) &&
+            ('number' === typeof policy.defaultMsgSize) &&
+            (policy.defaultMsgSize > 500));
+        if (!isOK) {
+            await this.setParam('authenticated/policy', policy);
+        }
+        return isOK;
+    }
+    async setAuthSenderBlacklist(list) {
+        const isOK = ('object' === typeof list) && !!list;
+        if (isOK) {
+            await this.setParam('authenticated/blacklist', list);
+        }
+        return isOK;
+    }
+    async setAuthSenderWhitelist(list) {
+        const isOK = ('object' === typeof list) && !!list;
+        if (!isOK) {
+            return false;
+        }
+        for (var addr in list) {
+            const msgMaxSize = list[addr];
+            const isOK = ('number' === typeof msgMaxSize) && (msgMaxSize > 500);
             if (!isOK) {
                 return false;
             }
-            for (var addr in list) {
-                const msgMaxSize = list[addr];
-                const isOK = ('number' === typeof msgMaxSize) && (msgMaxSize > 500);
-                if (!isOK) {
-                    return false;
-                }
-            }
         }
         await this.setParam('authenticated/whitelist', list);
         return true;
     }
-    async setAuthSenderInvites(invites, setDefault) {
-        if (setDefault) {
-            invites = {};
+    async setAuthSenderInvites(invites) {
+        const isOK = ('object' === typeof invites) && !!invites;
+        if (!isOK) {
+            return false;
         }
-        else {
-            const isOK = ('object' === typeof invites) && !!invites;
+        for (var invite in invites) {
+            const msgMaxSize = invites[invite];
+            const isOK = ('number' === typeof msgMaxSize) && (msgMaxSize > 500);
             if (!isOK) {
                 return false;
             }
-            for (var invite in invites) {
-                const msgMaxSize = invites[invite];
-                const isOK = ('number' === typeof msgMaxSize) && (msgMaxSize > 500);
-                if (!isOK) {
-                    return false;
-                }
-            }
         }
         await this.setParam('authenticated/invites', invites);
         return true;

package/build/asmail/resources/recipients.js

@@ -188,7 +188,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setPubKey: async (userId, pkey) => {
             const inbox = await getInbox(userId);
-            return inbox.setPubKey(pkey, false);
+            return inbox.setPubKey(pkey);
         },
         getAnonSenderPolicy: async (recipient) => {
             const inbox = await getInbox(recipient);
@@ -196,7 +196,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setAnonSenderPolicy: async (userId, policy) => {
             const inbox = await getInbox(userId);
-            return inbox.setAnonSenderPolicy(policy, false);
+            return inbox.setAnonSenderPolicy(policy);
         },
         getAnonSenderInvites: async (recipient) => {
             const inbox = await getInbox(recipient);
@@ -204,7 +204,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setAnonSenderInvites: async (userId, invites) => {
             const inbox = await getInbox(userId);
-            return inbox.setAnonSenderInvites(invites, false);
+            return inbox.setAnonSenderInvites(invites);
         },
         getAuthSenderPolicy: async (recipient) => {
             const inbox = await getInbox(recipient);
@@ -212,7 +212,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setAuthSenderPolicy: async (userId, policy) => {
             const inbox = await getInbox(userId);
-            return inbox.setAuthSenderPolicy(policy, false);
+            return inbox.setAuthSenderPolicy(policy);
         },
         getAuthSenderInvites: async (recipient) => {
             const inbox = await getInbox(recipient);
@@ -220,7 +220,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setAuthSenderInvites: async (userId, invites) => {
             const inbox = await getInbox(userId);
-            return inbox.setAnonSenderInvites(invites, false);
+            return inbox.setAnonSenderInvites(invites);
         },
         getAuthSenderBlacklist: async (recipient) => {
             const inbox = await getInbox(recipient);
@@ -228,7 +228,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setAuthSenderBlacklist: async (userId, list) => {
             const inbox = await getInbox(userId);
-            return inbox.setAuthSenderBlacklist(list, false);
+            return inbox.setAuthSenderBlacklist(list);
         },
         getAuthSenderWhitelist: async (recipient) => {
             const inbox = await getInbox(recipient);
@@ -236,7 +236,7 @@ function makeFactory(rootFolder, writeBufferSize, readBufferSize) {
         },
         setAuthSenderWhitelist: async (userId, list) => {
             const inbox = await getInbox(userId);
-            return inbox.setAuthSenderWhitelist(list, false);
+            return inbox.setAuthSenderWhitelist(list);
         },
         allowedMaxMsgSize: async (recipient, sender, invitation) => {
             const inbox = await getInbox(recipient);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spec-3nweb-server",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "description": "3NWeb spec server.",
   "main": "build/lib.js",
   "types": "build/lib.d.ts",