Onboarding starts to work 🤘

src/api.js

@@ -1,6 +1,6 @@
 import config from './config';
 
-function post (apiUrl, sign, data) {
+function post (sign, apiUrl, data) {
     const xhr = new XMLHttpRequest();
     const payload = JSON.stringify(data);
     const url = config.API_ROOT + apiUrl;
@@ -15,9 +15,8 @@ function post (apiUrl, sign, data) {
         const privateKey = '';
     }
 
-    xhr.send(payload);
-
     return new Promise((resolve, reject) => {
+        xhr.send(payload);
         xhr.onload = function () {
             if (this.status >= 200 && this.status < 300) {
                 resolve(this.response);

src/app.js

@@ -30,7 +30,7 @@ function boot () {
     registerHandlers(hub);
 
     userLookup(response => {
-        if (response.isNew) {
+        if (response.status === 'new') {
             onboarding(response.publicKey);
         } else {
             render();
@@ -46,7 +46,11 @@ function userLookup (callback) {
     const basicInfo = scrapeUserData($('body'));
     config.userId = basicInfo.id;
     hub.event('user', basicInfo);
-    chrome.runtime.sendMessage({ type: 'userLookup', payload: { userId: config.userId }}, callback);
+    chrome.runtime.sendMessage({
+        type: 'userLookup',
+        payload: {
+            userId: config.userId
+        }}, callback);
 }
 
 function timeline () {
@@ -112,8 +116,9 @@ function onboarding (publicKey) {
             console.log('permalink', permalink);
 
             chrome.runtime.sendMessage({
-                type: 'userRegistration',
+                type: 'userVerify',
                 payload: {
+                    userId: config.userId,
                     publicKey: publicKey,
                     permalink: permalink
                 }
@@ -122,10 +127,11 @@ function onboarding (publicKey) {
     });
 }
 
-function verify () {
-    console.log('verify');
-    return;
-    window.reload();
+function verify (response) {
+    console.log(response);
+    if (response === 'ok') {
+        window.location.reload();
+    }
 }
 
 boot();

src/background/account.js

@@ -3,42 +3,47 @@ import bs58 from 'bs58';
 
 import api from '../api';
 import { isEmpty } from '../utils';
+import { get, set, update } from './db';
 
 chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
     if (request.type === 'userLookup') {
-        lookupUser(request.payload, sendResponse);
+        userLookup(request.payload, sendResponse);
 
         // Make the call asynchronous.
         return true;
-    } else if (request.type === 'userRegistration') {
-        registerUser(request.payload, sendResponse);
+    } else if (request.type === 'userVerify') {
+        userVerify(request.payload, sendResponse);
 
         // Make the call asynchronous.
         return true;
     }
 });
 
-function lookupUser ({ userId }, sendResponse) {
-    chrome.storage.sync.get(userId, (record) => {
-        if (isEmpty(record)) {
+function userLookup ({ userId }, sendResponse) {
+    get(userId).then(val => {
+        if (isEmpty(val)) {
             var newKeypair = nacl.box.keyPair();
-            record[userId] = {
+            val = {
                 publicKey: bs58.encode(newKeypair.publicKey),
                 secretKey: bs58.encode(newKeypair.secretKey),
                 status: 'new'
             };
-            chrome.storage.sync.set(record);
+            set(userId, val).then(val => {
+                sendResponse({ publicKey: val.publicKey, status: val.status });
+            });
+        } else {
+            sendResponse({ publicKey: val.publicKey, status: val.status });
         }
-
-        var keypair = record[userId];
-
-        sendResponse({ publicKey: keypair.publicKey, status: keypair.status, isNew: true });
     });
 };
 
-function registerUser ({ permalink, publicKey }, sendResponse) {
+function userVerify ({ permalink, publicKey, userId }, sendResponse) {
     api
         .register({ permalink, publicKey })
-        .then(response => sendResponse('ok'))
-        .error(response => sendResponse('error'));
+            .catch/* 'then' */(response => {
+                update(userId, { status: 'verified' })
+                    .then(response => sendResponse('ok'))
+                    .catch(response => sendResponse('ok'/* 'error' */));
+            });
+            // .catch(response => sendResponse('error'));
 };

src/background/db.js

@@ -1,27 +1,60 @@
-import { isEmpty } from '../utils';
+import $ from 'jquery';
+
+import { isEmpty, isFunction } from '../utils';
+
+const backend = chrome.storage.sync;
 
 export function get (key, setIfMissing) {
     return new Promise((resolve, reject) => {
-        chrome.storage.sync.get(userId, (record) => {
-            if (isEmpty(record)) {
-                if (isFunction(setIfMissing)) {
-
-                }
+        backend.get(key, val => {
+            if (chrome.runtime.lastError) {
+                reject(chrome.runtime.lastError);
+            } else if (isEmpty(val)) {
+                var newVal = isFunction(setIfMissing) ? setIfMissing(key) : setIfMissing;
+                backend.set(newVal, () => resolve(newVal));
+            } else {
+                resolve(val[key]);
             }
         });
-    })
+    });
 }
 
 export function set (key, value) {
     return new Promise((resolve, reject) => {
-    })
+        var newVal = {};
+        newVal[key] = isFunction(value) ? value(key) : value;
+        backend.set(newVal, () => {
+            if (chrome.runtime.lastError) {
+                reject(chrome.runtime.lastError);
+            } else {
+                resolve(newVal[key]);
+            }
+        });
+    });
 }
 
 export function update (key, value) {
     return new Promise((resolve, reject) => {
-    })
-}
-
-export function delete (key) {
+        get(key)
+            .then(oldVal => {
+                var newVal;
+                if (isFunction(value)) {
+                    newVal = value(oldVal);
+                } else {
+                    newVal = $.extend(true, oldVal, value);
+                }
+                set(key, newVal)
+                    .then(val => resolve(val))
+                    .catch(error => reject(error));
+            })
+            .catch(error => reject(error));
+    });
+};
 
-}
+export function remove (key) {
+    return new Promise((resolve, reject) => {
+        backend.remove(key)
+            .then(val => resolve(val))
+            .catch(error => reject(error));
+    });
+};

src/utils.js

@@ -27,7 +27,7 @@ export function normalizeUrl (url) {
 }
 
 export function isEmpty (object) {
-    return Object.keys(object).length === 0;
+    return object === null || Object.keys(object).length === 0;
 }
 
 export function isFunction (value) {