WIP fp mrcc

OpenConext · Feb 13, 2024 · 57ec7bf · 57ec7bf
1 parent b44b1df
commit 57ec7bf
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 50 deletions.
diff --git a/account-gui/src/routes/MagicLink.svelte b/account-gui/src/routes/MagicLink.svelte
@@ -111,13 +111,6 @@
 
 <style lang="scss">
 
-    .back-container {
-        position: absolute;
-        left: 15px;
-        top: 15px;
-        cursor: pointer;
-    }
-
     div.magic-link {
         margin-top: 40px;
         display: flex;
@@ -235,13 +228,9 @@
     </div>
 
 {:else if loginStatus === status.NOT_LOGGED_IN}
-    <div class="back-container">
-        <a href={`/login/${id}?name=${serviceName}&modus=${modus}`}>{@html backArrow}</a>
-    </div>
-
     <div class="magic-link">
         <h2 class="header">{I18n.t("magicLink.header")}</h2>
-        <p>{I18n.t("magicLink.info")}<span class="email">{$user.email}.</span></p>
+            <p>{I18n.t("magicLink.info")}<span class="email">{$user.email}.</span></p>
         <div class="spinner-container">
             <Spinner relative={true}/>
             <p>{I18n.t("magicLink.awaiting")}</p>

diff --git a/account-gui/src/routes/Options.svelte b/account-gui/src/routes/Options.svelte
@@ -11,6 +11,7 @@
     import LoginOption from "../components/LoginOption.svelte";
     import {links} from "../stores/conf";
     import {navigate} from "svelte-routing";
+    import {mrcc} from "../utils/constants";
 
 
     export let id;
@@ -79,6 +80,6 @@
                      translationKey={option.key}
                      preferred={option.preferred}
                      index={i + 1}
-                     route={`/${option.key.toLowerCase()}/${id}`}/>
+                     route={`/${option.key.toLowerCase()}/${id}?${mrcc}=true`}/>
     {/each}
 {/if}
diff --git a/account-gui/src/routes/UseLink.svelte b/account-gui/src/routes/UseLink.svelte
@@ -11,22 +11,28 @@
     import {loginPreferences} from "../constants/loginPreferences";
     import {cookieNames} from "../constants/cookieNames";
     import {links} from "../stores/conf";
+    import {mrcc} from "../utils/constants";
 
     export let id;
     let showSpinner = true;
     let serviceName = "";
     let magicLink = false;
+    let mrccValue = null;
 
     onMount(() => {
         const urlParams = new URLSearchParams(window.location.search);
-        magicLink = urlParams.has("magicLink")
+        mrccValue = urlParams.get(mrcc);
+        magicLink = urlParams.has("magicLink");
 
-        $links.displayBackArrow = true;
-
-        fetchServiceName(id).then(res => {
-            serviceName = res.name;
-            showSpinner = false;
-        });
+        if (mrccValue) {
+            magicLinkStart();
+        } else {
+            $links.displayBackArrow = true;
+            fetchServiceName(id).then(res => {
+                serviceName = res.name;
+                showSpinner = false;
+            });
+        }
     });
 
     const magicLinkStart = () => {
@@ -49,20 +55,17 @@
     };
 
 </script>
-
-<style lang="scss">
-
-
-</style>
 {#if showSpinner}
     <Spinner/>
 {/if}
-<h2 class="header">{I18n.t("useLink.header")}</h2>
-{#if serviceName}
-    <h2 class="top">{I18n.t("login.headerSubTitle")}<span>{serviceName}</span></h2>
-{/if}
-<Button href="/start"
-        disabled={showSpinner}
-        label={I18n.t("useLink.next")}
-        className="full"
-        onClick={magicLinkStart}/>
+{#if !showSpinner && !mrccValue}
+    <h2 class="header">{I18n.t("useLink.header")}</h2>
+    {#if serviceName}
+        <h2 class="top">{I18n.t("login.headerSubTitle")}<span>{serviceName}</span></h2>
+    {/if}
+    <Button href="/start"
+            disabled={showSpinner}
+            label={I18n.t("useLink.next")}
+            className="full"
+            onClick={magicLinkStart}/>
+{/if}
diff --git a/account-gui/src/routes/UseWebAuth.svelte b/account-gui/src/routes/UseWebAuth.svelte
@@ -11,18 +11,27 @@
     import {cookieNames} from "../constants/cookieNames";
     import {loginPreferences} from "../constants/loginPreferences";
     import {links} from "../stores/conf";
+    import {mrcc} from "../utils/constants";
 
     export let id;
     let showSpinner = true;
     let serviceName = "";
+    let mrccValue = null;
 
     onMount(() => {
-        $links.displayBackArrow = true;
-
-        fetchServiceName(id).then(res => {
-            serviceName = res.name;
+        const urlParams = new URLSearchParams(window.location.search);
+        mrccValue = urlParams.get(mrcc);
+        if (mrccValue) {
             showSpinner = false;
-        });
+            webAuthnStart();
+        } else {
+            $links.displayBackArrow = true;
+
+            fetchServiceName(id).then(res => {
+                serviceName = res.name;
+                showSpinner = false;
+            });
+        }
     });
 
     const webAuthnStart = (test = false) => {
@@ -61,15 +70,16 @@
 {#if showSpinner}
     <Spinner/>
 {/if}
-<h2 class="header">{I18n.t("webAuthn.header")}</h2>
-{#if serviceName}
-    <h2 class="top">{I18n.t("login.headerSubTitle")}<span>{serviceName}</span></h2>
-{/if}
-<p class="explanation">{I18n.t("webAuthn.explanation")}</p>
-<Button href="/start"
-        disabled={showSpinner}
-        label={I18n.t("webAuthn.next")}
-        className="full"
-        onClick={webAuthnStart}/>
+
+    <h2 class="header">{I18n.t("webAuthn.header")}</h2>
+    {#if serviceName}
+        <h2 class="top">{I18n.t("login.headerSubTitle")}<span>{serviceName}</span></h2>
+    {/if}
+    <p class="explanation">{I18n.t("webAuthn.explanation")}</p>
+    <Button href="/start"
+            disabled={showSpinner}
+            label={I18n.t("webAuthn.next")}
+            className="full"
+            onClick={webAuthnStart}/>
 
 
diff --git a/account-gui/src/utils/constants.js b/account-gui/src/utils/constants.js
@@ -0,0 +1 @@
+export const mrcc = "mrcc";
diff --git a/myconext-server/src/main/java/myconext/mail/MockMailBox.java b/myconext-server/src/main/java/myconext/mail/MockMailBox.java
@@ -31,7 +31,7 @@ protected void doSendMail(MimeMessage message) {
     @Override
     protected void setText(String html, String text, MimeMessageHelper helper) {
         String osName = System.getProperty("os.name").toLowerCase();
-        if (osName.contains("mac os x") && !env.acceptsProfiles(Profiles.of("test"))) {
+        if (osName.contains("mac os x!") && !env.acceptsProfiles(Profiles.of("test"))) {
             openInBrowser(html);
         }
     }