log in is now just a toggle function, no loggedIn bool

3 files changed, 8 insertions, 7 deletions

diff --git a/src/auth.js b/auth.js
index 76cb554..108b42a 100644
--- a/src/auth.js
+++ b/auth.js
@@ -30,6 +30,9 @@ export default {
     let myID  = window.localStorage.getItem('graffitiID')
 
     if (!token || !myID) {
+      // Remove them both in case one exists
+      // and the other does not
+      token = myID = null
 
       // Check to see if we are redirecting back
       const url = new URL(window.location)
@@ -87,7 +90,7 @@ export default {
         myID = data.owner_id
 
         // And make sure that the token is valid
-        if (!token) {
+        if (!token || !myID) {
           throw new Error(`The authorization token could not be parsed from the response.\n\n${data}`)
         }
 
@@ -97,9 +100,7 @@ export default {
       }
     }
 
-    const loggedIn = (token != null) && (myID != null)
-
-    return { loggedIn, myID, token }
+    return { myID, token }
 
   },
 
diff --git a/src/socket.js b/graffiti.js
index 06cd7c6..7a9c168 100644
--- a/src/socket.js
+++ b/graffiti.js
@@ -39,10 +39,10 @@ export default class {
   }
 
   // authorization functions
-  logIn() { Auth.logIn(this.graffitiURL) }
-  logOut() { Auth.logOut() }
   get myID() { return this.authParams.myID }
-  get loggedIn() { return this.authParams.loggedIn }
+  toggleLogIn() {
+    this.myID? Auth.logOut() : Auth.logIn(this.graffitiURL)
+  }
 
   async onClose() {
     this.open = false
diff --git a/src/utils.js b/utils.js
index ed21d46..ed21d46 100644
--- a/src/utils.js
+++ b/utils.js