Merge branch 'release/7.3.x'

OpenConext · Jan 21, 2025 · 691b53f · 691b53f
2 parents e3ea1b1 + 6cf26a1
commit 691b53f
Show file tree

Hide file tree

Showing 12 changed files with 71 additions and 14 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -5,7 +5,7 @@ name: Java CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ "*" ]
   pull_request:
     branches: [ main ]
 

diff --git a/account-gui/package.json b/account-gui/package.json
@@ -44,6 +44,7 @@
     "js-cookie": "^3.0.5",
     "postcss": "^8.4.49",
     "sass": "^1.82.0",
+    "svelte-qrcode": "^1.0.1",
     "svelte-routing": "^2.13.0",
     "ts-loader": "^9.5.1",
     "typescript": "^5.7.2",

diff --git a/account-gui/pom.xml b/account-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.9</version>
+        <version>7.3.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>account-gui</artifactId>

diff --git a/account-gui/src/locale/en.js b/account-gui/src/locale/en.js
@@ -127,52 +127,66 @@ I18n.translations.en = {
         "account-linked": {
             title: "Account linked!",
             info: "Your institutional account has been linked, click the button below to open your new account in the eduID app.",
+            infoDesktop: "Your institutional account has been linked, scan the code below below to open your new account in the eduID app.",
         },
         "add-password": {
             title: "New password requested!",
             info: "To add your new password, click the button below to open eduID app.",
+            infoDesktop: "To add your new password, scan the code below to open eduID app.",
         },
         created: {
             title: "Account created!",
             info: "Your account has been created, click the button below to open your new account in the eduID app.",
+            infoDesktop: "Your account has been created, scan the code below to open your new account in the eduID app.",
         },
         "eppn-already-linked": {
             title: "EPPN already linked!",
             info: "Your account has not been linked, click the button below to open the eduID app.",
+            infoDesktop: "Your account has not been linked, scan the code below to open the eduID app.",
         },
         "subject-already-linked": {
             title: "Subject already linked!",
             info: "Your account has not been verified, click the button below to open the eduID app.",
+            infoDesktop: "Your account has not been verified, scan the code below to open the eduID app.",
         },
         expired: {
             title: "Session expired!",
             info: "Your account has not been linked, click the button below to open the eduID app.",
+            infoDesktop: "Your account has not been linked, scan the code below to open the eduID app.",
         },
         fallback: {
             title: "eduID app!",
-            info: "You have opened a link to the eduID app in the browser, click the button below to open eduID app."
+            info: "You have opened a link to the eduID app in the browser, click the button below to open eduID app.",
+            infoDesktop: "You have opened a link to the eduID app in the browser, scan the code below to open eduID app."
         },
         "reset-password": {
             title: "Reset password requested!",
             info: "To reset your password, click the button below to open eduID app.",
+            infoDesktop: "To reset your password, scan the code below to open eduID app.",
         },
         "security": {
             title: "Security!",
             info: "To view and update your security settings, click the button below to open eduID app.",
+            infoDesktop: "To view and update your security settings, scan the code below to open eduID app.",
         },
         "update-email": {
             title: "New email confirmed!",
             info: "To finalize your email update, click the button below to open eduID app.",
+            infoDesktop: "To finalize your email update, scan the code below to open eduID app.",
         },
         "external-account-linked": {
             title: "External Account linked!",
             info: "Your external account has been linked, click the button below to open your new account in the eduID app.",
+            infoDesktop: "Your external account has been linked, scan the code below to open your new account in the eduID app.",
         },
         "external-account-linked-error": {
             title: "External account error!",
             info: "Your external account has not been verified, click the button below to open the eduID app.",
+            infoDesktop: "Your external account has not been verified, scan the code below to open the eduID app.",
         },
-        proceedLink: "Go to eduID app"
+        proceedLink: "Go to eduID app",
+        qrCodeLink: "Scan to go to eduID app"
+
     },
     expired: {
         title: "Expired magic link",

diff --git a/account-gui/src/locale/nl.js b/account-gui/src/locale/nl.js
@@ -127,52 +127,65 @@ I18n.translations.nl = {
         "account-linked": {
             title: "Account gekoppeld!",
             info: "Je instellingsaccount is gekoppeld, klik op de knop hier onder om je nieuwe account te openen in de eduID app.",
+            infoDesktop: "Je instellingsaccount is gekoppeld, scan de code hier onder om je nieuwe account te openen in de eduID app.",
         },
         "add-password": {
             title: "Nieuw wachtwoord!",
             info: "Om een nieuw wachtwoord te kiezen, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Om een nieuw wachtwoord te kiezen, scan de code hier onder om de eduID app te openen.",
         },
         created: {
             title: "Account aangemaakt!",
             info: "Je account is gemaakt, klik op de knop hier onder om je nieuwe account te openen in de eduID app.",
+            infoDesktop: "Je account is gemaakt, scan de code hier onder om je nieuwe account te openen in de eduID app.",
         },
         "eppn-already-linked": {
             title: "EPPN is al gekoppeld!",
             info: "Je account is niet gekoppeld, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Je account is niet gekoppeld, scan de code hier onder om de eduID app te openen.",
         },
         "subject-already-linked": {
             title: "Subject is al gekoppeld!",
             info: "Je account is niet geverifïeerd, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Je account is niet geverifïeerd, scan de code hier onder om de eduID app te openen.",
         },
         expired: {
             title: "Sessie verlopen!",
             info: "Je account is niet gekoppeld, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Je account is niet gekoppeld, scan de code hier onder om de eduID app te openen.",
         },
         "reset-password": {
             title: "Wijzig wachtwoord!",
             info: "Om je wachtwoord te wijzigen, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Om je wachtwoord te wijzigen, scan de code hier onder om de eduID app te openen.",
         },
         "security": {
             title: "Beveiliging!",
             info: "Om je beveiliging instellingen te bekijken, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Om je beveiliging instellingen te bekijken, scan de code hier onder om de eduID app te openen.",
         },
         "update-email": {
             title: "Nieuwe e-mail bevestigd!",
             info: "Om je e-mail te wijzigen, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Om je e-mail te wijzigen, scan de code hier onder om de eduID app te openen.",
         },
         fallback: {
             title: "eduID app!",
             info: "Je hebt een link naar de eduID app geopend in de browser, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Je hebt een link naar de eduID app geopend in de browser, scan de code hier onder om de eduID app te openen.",
         },
         "external-account-linked": {
             title: "Externe Account gekoppeld!",
             info: "Je externe account is gekoppeld, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Je externe account is gekoppeld, scan de code hier onder om de eduID app te openen.",
         },
         "external-account-linked-error": {
             title: "Externe account error!",
             info: "Je externe account kon niet worden gekoppeld, klik op de knop hier onder om de eduID app te openen.",
+            infoDesktop: "Je externe account kon niet worden gekoppeld, scan de code hier onder om de eduID app te openen.",
         },
-        proceedLink: "Open de eduID app"
+        proceedLink: "Open de eduID app",
+        qrCodeLink: "Scan om de eduID app te openen"
     },
     expired: {
         title: "Verlopen magische link",

diff --git a/account-gui/src/routes/RedirectMobileApp.svelte b/account-gui/src/routes/RedirectMobileApp.svelte
@@ -3,10 +3,12 @@
     import {conf, links} from "../stores/conf";
     import Button from "../components/Button.svelte";
     import {onMount} from "svelte";
+    import QrCode from "svelte-qrcode"
 
     export let action;
     let redirectAppUrl = null;
     let actionTranslateKey = null;
+    let isMobile = "ontouchstart" in window || navigator.maxTouchPoints > 0;
 
     onMount(() => {
         $links.displayBackArrow = false;
@@ -33,14 +35,29 @@
         display: none;
     }
 
+    .qr-container {
+        display: flex;
+        flex-direction: column;
+        :global(img) {
+            margin: 25px auto 0 auto;
+        }
+    }
+
 </style>
 <div class="home">
     <div class="card">
         <h1>{I18n.t(`redirectMobileApp.${actionTranslateKey}.title`)}</h1>
-        <p class="info">{@html I18n.t(`redirectMobileApp.${actionTranslateKey}.info`)}</p>
+        <p class="info">{@html I18n.t(`redirectMobileApp.${actionTranslateKey}.${isMobile ? "info" : "infoDesktop"}`)}</p>
         <p class="hidden">{redirectAppUrl}</p>
-        <Button href="/eduid"
-                onClick={() => window.location.href = redirectAppUrl}
-                label={I18n.t("redirectMobileApp.proceedLink")}/>
+        {#if isMobile}
+            <Button href="/eduid"
+                    onClick={() => window.location.href = redirectAppUrl}
+                    label={I18n.t("redirectMobileApp.proceedLink")}/>
+        {:else}
+            <div class="qr-container">
+                <p>{I18n.t("redirectMobileApp.qrCodeLink")}</p>
+                <QrCode value={redirectAppUrl}/>
+            </div>
+        {/if}
     </div>
 </div>
diff --git a/account-gui/yarn.lock b/account-gui/yarn.lock
@@ -3497,6 +3497,11 @@ pure-rand@^6.0.0:
   resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.1.0.tgz#d173cf23258231976ccbdb05247c9787957604f2"
   integrity sha512-bVWawvoZoBYpp6yIoQtQXHZjmz35RSVHnUOTefl8Vcjr8snTPY1wnpSPMWekcFwbxI6gtmT7rSYPFvz71ldiOA==
 
+qrious@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/qrious/-/qrious-4.0.2.tgz#09c4d4079d2b961617f62c69cff3b9bb66a39693"
+  integrity sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g==
+
 randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
@@ -3908,6 +3913,13 @@ svelte-preprocess@^6.0.3:
   resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-6.0.3.tgz#fdc1f9dc41b6f22bf8b1f059e9f21eaaae181eeb"
   integrity sha512-PLG2k05qHdhmRG7zR/dyo5qKvakhm8IJ+hD2eFRQmMLHp7X3eJnjeupUtvuRpbNiF31RjVw45W+abDwHEmP5OA==
 
+svelte-qrcode@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/svelte-qrcode/-/svelte-qrcode-1.0.1.tgz#bb3bd167fac59e7a7455e5eb678b6e2b0f934f58"
+  integrity sha512-l1RcxDWkQqtBWUkolYee/IHGVKSgm1I2PdF8yVoIRqzKCc3kXpCXSVsMfrMSavWW2/BXvKu5Orv+JGbrO5onsw==
+  dependencies:
+    qrious "^4.0.2"
+
 svelte-routing@^2.13.0:
   version "2.13.0"
   resolved "https://registry.yarnpkg.com/svelte-routing/-/svelte-routing-2.13.0.tgz#d8215a55491e32203d4eaeda20b313dd257bdce7"

diff --git a/myconext-gui/pom.xml b/myconext-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.9</version>
+        <version>7.3.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>myconext-gui</artifactId>

diff --git a/myconext-server/pom.xml b/myconext-server/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.9</version>
+        <version>7.3.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>myconext-server</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openconext</groupId>
     <artifactId>myconext</artifactId>
-    <version>7.3.9</version>
+    <version>7.3.10-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>myconext</name>
     <description>My OpenConext</description>

diff --git a/public-gui/pom.xml b/public-gui/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.9</version>
+        <version>7.3.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>public-gui</artifactId>

diff --git a/tiqr-mock/pom.xml b/tiqr-mock/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.openconext</groupId>
         <artifactId>myconext</artifactId>
-        <version>7.3.9</version>
+        <version>7.3.10-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>tiqr-mock</artifactId>