✨ FE various: support email on expired message, Enter key linked to validate button and blink Output in App Mode (ITISFoundation#3400)

Author: odeimaiz

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

@@ -112,6 +112,15 @@ qx.Class.define("osparc.auth.ui.LoginSMSCodeView", {
 
       const manager = osparc.auth.Manager.getInstance();
       manager.validateCodeLogin(this.getUserEmail(), this.__validateCodeTF.getValue(), loginFun, failFun, this);
+    },
+
+    _onAppear: function() {
+      const command = new qx.ui.command.Command("Enter");
+      this.__validateCodeBtn.setCommand(command);
+    },
+
+    _onDisappear: function() {
+      this.__validateCodeBtn.setCommand(null);
     }
   }
 });

services/static-webserver/client/source/class/osparc/component/node/BaseNodeView.js

@@ -374,8 +374,12 @@ qx.Class.define("osparc.component.node.BaseNodeView", {
       });
       this._outputsBtn.addListener("changeLabel", () => {
         // make it "blink"
-        this._outputsBtn.setTextColor("ready-green");
-        setTimeout(() => this._outputsBtn.setTextColor("text"), 1000);
+        this._outputsBtn.getChildControl("label").setTextColor("ready-green");
+        this._outputsBtn.getChildControl("icon").setTextColor("ready-green");
+        setTimeout(() => {
+          this._outputsBtn.getChildControl("label").setTextColor("text");
+          this._outputsBtn.getChildControl("icon").setTextColor("text");
+        }, 1000);
       });
 
       this._addLogger();

services/static-webserver/client/source/class/osparc/utils/Clusters.js

@@ -27,8 +27,8 @@ qx.Class.define("osparc.utils.Clusters", {
 
   construct: function() {
     this.base(arguments);
+
     this.__clusterIds = [];
-    this.__fetchDetailsTimers = [];
   },
 
   statics: {
@@ -90,7 +90,6 @@ qx.Class.define("osparc.utils.Clusters", {
 
   members: {
     __clusterIds: null,
-    __fetchDetailsTimers: null,
 
     __fetchDetails: function(cid) {
       const params = {

services/web/server/src/simcore_service_webserver/login/handlers.py

@@ -58,17 +58,19 @@ def _get_user_name(email: str) -> str:
     return username
 
 
-def _validate_user_status(user: dict, cfg):
+def _validate_user_status(user: dict, cfg, support_email: str):
     user_status: str = user["status"]
 
     if user_status == BANNED or user["role"] == ANONYMOUS:
         raise web.HTTPUnauthorized(
-            reason=cfg.MSG_USER_BANNED, content_type=MIMETYPE_APPLICATION_JSON
+            reason=cfg.MSG_USER_BANNED.format(support_email=support_email),
+            content_type=MIMETYPE_APPLICATION_JSON
         )  # 401
 
     if user_status == EXPIRED:
         raise web.HTTPUnauthorized(
-            reason=cfg.MSG_USER_EXPIRED, content_type=MIMETYPE_APPLICATION_JSON
+            reason=cfg.MSG_USER_EXPIRED.format(support_email=support_email),
+            content_type=MIMETYPE_APPLICATION_JSON
         )  # 401
 
     if user_status == CONFIRMATION_PENDING:
@@ -300,6 +302,7 @@ async def login(request: web.Request):
     settings: LoginSettings = get_plugin_settings(request.app)
     db: AsyncpgStorage = get_plugin_storage(request.app)
     cfg: LoginOptions = get_plugin_options(request.app)
+    product: Product = get_current_product(request)
 
     email = body.email
     password = body.password
@@ -311,7 +314,7 @@ async def login(request: web.Request):
             reason=cfg.MSG_UNKNOWN_EMAIL, content_type=MIMETYPE_APPLICATION_JSON
         )
 
-    _validate_user_status(user, cfg)
+    _validate_user_status(user, cfg, product.support_email)
 
     if not check_password(password, user["password_hash"]):
         raise web.HTTPUnauthorized(
@@ -322,8 +325,6 @@ async def login(request: web.Request):
     assert user["email"] == email, "db corrupted. Invalid email"  # nosec
 
     if settings.LOGIN_2FA_REQUIRED and UserRole(user["role"]) <= UserRole.USER:
-        product: Product = get_current_product(request)
-
         if not user["phone"]:
             rsp = envelope_response(
                 {
@@ -457,6 +458,7 @@ async def reset_password(request: web.Request):
 
     db: AsyncpgStorage = get_plugin_storage(request.app)
     cfg: LoginOptions = get_plugin_options(request.app)
+    product: Product = get_current_product(request)
 
     email = body.email
 
@@ -467,7 +469,7 @@ async def reset_password(request: web.Request):
                 reason=cfg.MSG_UNKNOWN_EMAIL, content_type=MIMETYPE_APPLICATION_JSON
             )  # 422
 
-        _validate_user_status(user, cfg)
+        _validate_user_status(user, cfg, product.support_email)
 
         assert user["status"] == ACTIVE  # nosec
         assert user["email"] == email  # nosec

services/web/server/src/simcore_service_webserver/login/plugin.py

@@ -12,6 +12,7 @@
 from ..email import setup_email
 from ..email_settings import SMTPSettings
 from ..email_settings import get_plugin_settings as get_email_plugin_settings
+from ..products import setup_products
 from ..redis import setup_redis
 from ..rest import setup_rest
 from .routes import create_routes
@@ -74,6 +75,7 @@ def setup_login(app: web.Application):
 
     setup_db(app)
     setup_redis(app)
+    setup_products(app)
     setup_rest(app)
     setup_email(app)
 

services/web/server/src/simcore_service_webserver/login/settings.py

@@ -97,8 +97,8 @@ def get_confirmation_lifetime(
     MSG_UNKNOWN_EMAIL: str = "This email is not registered"
     MSG_WRONG_PASSWORD: str = "Wrong password"
     MSG_PASSWORD_MISMATCH: str = "Password and confirmation do not match"
-    MSG_USER_BANNED: str = "This user does not have anymore access"
-    MSG_USER_EXPIRED: str = "This account has expired and does not have anymore access. Please contact support for further details."
+    MSG_USER_BANNED: str = "This user does not have anymore access. Please contact support for further details: {support_email}"
+    MSG_USER_EXPIRED: str = "This account has expired and does not have anymore access. Please contact support for further details: {support_email}"
     MSG_ACTIVATION_REQUIRED: str = (
         "You have to activate your account via email, before you can login"
     )

services/web/server/tests/unit/with_dbs/01/test_login_login.py

@@ -95,7 +95,8 @@ async def test_login_blocked_user(
 
     assert r.status == web.HTTPUnauthorized.status_code, str(payload)
     assert r.url.path == url.path
-    assert expected_msg in payload["error"]["errors"][0]["message"]
+    # expected_msg contains {support_email} at the end of the string
+    assert expected_msg[:-20] in payload["error"]["errors"][0]["message"]
 
 
 async def test_login_inactive_user(client: TestClient, login_options: LoginOptions):

services/web/server/tests/unit/with_dbs/03/test_login_reset_password.py

@@ -84,7 +84,7 @@ async def test_blocked_user(
     assert client.app
     reset_url = client.app.router["auth_reset_password"].url_for()
 
-    expected_msg = getattr(cfg, f"MSG_USER_{user_status.name.upper()}")
+    expected_msg: str = getattr(cfg, f"MSG_USER_{user_status.name.upper()}")
 
     async with NewUser({"status": user_status.name}, app=client.app) as user:
         rp = await client.post(
@@ -98,7 +98,8 @@ async def test_blocked_user(
     await assert_status(rp, web.HTTPOk, cfg.MSG_EMAIL_SENT.format(**user))
 
     out, _ = capsys.readouterr()
-    assert parse_test_marks(out)["reason"] == expected_msg
+    # expected_msg contains {support_email} at the end of the string
+    assert expected_msg[:-20] in parse_test_marks(out)["reason"]
 
 
 async def test_inactive_user(client: TestClient, cfg: LoginOptions, capsys):

tests/e2e/tutorials/jupyterlabs.js

@@ -36,7 +36,7 @@ async function runTutorial() {
     for (let j = 1; j < 3; j++) {
       // open JLab
       await tutorial.openNode(j);
-      await tutorial.waitFor(35000);
+      await tutorial.waitFor(10000);
 
       // Run the jlab nbook
       const jLabIframe = await tutorial.getIframe(workbenchData["nodeIds"][j]);
@@ -63,9 +63,10 @@ async function runTutorial() {
       await tutorial.takeScreenshot("after_run_all_menu");
 
       if (j === 2) {
-        await tutorial.waitFor(40000); // we are solving an em problem
-      } else {
-        await tutorial.waitFor(5000); // we are not solving an em problem
+        await tutorial.waitFor(30000); // we are solving an em problem
+      }
+      else {
+        await tutorial.waitFor(5000); // we are NOT solving an em problem
       }
 
       const outFiles = [

tests/e2e/tutorials/sim4life.js

@@ -34,7 +34,7 @@ async function runTutorial() {
       false
     );
 
-    await tutorial.waitFor(35000, 'Wait for some time');
+    await tutorial.waitFor(15000, 'Wait for some time');
   }
   catch (err) {
     await tutorial.setTutorialFailed(true);

tests/e2e/utils/auto.js

@@ -267,25 +267,15 @@ async function deleteFirstStudy(page, studyName) {
   }
 
   await page.waitForSelector('[osparc-test-id="studiesList"]')
-  const children = await utils.getVisibleChildrenIDs(page, '[osparc-test-id="studiesList"]');
-
-  // filter out the cards that are not studies
-  [
-    "newStudyBtn",
-    "newPlanButton",
-    "studiesLoading"
-  ].forEach(notAStudy => {
-    const idx = children.indexOf(notAStudy);
-    if (idx > -1) {
-      children.splice(idx, 1);
-    }
-  });
-  if (children.length === 0) {
+  const childrenIDs = await utils.getVisibleChildrenIDs(page, '[osparc-test-id="studiesList"]');
+
+  const studyIDs = childrenIDs.filter(childId => childId.includes("studyBrowserListItem_"));
+  if (studyIDs.length === 0) {
     console.log("Deleting first Study: no study found");
     return false;
   }
 
-  const studyCardId = children[0];
+  const studyCardId = studyIDs[0];
   const firstChildId = '[osparc-test-id="' + studyCardId + '"]';
   const studyCardStyle = await utils.getStyle(page, firstChildId);
   if (studyCardStyle.cursor === "not-allowed") {