Cherry-picked from release/8.3.5

Author: oharsta

myconext-gui/src/App.svelte

@@ -53,7 +53,8 @@
                 lang = "en";
             }
             I18n.changeLocale(lang);
-            if (unprotectedRoutes.some(route => window.location.pathname.indexOf(route) > -1)) {
+            const pathname = window.location.pathname;
+            if (unprotectedRoutes.some(route => pathname.indexOf(route) > -1)) {
                 loaded = true;
             } else {
                 me()
@@ -77,7 +78,7 @@
                     })
                     .catch(e => {
                         loaded = true;
-                        $redirectPath = window.location.pathname;
+                        $redirectPath = pathname;
                         const urlSearchParams = new URLSearchParams(window.location.search);
                         const logout = urlSearchParams.get("logout");
                         const afterDelete = urlSearchParams.get("delete");
@@ -334,7 +335,7 @@
                     <Route path="/services">
                         <Home bookmark="services"/>
                     </Route>
-                    <Route path="/landing" component={Landing}/>
+                    <Route path="/landing"><Landing/></Route>
                     <Route path="/edit-name">
                         <Home bookmark="edit-name"/>
                     </Route>
@@ -365,10 +366,10 @@
                     <Route path="/add-password">
                         <Home bookmark="reset-password"/>
                     </Route>
-                    <Route path="/install-app" component={InstallApp}/>
-                    <Route path="/update-email" component={ConfirmUpdateEmail}/>
-                    <Route path="/create-from-institution" component={CreateFromInstitution}/>
-                    <Route component={NotFound}/>
+                    <Route path="/install-app"><InstallApp/></Route>
+                    <Route path="/update-email"><ConfirmUpdateEmail/></Route>
+                    <Route path="/create-from-institution"><CreateFromInstitution/></Route>
+                    <Route><NotFound/></Route>
                 </Router>
             </div>
         </div>
@@ -381,19 +382,20 @@
             <div class="content">
                 <Router url="{url}">
                     {#if $config.createEduIDInstitutionEnabled}
-                        <Route path="/create-from-institution" component={CreateFromInstitution}/>
-                        <Route path="/create-from-institution/eppn-already-linked" component={EppnAlreadyLinked}/>
-                        <Route path="/create-from-institution/attribute-missing" component={AttributeMissing}/>
-                        <Route path="/create-from-institution/expired" component={Expired}/>
+                        <Route path="/create-from-institution"><CreateFromInstitution/></Route>
+                        <Route path="/create-from-institution/eppn-already-linked"><EppnAlreadyLinked/></Route>
+                        <Route path="/create-from-institution/attribute-missing"><AttributeMissing/></Route>
+                        <Route path="/create-from-institution/expired"><Expired/></Route>
                         <Route path="/create-from-institution/verify/:hash" let:params>
                             <AwaitLinkFromInstitutionMail hash="{params.hash}"/>
                         </Route>
                         <Route path="/create-from-institution/link/:hash" let:params>
                             <LinkFromInstitution hash="{params.hash}"/>
                         </Route>
                     {/if}
-                    <Route path="/landing" component={Landing}/>
-                    <Route component={NotFound}/>
+                    <Route path="/install-app"><InstallApp/></Route>
+                    <Route path="/landing"><Landing/></Route>
+                    <Route><NotFound/></Route>
                 </Router>
             </div>
         </div>

myconext-server/pom.xml

@@ -145,7 +145,7 @@
         <dependency>
             <groupId>org.openconext</groupId>
             <artifactId>tiqr-java-connector</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.4</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>

myconext-server/src/main/java/myconext/tiqr/TiqrController.java

@@ -551,6 +551,7 @@ private ResponseEntity<FinishEnrollment> doManualResponse(ManualResponse manualR
     public ResponseEntity<Object> doEnrollment(@ModelAttribute Registration registration,
                                                @RequestParam("enrollment_secret") String enrollmentSecret) {
         registration.setEnrollmentSecret(enrollmentSecret);
+        LOG.info(String.format("Enrollment with registration %s ", registration));
         try {
             Registration savedRegistration = tiqrService.enrollData(registration);
             LOG.debug("Successful enrollment for user " + savedRegistration.getUserId());