Revert "Save if a Registration uses the new ID OpenConext/OpenConext-…

…myconext#552" This reverts commit d437d37.
Tiqr · Dec 9, 2024 · 37caa31 · 37caa31
1 parent d437d37
commit 37caa31
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 19 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -30,10 +30,9 @@ jobs:
           mongodb-version: ${{ matrix.mongodb-version }}
           mongodb-replica-set: test-rs
 
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v1
         with:
-          java-version: 21
-          distribution: 'temurin'
+          java-version: 11
           cache: 'maven'
 
       - name: Build with Maven

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -13,11 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 21
+      - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 21
-          distribution: 'temurin'
+          java-version: 11
           cache: 'maven'
           server-id: openconext-releases
           server-username: MAVEN_USERNAME

diff --git a/pom.xml b/pom.xml
@@ -5,12 +5,12 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>21</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <groupId>org.openconext</groupId>
     <artifactId>tiqr-java-connector</artifactId>
-    <version>2.0.0</version>
+    <version>1.1.4-SNAPSHOT</version>
     <name>tiqr-java-connector</name>
 
     <dependencies>
@@ -33,13 +33,13 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.3.39</version>
+            <version>5.3.37</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>5.3.39</version>
+            <version>5.3.37</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -118,13 +118,13 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <release>21</release>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.2.5</version>
                 <dependencies>
                     <dependency>
                         <groupId>org.junit.jupiter</groupId>
@@ -168,7 +168,7 @@
                                     <version>3.8.4</version>
                                 </requireMavenVersion>
                                 <requireJavaVersion>
-                                    <version>21</version>
+                                    <version>11</version>
                                 </requireJavaVersion>
                             </rules>
                         </configuration>

diff --git a/src/main/java/tiqr/org/DefaultTiqrService.java b/src/main/java/tiqr/org/DefaultTiqrService.java
@@ -81,7 +81,7 @@ public MetaData getMetaData(String enrollmentKey) throws TiqrException {
 
         LOG.debug("Get metadata for enrollment for user " + enrollment.getUserID());
 
-        enrollment = enrollmentRepository.save(enrollment);
+        enrollmentRepository.save(enrollment);
         return new MetaData(Service.addEnrollmentSecret(this.service, enrollmentSecret), new Identity(enrollment));
     }
 
@@ -104,7 +104,6 @@ public Registration enrollData(Registration registration) throws TiqrException {
         Instant now = Instant.now();
         registration.setCreated(now);
         registration.setUpdated(now);
-        registration.setUseDocumentIdentifier(true);
 
         Registration savedRegistration = registrationRepository.save(registration);
 
@@ -146,7 +145,7 @@ public Authentication startAuthentication(String userId, String userDisplayName,
         String challenge = Challenge.generateQH10Challenge();
         String authenticationUrl = String.format("%s/tiqrauth/?u=%s&s=%s&q=%s&i=%s&v=%s",
                 eduIdAppBaseUrl,
-                encode(registration.isUseDocumentIdentifier() ? registration.getId() : userId),
+                encode(userId),
                 encode(sessionKey),
                 encode(challenge),
                 encode(this.service.getIdentifier()),

diff --git a/src/main/java/tiqr/org/model/Identity.java b/src/main/java/tiqr/org/model/Identity.java
@@ -13,7 +13,7 @@ public class Identity {
     private String displayName;
 
     public Identity(Enrollment enrollment) {
-        this.identifier = enrollment.getId();
+        this.identifier = enrollment.getUserID();
         this.displayName = enrollment.getUserDisplayName();
     }
 }
diff --git a/src/main/java/tiqr/org/model/Registration.java b/src/main/java/tiqr/org/model/Registration.java
@@ -28,7 +28,6 @@ public class Registration implements Serializable {
     private RegistrationStatus status;
     private Instant created;
     private Instant updated;
-    private boolean useDocumentIdentifier;
 
     public void validateForInitialEnrollment() {
         validateForPushNotification();

diff --git a/src/test/java/tiqr/org/TiqrServiceTest.java b/src/test/java/tiqr/org/TiqrServiceTest.java
@@ -210,7 +210,6 @@ void enrollmentScenarioExistingInitializedRegistration() throws TiqrException {
 
     private Registration getRegistration(String enrollmentSecret) {
         Registration registration = new Registration();
-        registration.setId(UUID.randomUUID().toString());
         registration.setUserId("user-id");
         registration.setSecret(sharedSecret);
         registration.setEnrollmentSecret(enrollmentSecret);