more info in external_tokens

stakwork · Apr 8, 2021 · f78fa52 · f78fa52
1 parent 4c0ade1
commit f78fa52
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 10 deletions.
diff --git a/dist/src/controllers/auth.js b/dist/src/controllers/auth.js
diff --git a/dist/src/controllers/auth.js.map b/dist/src/controllers/auth.js.map
diff --git a/dist/src/utils/tribes.js b/dist/src/utils/tribes.js
diff --git a/dist/src/utils/tribes.js.map b/dist/src/utils/tribes.js.map
diff --git a/src/controllers/auth.ts b/src/controllers/auth.ts
@@ -2,6 +2,15 @@ import * as meme from "../utils/meme";
 import { success, failure } from "../utils/res";
 import * as tribes from "../utils/tribes";
 
+interface MeInfo {
+  memeToken: string
+  tribesToken: string
+  photoUrl: string
+  alias: string
+  routeHint: string
+  contactKey: string
+}
+
 export async function requestExternalTokens(req, res) {
   if (!req.owner) return failure(res, "no owner");
   const pubkey = req.owner.publicKey;
@@ -11,9 +20,15 @@ export async function requestExternalTokens(req, res) {
     if(!memeToken || !tribesToken) {
       return failure(res, 'failed to generate token')
     }
-    success(res, {
-      memeToken, tribesToken
-    })
+    const result:MeInfo = {
+      memeToken, 
+      tribesToken,
+      alias: req.owner.alias,
+      photoUrl: req.owner.photoUrl,
+      routeHint: req.owner.routeHint,
+      contactKey: req.owner.contactKey,
+    }
+    success(res, result)
   } catch (e) {
     failure(res, e);
   }

diff --git a/src/utils/tribes.ts b/src/utils/tribes.ts
@@ -55,6 +55,7 @@ async function initializeClient(pubkey, host, onMessage): Promise<mqtt.Client> {
     let connected = false
     async function reconnect() {
       const pwd = await genSignedTimestamp(pubkey);
+      if (!connected) return
       const url = mqttURL(host);
       const cl = mqtt.connect(url, {
         username: pubkey,
@@ -90,7 +91,7 @@ async function initializeClient(pubkey, host, onMessage): Promise<mqtt.Client> {
       if(!connected) {
         reconnect();
       }
-      await sleep(3000 + Math.round(Math.random()*10000))
+      await sleep(5000 + Math.round(Math.random()*8000))
     }
   });
 }