refactor

Author: odeimaiz

services/static-webserver/client/source/class/osparc/TooSmallDialog.js

@@ -69,8 +69,7 @@ qx.Class.define("osparc.TooSmallDialog", {
       button.addListener("execute", () => qx.core.Init.getApplication().logout());
       layout.add(button);
 
-      const authManager = osparc.auth.Manager.getInstance();
-      authManager.bind("loggedIn", layout, "visibility", {
+      authData.bind("loggedIn", layout, "visibility", {
         converter: isLoggedIn => isLoggedIn ? "visible" : "excluded"
       });
 

services/static-webserver/client/source/class/osparc/auth/Data.js

@@ -58,7 +58,8 @@ qx.Class.define("osparc.auth.Data", {
     auth: {
       init: null,
       nullable: true,
-      check: "osparc.io.request.authentication.Token"
+      check: "osparc.io.request.authentication.Token",
+      apply: "__applyAuth"
     },
 
     /**
@@ -104,10 +105,21 @@ qx.Class.define("osparc.auth.Data", {
       nullable: true,
       check: "Date",
       event: "changeExpirationDate"
+    },
+
+    loggedIn: {
+      check: "Boolean",
+      nullable: false,
+      init: false,
+      event: "changeLoggedIn",
     }
   },
 
   members: {
+    __applyAuth: function(auth) {
+      this.setLoggedIn(auth !== null && auth instanceof osparc.io.request.authentication.Token);
+    },
+
     __applyRole: function(role) {
       if (role && ["user", "tester", "product_owner", "admin"].includes(role)) {
         this.setGuest(false);

services/static-webserver/client/source/class/osparc/auth/Manager.js

@@ -26,29 +26,10 @@ qx.Class.define("osparc.auth.Manager", {
   extend: qx.core.Object,
   type: "singleton",
 
-  construct: function() {
-    // TODO: how to store this locally?? See http://www.qooxdoo.org/devel/pages/data_binding/stores.html#offline-store
-    // TODO: check if expired??
-    // TODO: request server if token is still valid (e.g. expired, etc)
-    const authData = osparc.auth.Data.getInstance();
-    authData.bind("auth", this, "loggedIn", {
-      converter: auth => auth !== null && auth instanceof osparc.io.request.authentication.Token
-    });
-  },
-
   events: {
     "loggedOut": "qx.event.type.Event"
   },
 
-  properties: {
-    loggedIn: {
-      check: "Boolean",
-      nullable: false,
-      init: false,
-      event: "changeLoggedIn",
-    }
-  },
-
   members: {
     register: function(userData) {
       const params = {
@@ -135,6 +116,14 @@ qx.Class.define("osparc.auth.Manager", {
       return osparc.data.Resources.fetch("auth", "resendCode", params);
     },
 
+    isLoggedIn: function() {
+      // TODO: how to store this locally?? See http://www.qooxdoo.org/devel/pages/data_binding/stores.html#offline-store
+      // TODO: check if expired??
+      // TODO: request server if token is still valid (e.g. expired, etc)
+      const auth = osparc.auth.Data.getInstance().getAuth();
+      return auth !== null && auth instanceof osparc.io.request.authentication.Token;
+    },
+
     /*
      * Function that checks if there is a token and validates it against the server.
      */