spec-3nweb-server 1.8.1 → 1.8.3

package/build/main.js

@@ -139,10 +139,17 @@ async function displaySignupInfo(conf) {
         if (conf.signup.noTokenFile) {
             const ctx = await (0, signup_1.readNoTokensFile)(conf.signup.noTokenFile);
             console.log(`Signup of user without token is allowed in domains:\n`, ctx.domains, `\n`);
+            const signupLink = signupLinkFrom(conf, undefined);
+            if (signupLink) {
+                console.log(`Signup link:\n`, signupLink, `\n`);
+            }
         }
         else {
             console.log(`Signup of users is allowed only with valid signup tokens.\n`);
         }
+        if (conf.signup.serviceUrl) {
+            console.log(`Signup service url (from configuration file):\n`, conf.signup.serviceUrl, `\n`);
+        }
     }
     const { multiUserTokens, singleUserTokens } = await (0, signup_1.readAllSignupTokens)(conf.rootFolder);
     console.log(`There are ${multiUserTokens.length} multi-user tokens.\n`);
@@ -173,40 +180,67 @@ async function displayTokensList(conf) {
 }
 async function displayTokenValue(conf, tokenId) {
     const ctx = await (0, signup_1.readTokenFile)(conf.rootFolder, tokenId);
-    if (!ctx) {
+    if (ctx) {
+        const signupLink = signupLinkFrom(conf, ctx.token);
+        if (signupLink) {
+            console.log(`\nSignup link: ${signupLink}`);
+        }
+        if (ctx.type === 'multi-domain') {
+            console.log(`\nMulti-user signup context:`);
+            console.log(`  domains:`, ctx.domains);
+            console.log(`  value:`, ctx.token);
+            if (ctx.validTill) {
+                console.log(`  valid till: ${(new Date(ctx.validTill)).toString()}\n`);
+            }
+            else {
+                console.log(``);
+            }
+        }
+        else if (ctx.type === 'single-user') {
+            console.log(`\nSingle-user signup context:`);
+            console.log(`  address:`, ctx.userId);
+            console.log(`  value:`, ctx.token);
+            if (ctx.validTill) {
+                console.log(`  valid till: ${(new Date(ctx.validTill)).toString()}\n`);
+            }
+            else {
+                console.log(``);
+            }
+        }
+    }
+    else {
         console.error(`Token ${tokenId} is not found.`);
         process.exit(-1);
     }
-    else if (ctx.type === 'multi-domain') {
-        console.log(`\nMulti-user signup context:`);
-        console.log(`  domains:`, ctx.domains);
-        console.log(`  value:`, ctx.token);
-        if (ctx.validTill) {
-            console.log(`  valid till: ${(new Date(ctx.validTill)).toString()}\n`);
-        }
-        else {
-            console.log(``);
-        }
+}
+function signupLinkFrom(conf, token = '') {
+    var _a;
+    if (!((_a = conf.signup) === null || _a === void 0 ? void 0 : _a.serviceUrl)) {
+        return;
     }
-    else if (ctx.type === 'single-user') {
-        console.log(`\nSingle-user signup context:`);
-        console.log(`  address:`, ctx.userId);
-        console.log(`  value:`, ctx.token);
-        if (ctx.validTill) {
-            console.log(`  valid till: ${(new Date(ctx.validTill)).toString()}\n`);
-        }
-        else {
-            console.log(``);
-        }
+    try {
+        const url = new URL(conf.signup.serviceUrl);
+        return `3nweb://signup/${url.host}${url.pathname}${url.pathname.endsWith('/') ? '' : '/'}${token}`;
+    }
+    catch (err) {
+        return;
     }
 }
 async function createMultiUserToken(conf, domains) {
     const token = await (0, signup_1.addMultiDomainSignup)(conf.rootFolder, domains);
     console.log(`\nToken value:\n  ${token}\n`);
+    const signupLink = signupLinkFrom(conf, token);
+    if (signupLink) {
+        console.log(`Signup link: ${signupLink}\n`);
+    }
 }
 async function createSingleUserToken(conf, userId) {
     const token = await (0, signup_1.addSingleUserSignup)(conf.rootFolder, userId);
     console.log(`\nToken value:\n  ${token}\n`);
+    const signupLink = signupLinkFrom(conf, token);
+    if (signupLink) {
+        console.log(`Signup link: ${signupLink}\n`);
+    }
 }
 const cmd = (0, cli_1.parseProcessArgv)();
 if (cmd.runCmd) {

package/build/services.d.ts

@@ -25,6 +25,7 @@ export interface Configurations {
     };
     signup?: {
         noTokenFile?: string;
+        serviceUrl?: string;
     };
 }
 export declare function servicesApp(conf: Configurations, errLogger?: ErrLogger | 'console', logSetup?: 'console'): AppWithWSs;

package/package.json

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