Work-around for connectivity issues

rchrd2 · rchrd2 · commit d5bd77874877 · 2016-02-26T21:35:23.000-08:00
diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp
@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
 
     appTitle = (defaultText = "TextEditor"),
 
-    appVersion = 2,  # Increment this for every release.
+    appVersion = 4,  # Increment this for every release.
 
-    appMarketingVersion = (defaultText = "0.0.3"),
+    appMarketingVersion = (defaultText = "0.0.4"),
     # Human-readable representation of appVersion. Should match the way you
     # identify versions of your app in documentation and marketing.
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.0.4
+ * There are issues with localStorage within the Sandstorm iframe. This affects
+   reconnecting to a document. A work-around is in place.
+
 # 0.0.3
  * Add document settings drawer with themes and css editor
  * Switch to Polymer for UI
diff --git a/index.html b/index.html
@@ -10,14 +10,5 @@
 </head>
 
 <body class="fullbleed layout vertical">
-  <!-- <x-main /> -->
-  <script>
-console.log(window.localStorage);
-if (window.localStorage.getItem('foo') === null) {
-  window.localStorage.setItem('foo', 'this value was stored in localStorage');
-  document.write('No value found in localStorage. Calling set.');
-} else {
-  document.write(window.localStorage.getItem('foo'));
-}
-  </script>
+  <x-main />
 </body>
diff --git a/public/components/x-main.html b/public/components/x-main.html
@@ -96,7 +96,6 @@
 <script>
   Polymer({
     is: 'x-main',
-
     hasPermission: false,
     connectedStatus: false,
     cssVals: {},
@@ -214,41 +213,37 @@
      * page.
      */
     initUserSession: function () {
-      this.userId = window.localStorage.getItem("userId");
       this.uuid = window.localStorage.getItem("uuid");
-      console.log(this.userId);
       console.log(this.uuid);
 
-      var handleUserReady = function () {
-        this.updateUserHeaderPermissions(function () {
-          this.updatePermission();
-        }.bind(this));
-      }.bind(this);
-
-      // Create user
-      if ( ! this.userId || ! this.uuid) {
+      // Get or create user
+      if ( ! this.uuid) {
         this.uuid = Meteor.uuid();
         Meteor.call("createUser", {
-            username: this.uuid,
-            password: this.uuid,
-            login: true
-          }, function (error, result) {
-            console.log(result);
-            if (error) {
-              console.log(error);
-            }
-            this.userId = result.id;
-            window.localStorage.setItem("userId", this.userId);
-            window.localStorage.setItem("uuid", this.uuid);
-            handleUserReady()
-          }.bind(this)
-        );
-      } else {
-        Meteor.loginWithPassword(this.uuid, this.uuid, function () {
-          handleUserReady()
+          username: this.uuid,
+          password: this.uuid,
+          login: true
+        }, function (error, result) {
+          if (error) {
+            console.log(error);
+          }
+          window.localStorage.setItem("uuid", this.uuid);
+          // There's an issue where `login: true` isn't doing the trick
+          // When running in Sandstorm iframe, so we force a login.
+          if ( ! Meteor.userId()) {
+            Meteor.loginWithPassword(this.uuid, this.uuid)
+          }
         }.bind(this));
+      } else {
+        Meteor.loginWithPassword(this.uuid, this.uuid)
       }
 
+      var self = this;
+      Tracker.autorun(function () {
+        var userId = Meteor.userId();
+        self.handleUserReady();
+      });
+
       Tracker.autorun(function () {
         if (Meteor.status().connected) {
           console.log("connected");
@@ -257,8 +252,14 @@
           console.log("disconnected");
           console.log(Meteor.userId());
         }
-      }.bind(this));
+      });
+    },
 
+    handleUserReady: function () {
+      console.log('handleUserReady');
+      this.updateUserHeaderPermissions(function () {
+        this.updatePermission();
+      }.bind(this));
     },
 
     /**
@@ -274,14 +275,12 @@
      * Makes a call to server to update this.hasPermission
      */
     updatePermission: function () {
-      Meteor.call("checkUserPermissions", this.userId, ["owner", "modify"], function (error, result) {
+      Meteor.call("checkUserPermissions", Meteor.userId(), ["owner", "modify"], function (error, result) {
         this.hasPermission = result;
       }.bind(this));
     },
 
     /*********************************************************************/
-
-
   });
 
 </script>
