works

irislib · Mar 24, 2021 · 563d722 · 563d722
1 parent 3694092
commit 563d722
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 21 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 node_modules
+radata
diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 const IRIS_PRIVATE_KEY = JSON.parse(process.env.IRIS_PRIVATE_KEY || 'null');
-const PEERS = JSON.parse(process.env.PEERS || 'null') || 'https://iris.cx/gun';
+const PEERS = process.env.PEERS && process.env.PEERS.split(',');
 const INCOMING_HTTP_PORT = 3000;
 
 // process.env.GOOGLE_APPLICATION_CREDENTIALS should be the file path of a JSON containing the service account key
@@ -11,14 +11,18 @@ var firebaseApp = admin.initializeApp({
 });
 
 const Gun = require('gun');
-require('gun/sea');
+const SEA = require('gun/sea');
 
 const express = require('express');
 const app = express();
-const publicState = new Gun(PEERS);
-publicState.user().auth(IRIS_PRIVATE_KEY);
+const publicState = new Gun({peers:PEERS});
+const user = publicState.user();
+user.auth(IRIS_PRIVATE_KEY);
 
 app.get('/auth', async (req, res) => {
+  if (!(IRIS_PRIVATE_KEY && PEERS)) {
+    return res.status(400).send({message: 'bad server config'});
+  }
   const idToken = req.query.token;
   const pub = req.query.pub;
   if (idToken && pub) {
@@ -27,12 +31,13 @@ app.get('/auth', async (req, res) => {
     .verifyIdToken(idToken)
     .then((decodedToken) => {
       const uid = decodedToken.uid;
-      publicState.user().get('uidToPub').get(uid).put(pub);
-      publicState.user().get('follow').get(pub).put(true);
+      user.get('uidToPub').get(uid).put(pub);
+      user.get('follow').get(pub).put(true);
       console.log('linked user', pub.slice(0,6), '... to uid', uid.slice(0,6), '...');
       res.send('');
     })
     .catch((error) => {
+      res.status(400).send({message: 'infernal server error'});
       console.error('firebase authentication failure: ', error);
     });
   }

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "dependencies": {
     "express": "^4.17.1",
     "firebase-admin": "^9.5.0",
-    "gun": "^0.2020.520"
+    "gun": "amark/gun"
   },
   "devDependencies": {
     "eslint": "^7.22.0",

diff --git a/public/index.html b/public/index.html
@@ -97,6 +97,13 @@ <h1>Iris sms auth</h1>
       const errorContainer = document.getElementById('error');
       const phoneNumberForm = document.getElementById('phone-number-form');
       const verificationCodeForm = document.getElementById('verification-code-form');
+
+      function displayError(error) {
+        console.error(error);
+        errorContainer.style = 'display:block;color:red';
+        errorContainer.innerHTML = error && error.message;
+      }
+
       phoneNumberForm.onsubmit = function(event) {
         event.preventDefault();
         const appVerifier = window.recaptchaVerifier;
@@ -112,9 +119,7 @@ <h1>Iris sms auth</h1>
           console.log(confirmationResult);
           // ...
         }).catch((error) => {
-          console.error(error);
-          errorContainer.style = 'display:block';
-          errorContainer.innerHTML = error && error.message;
+          displayError(error);
           appVerifier.render().then(function(widgetId) {
             grecaptcha.reset(widgetId);
           });
@@ -127,17 +132,15 @@ <h1>Iris sms auth</h1>
         event.preventDefault();
         const code = document.getElementById('verification-code').value;
         window.confirmationResult.confirm(code).then(result => {
-          console.log('verification successful', result);
+          console.log('verification successful, registering public key', result);
           verificationCodeForm.style = 'display: none';
           errorContainer.style = 'display: none';
-          document.getElementById('success').style = '';
           const pub = 'hyECQHwSo7fgr2MVfPyakvayPeixxsaAWVtZ-vbaiSc.TXIp8MnCtrnW6n2MrYquWPcc-DTmZzMBmc2yaGv9gIU';
-          fetch(`/auth?token=asdf&pub=${pub}`);
-        }).catch(error => {
-          console.error(error);
-          errorContainer.style = 'display:block;color:red';
-          errorContainer.innerHTML = error && error.message;
-        });
+          return firebase.auth().currentUser.getIdToken(/* forceRefresh */ true).then(function(idToken) {
+            fetch(`/auth?token=${idToken}&pub=${pub}`);
+            document.getElementById('success').style = '';
+          });
+        }).catch(displayError);
       }
     </script>
   </body>

diff --git a/yarn.lock b/yarn.lock
@@ -1309,10 +1309,9 @@ gtoken@^5.0.4:
     google-p12-pem "^3.0.3"
     jws "^4.0.0"
 
-gun@^0.2020.520:
+gun@amark/gun:
   version "0.2020.520"
-  resolved "https://registry.yarnpkg.com/gun/-/gun-0.2020.520.tgz#3bf7c9c0c83ba04aee94c0157c4d4e0a64e865ad"
-  integrity sha512-hMDmj4QQnejweZEy4njbyNlll+GO7H8XIq/SdQ23kFV29B6HqA0+bQmhLCxWKLwQvfRXx9SgSXG/ImGrER/CqQ==
+  resolved "https://codeload.github.com/amark/gun/tar.gz/4dc672eeb4a9a45f31d9cd71536525ba4a02fc64"
   dependencies:
     ws "^7.2.1"
   optionalDependencies: