Release eumw-3.1.1

Governikus · Aug 23, 2023 · 225c2ce · 225c2ce
1 parent 8d27337
commit 225c2ce
Show file tree

Hide file tree

Showing 20 changed files with 76 additions and 90 deletions.
diff --git a/.hgtags b/.hgtags
@@ -96,3 +96,5 @@ cb306bc9c833171c91c68c53af88889159e251bc eumw-3.1.0-RC2
 2a5a673eec7f98bb6c01d06ead7dea24afa921fc eumw-3.1.0-RC5
 37226259f9f45fb2dfd85e010b4dffe8875e52fc eumw-3.1.0-RC6
 147895b9dbe033030c2f31e52e6f8ff265e3a8a0 eumw-3.1.0-RC7
+dbb0aaf15106841268b424e0a5a0b3b46bb7836d eumw-3.1.0
+6a60d2f37150a5fbf7551ae868bc1d6074ccc8fd eumw-3.1.1-RC1
diff --git a/configuration-migration/pom.xml b/configuration-migration/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/databasemigration/pom.xml b/databasemigration/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>database-migration</artifactId>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -15,11 +15,11 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>distribution</artifactId>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
     <packaging>pom</packaging>
 
     <dependencies>

diff --git a/doc/source/chapter/Changelog.rst b/doc/source/chapter/Changelog.rst
@@ -231,3 +231,7 @@ Changelog
     - eIDAS Middleware: SAML redirect binding has been added.
     - eIDAS Middleware: Added support for the natural person attribute 'Nationality'.
 
+* 3.1.1
+
+    - eIDAS Middleware: Update identglue and fix behaviour for mobile use.
+    - eIDAS Middleware: Add the shibboleth repository to pom.xml
diff --git a/doc/source/chapter/Operating.rst b/doc/source/chapter/Operating.rst
@@ -347,41 +347,6 @@ Trap prefix = |TRAP_PREFIX|
     |RSC_TRAP_NEW_PENDING_CERTIFICATE|; A new pending Request Signer Certificate has been generated; Certificate information (OCTET STRING)
 
 
-.. _database_migration:
-
-Migration Instructions
-----------------------
-In version 1.0.3 the database schema was changed to improve the handling of productive Black Lists.
-This means that you must perform a database migration when you want to upgrade a previous eIDAS Middleware Application
-to version 1.0.3 and later.
-
-The database migration tool is included in every release and can be found on github.
-
-The database migration tool needs to be configured before performing the migration.
-Because this tool uses Spring Boot as well, the configuration is done in the ``application.properties`` file that must
-be present either in the working directory or in a subdirectory of the working directory called ``config``.
-The configuration file must contain the following values. The first three values can be copied from
-the ``application.properties`` file that is used for the eIDAS Middleware Application. ::
-
-    spring.datasource.url=
-    spring.datasource.username=
-    spring.datasource.password=
-    spring.datasource.driver-class-name=org.h2.Driver
-    spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
-    spring.jpa.hibernate.ddl-auto=update
-    spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl
-    spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-
-Before running the migration tool, please create a backup of your database.
-Stop the eIDAS Middleware Application and copy the database file to your backup location,
-e.g. ``cp /opt/eidas-middleware/database/eidasmw.mv.db /path/to/your/backup-location/eidasmw.mv.db``.
-
-To perform the migration, copy the database migration JAR file to the directory where your
-configuration file is available and execute the command ``java -jar database-migration-3.1.0.jar``.
-If there are errors in the log output, please send the complete log output and some information on your environment to
-[email protected].
-
-
 Test mode
 ---------
 

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -55,9 +55,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.0'
+version = '3.1.1'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0'
+release = '3.1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/eidas-base-container/pom.xml b/eidas-base-container/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <artifactId>eumw</artifactId>
         <groupId>de.governikus.eumw</groupId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
 
     <artifactId>eidas-base-container</artifactId>

diff --git a/eidas-common/pom.xml b/eidas-common/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>eidas-common</artifactId>
 

diff --git a/eidas-demo/pom.xml b/eidas-demo/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>eidas-demo</artifactId>
 

diff --git a/eidas-middleware/pom.xml b/eidas-middleware/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>eidas-middleware</artifactId>
 
@@ -67,6 +67,10 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.webjars.npm</groupId>
+            <artifactId>ausweisapp2__identglue</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.h2database</groupId>

diff --git a/eidas-middleware/src/main/resources/i18n/messages_de.properties b/eidas-middleware/src/main/resources/i18n/messages_de.properties
@@ -20,6 +20,7 @@ content.requirements.device=2. Ein Kartenlesegerät, iOS- oder Android-Mobilger
 content.requirements.device.hint=Eine Übersicht geeigneter Kartenlesegeräte oder mobiler Geräte finden Sie unter <a href="https://www.ausweisapp.bund.de" title="https://www.ausweisapp.bund.de">https://www.ausweisapp.bund.de</a> (<a href="https://www.ausweisapp.bund.de/kompatible-geraete/kartenlesegeraete/" title="Liste der Kartenlesegeräte, die mit der AusweisApp2 kompatibel sind.">Kartenlesegerät</a> / <a href="https://www.ausweisapp.bund.de/mobile-geraete/" title="Liste der Smartphones und Tablets, die mit der AusweisApp2 kompatibel sind.">Smartphones / Tablets</a>)
 content.requirements.app=3. Die AusweisApp2
 content.requirements.app.hint=Um den Vorgang fortzusetzen, muss die AusweisApp2 gestartet sein<br /> Diese können Sie kostenlos hier herunterladen: <br> <a href="/eidas-middleware/ausweisapp-redirect?lang=de" title="Zum Download der AusweisApp2"><b>Zur Downloadseite</b></a>
+content.requirements.app.hint.mobile=Zuerst muss die mobile App installiert werden:
 content.help=<p class="fw-bold">&#9432;  Woran erkenne ich, ob die Online-Ausweisfunktion freigeschaltet ist?</p> <br>Die AusweisApp2 teilt Ihnen mit, wenn dies bei Ihnen nicht der Fall sein sollte. Sie können die Online-Ausweisfunktion bei Ihrer für die Ausgabe Ihres Ausweisdokumentes zuständigen Behörde freischalten lassen. </br></br>
 content.help.link=Nähere Informationen zum Start der AusweisApp2 finden Sie <a href="https://www.ausweisapp.bund.de/online-hilfe/" target="_blank" title="Link führt zur Online-Hilfe der AusweisApp2"><b>in der Online-Hilfe.</b></a>
 content.start=Verstanden, jetzt online ausweisen &#8594;

diff --git a/eidas-middleware/src/main/resources/i18n/messages_en.properties b/eidas-middleware/src/main/resources/i18n/messages_en.properties
@@ -19,6 +19,7 @@ content.requirements.device=2. A card reader, Android or iOS device for direct r
 content.requirements.device.hint=An overview of suitable card readers or mobile devices can be found at <a href="https://www.ausweisapp.bund.de/en" title="https://www.ausweisapp.bund.de/en">https://www.ausweisapp.bund.de/en</a> (<a href="https://www.ausweisapp.bund.de/en/compatible-devices/card-readers/" title="List of  suitable card readers">card reader</a> / <a href="https://www.ausweisapp.bund.de/en/compatible-devices/mobile-phones-and-tablets/" title="List of of suitable smartphones and tablets">smartphones / tablets</a>)
 content.requirements.app=3. The AusweisApp2
 content.requirements.app.hint=To continue the identification process the AusweisApp2 must be running<br />The App can be downloaded for free here: <br> <a href="/eidas-middleware/ausweisapp-redirect?lang=en" title="Redirect to download page"><b>To download page</b></a>
+content.requirements.app.hint.mobile=First install the AusweisApp2 on your device:
 content.help=<p class="fw-bold">&#9432; How can I tell if the online ID function is activated?</p> <br>The AusweisApp2 will inform you if this is not the case. You can have the online ID function enabled by the authority responsible for issuing your ID document.</br></br>
 content.help.link=Find further information on starting of AusweisApp2 <a href="https://www.ausweisapp.bund.de/en/online-help/" target="_blank" title="Link leads to the help pages of AusweisApp2"><b>on the help pages.</b></a>
 content.start=Understood, identify online now &#8594;

diff --git a/eidas-middleware/src/main/resources/static/js/identglue-1.0.4.umd.js b/eidas-middleware/src/main/resources/static/js/identglue-1.0.4.umd.js
diff --git a/eidas-middleware/src/main/resources/static/js/useIdentGlue.js b/eidas-middleware/src/main/resources/static/js/useIdentGlue.js
@@ -9,29 +9,27 @@
  */
 
 $(function () {
-    // Stationary Status
-    const observer = new AusweisApp2.StationaryStatusObserver((status) => {
-        console.log("new status", status);
-        if (status.status === "available") {
-            $("#client-inactive").attr("hidden", "hidden");
-            $("#client-active").removeAttr("hidden");
-        } else if (status.status === "safari") {
-            $("#client-inactive").attr("hidden", "hidden");
-            $("#client-active").attr("hidden", "hidden");
-        } else {
-            $("#client-active").attr("hidden", "hidden");
-            $("#client-inactive").removeAttr("hidden");
-        }
-    });
-    observer.observe();
-    if (observer.isMobile) {
+
+    if (AusweisApp2.isMobile()) {
         $("#goToAa2").attr("href", getEIDLink(true));
-        // Mobile
-        AusweisApp2.observeEIDLink($("#identGlueMobileLink")[0], () => {
-            console.log("App not installed?");
-            $("#eid-install-app-hint").removeAttr("hidden");
-        });
+        $("#eid-install-app-hint").removeAttr("hidden");
+        $("#eid-install-stationary").attr("hidden", "hidden");
     } else {
+        // Stationary Status
+        const observer = new AusweisApp2.StationaryStatusObserver((status) => {
+            console.log("new status", status);
+            if (status.status === "available") {
+                $("#client-inactive").attr("hidden", "hidden");
+                $("#client-active").removeAttr("hidden");
+            } else if (status.status === "safari") {
+                $("#client-inactive").attr("hidden", "hidden");
+                $("#client-active").attr("hidden", "hidden");
+            } else {
+                $("#client-active").attr("hidden", "hidden");
+                $("#client-inactive").removeAttr("hidden");
+            }
+        });
+        observer.observe();
         $("#goToAa2").attr("href", getEIDLink(false));
     }
 });

diff --git a/eidas-middleware/src/main/resources/templates/middleware.html b/eidas-middleware/src/main/resources/templates/middleware.html
@@ -26,7 +26,9 @@
     <link rel="stylesheet" th:href="@{/eidas-middleware/css/responsive.css}" type="text/css">
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <script th:src="@{/eidas-middleware/webjars/jquery/jquery.min.js}"></script>
-    <script th:src="@{/eidas-middleware/js/identglue-1.0.4.umd.js}"></script>
+
+    <script th:src="@{/eidas-middleware/webjars/ausweisapp2__identglue/dist/identglue.umd.js}" type="text/javascript"></script>
+
     <script th:src="@{/eidas-middleware/js/useIdentGlue.js}"></script>
 
 </head>
@@ -115,16 +117,14 @@ <h3 th:text="#{content.requirements.device}">2. A card reader / Android device f
                 <div class="content-inner">
                     <div class="details-list">
                         <h3 th:text="#{content.requirements.app}">3. The AusweisApp2</h3>
-                        <p class="lead" th:utext="#{content.requirements.app.hint}">
+                        <p id="eid-install-stationary" class="lead" th:utext="#{content.requirements.app.hint}">
                             The App can be downloaded for free here:
                             <br> <a href="/ausweisapp-redirect"
                                     title="Redirect to download page"><b>ausweisapp.bund.de/en/</b></a>
                         </p>
                         <div id="status">
                             <div hidden id="eid-install-app-hint">
-                                <p class="text-danger">The start of AusweisApp2 was not successful.</p>
-                                <br/>
-                                First install the AusweisApp2 on your device:<br/>
+                                <p th:utext="#{content.requirements.app.hint.mobile}"></p>
                                 <a href="https://apps.apple.com/us/app/ausweisapp2/id948660805?l=de&ls=1"
                                    target="_blank">
                                     <img th:src="@{/eidas-middleware/img/AppStore.svg}" style="height: 50px;">

diff --git a/eidas-starterkit/pom.xml b/eidas-starterkit/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>de.governikus.eumw</groupId>
         <artifactId>eumw</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
     </parent>
     <artifactId>eidas-starterkit</artifactId>