core-3nweb-client-lib 0.20.9 → 0.21.0

package/build/api-defs/common-caps.d.ts

@@ -30,7 +30,6 @@ declare namespace web3n.caps.common {
 
 	interface AppManifest {
 		appDomain: string;
-		name: string;
 		capsRequested: {
 			mail?: MailCAPSetting;
 			storage?: StorageCAPSetting;

package/build/core/index.d.ts

@@ -2,7 +2,7 @@ import { FactoryOfFSs } from './storage';
 import { makeCryptor } from '../lib-client/cryptor/cryptor';
 import { NetClient } from '../lib-client/request-utils';
 import { ServiceLocatorMaker } from '../lib-client/service-locator';
-declare type AppManifest = web3n.caps.common.AppManifest;
+declare type RequestedCAPs = web3n.caps.common.AppManifest['capsRequested'];
 declare type W3N = web3n.caps.common.W3N;
 export interface CoreConf {
     dataDir: string;
@@ -29,7 +29,7 @@ export declare class Core {
     private initForNewUser;
     private initForExistingUserWithoutCache;
     private initForExistingUserWithCache;
-    makeCAPsForApp(appDomain: string, manifest: AppManifest): {
+    makeCAPsForApp(appDomain: string, requestedCAPs: RequestedCAPs): {
         caps: W3N;
         close: () => void;
     };

package/build/core/index.js

@@ -30,7 +30,6 @@ const operators_1 = require("rxjs/operators");
 const app_files_1 = require("./app-files");
 const ASMAIL_APP_NAME = 'computer.3nweb.core.asmail';
 const MAILERID_APP_NAME = 'computer.3nweb.core.mailerid';
-const STARTUP_APP_DOMAIN = 'startup.3nweb.computer';
 class Core {
     constructor(makeNet, makeResolver, makeCryptor, appDirs, logger, signUpUrl) {
         this.makeNet = makeNet;
@@ -129,50 +128,47 @@ class Core {
         return { coreInit, capsForStartup };
     }
     ;
-    makeCAPsForApp(appDomain, manifest) {
+    makeCAPsForApp(appDomain, requestedCAPs) {
         if (!this.isInitialized || this.closingProc) {
             throw new Error(`Core is either not yet initialized, or is already closed.`);
         }
-        if (appDomain !== manifest.appDomain) {
-            throw new Error(`App manifest is for domain ${manifest.appDomain}, while app's domain is ${appDomain}`);
-        }
-        const { storage, close } = this.makeStorageCAP(manifest);
-        const mail = this.makeMailCAP(manifest);
-        const log = this.makeLogCAP(manifest);
-        const mailerid = this.makeMailerIdCAP(manifest);
+        const { storage, close } = this.makeStorageCAP(appDomain, requestedCAPs);
+        const mail = this.makeMailCAP(requestedCAPs);
+        const log = this.makeLogCAP(appDomain, requestedCAPs);
+        const mailerid = this.makeMailerIdCAP(requestedCAPs);
         const caps = { mail, log, mailerid, storage };
         return { caps, close };
     }
     ;
-    makeStorageCAP(m) {
-        if (m.capsRequested.storage) {
-            const { cap: storage, close } = this.storages.makeStorageCAP(m.appDomain, makeStoragePolicy(m));
+    makeStorageCAP(appDomain, requestedCAPs) {
+        if (requestedCAPs.storage) {
+            const { cap: storage, close } = this.storages.makeStorageCAP(appDomain, makeStoragePolicy(appDomain, requestedCAPs));
             return { storage, close };
         }
         else {
             return { close: () => { } };
         }
     }
-    makeMailCAP(m) {
-        if (m.capsRequested.mail
-            && (m.capsRequested.mail.receivingFrom === 'all')
-            && (m.capsRequested.mail.sendingTo === 'all')) {
+    makeMailCAP(requestedCAPs) {
+        if (requestedCAPs.mail
+            && (requestedCAPs.mail.receivingFrom === 'all')
+            && (requestedCAPs.mail.sendingTo === 'all')) {
             return this.asmail.makeASMailCAP();
         }
         else {
             return undefined;
         }
     }
-    makeLogCAP(m) {
-        if (m.capsRequested.log === 'all') {
-            return (type, msg, e) => this.logger.appLog(type, m.appDomain, msg, e);
+    makeLogCAP(appDomain, requestedCAPs) {
+        if (requestedCAPs.log === 'all') {
+            return (type, msg, e) => this.logger.appLog(type, appDomain, msg, e);
         }
         else {
             return undefined;
         }
     }
-    makeMailerIdCAP(m) {
-        if (m.capsRequested.mailerid === true) {
+    makeMailerIdCAP(requestedCAPs) {
+        if (requestedCAPs.mailerid === true) {
             return this.idManager.makeMailerIdCAP();
         }
         else {
@@ -215,24 +211,24 @@ class Core {
 exports.Core = Core;
 Object.freeze(Core.prototype);
 Object.freeze(Core);
-function makeStoragePolicy(manifest) {
-    if (!manifest.capsRequested.storage) {
+function makeStoragePolicy(appDomain, requestedCAPs) {
+    if (!requestedCAPs.storage) {
         throw new Error(`Missing storage setting in app's manifest`);
     }
-    const capReq = manifest.capsRequested.storage;
+    const capReq = requestedCAPs.storage;
     let policy;
     if (capReq.appFS === 'default') {
         policy = {
             canOpenAppFS: singleDomainAppFSChecker({
-                domain: manifest.appDomain,
+                domain: appDomain,
                 storage: 'synced-n-local'
             })
         };
     }
     else if (Array.isArray(capReq.appFS)) {
         const okDomains = capReq.appFS
-            .filter(fsInfo => (fsInfo.domain === manifest.appDomain) ||
-            fsInfo.domain.endsWith('.' + manifest.appDomain))
+            .filter(fsInfo => (fsInfo.domain === appDomain) ||
+            fsInfo.domain.endsWith('.' + appDomain))
             .map(fsInfo => json_utils_1.copy(fsInfo));
         policy = {
             canOpenAppFS: severalDomainsAppFSChecker(okDomains)