Fix redirect URL on gh pages.

mozilla-services · Mar 14, 2017 · 2ed617a · 2ed617a
1 parent ecfa0c2
commit 2ed617a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/Main.elm b/Main.elm
@@ -216,7 +216,7 @@ update message model =
             { model | lock = True, content = "", passphrase = "", error = "Wrong passphrase" } ! []
 
         Lock ->
-            { model | lock = True, gearMenuOpen = False, content = "", passphrase = "" } ! [ encryptData { content = model.content, passphrase = model.passphrase } ]
+            { model | lock = True, gearMenuOpen = False, content = "", passphrase = "", error = "" } ! [ encryptData { content = model.content, passphrase = model.passphrase } ]
 
         DataSaved key ->
             case key of

diff --git a/ports.js b/ports.js
@@ -23,7 +23,11 @@ function getItem(key) {
 
 function setItem(key, value) {
   if (!IS_WEB_EXTENSION) {
-    localStorage.setItem(key, value);
+    if (value === null) {
+      localStorage.removeItem(key);
+    } else {
+      localStorage.setItem(key, value);
+    }
     return Promise.resolve(null);
   } else {
     return new Promise(function(resolve, reject) {
@@ -62,19 +66,14 @@ function createElmApp(flags) {
   });
 
   app.ports.saveData.subscribe(function(data) {
-    let promise;
-    if (data.content === null) {
-      promise = removeItem(data.key);
-    } else {
-      promise = setItem(data.key, data.content);
-    }
-    promise.then(function() {
-      app.ports.dataSaved.send(data.key);
-    })
-    .catch(function(err) {
-      console.error(err);
-      app.ports.newError.send('Nothing retrieved: ' + err.message);
-    });
+    setItem(data.key, data.content)
+      .then(function() {
+        app.ports.dataSaved.send(data.key);
+      })
+      .catch(function(err) {
+        console.error(err);
+        app.ports.newError.send('Nothing retrieved: ' + err.message);
+      });
   });
 
   app.ports.decryptData.subscribe(function(data) {
@@ -116,7 +115,9 @@ function createElmApp(flags) {
 
   app.ports.enableSync.subscribe(function(content) {
     if (!IS_WEB_EXTENSION) {
-      document.location.href = "https://kinto.dev.mozaws.net/v1/fxa-oauth/login?redirect=http://localhost:8000/%23auth=";
+      const {origin, pathname} = document.location;
+      const redirect = encodeURIComponent(`${origin}${pathname}#auth=`);
+      document.location.href = "https://kinto.dev.mozaws.net/v1/fxa-oauth/login?redirect=" + redirect;
     } else {
       getItem('fxaToken')
         .then(function(fxaToken) {