Merge pull request #153 from wultra/merge-upstream

Merge upstream
wultra · Nov 27, 2024 · 02fbe08 · 02fbe08
2 parents 0ed5898 + 81616a4
commit 02fbe08
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="[email protected]"
 # Prepare environment variables
 ENV JAVA_HOME=/opt/java/openjdk \
     LB_HOME=/usr/local/liquibase \
-    LB_VERSION=4.23.2 \
+    LB_VERSION=4.30.0 \
     PKG_RELEASE=1~jammy \
     TOMCAT_HOME=/usr/local/tomcat \
     TOMCAT_MAJOR=10 \

diff --git a/docs/PowerAuth-Enrollment-Server-1.10.0.md b/docs/PowerAuth-Enrollment-Server-1.10.0.md
@@ -19,3 +19,7 @@ The allowed values of the `environment` parameter are:
 - `production` - production APNs host is used for sending push messages
 
 For platforms other than APNs the parameter is not used, `null` value is allowed.
+
+## Internal Changes
+
+Operation claim now uses the new `POST /rest/v3/operation/claim` for claiming operations instead of `POST /rest/v3/operation/detail` to separate operation claim action from obtaining operation detail.
diff --git a/...server/src/main/java/com/wultra/app/enrollmentserver/impl/service/MobileTokenService.java b/...server/src/main/java/com/wultra/app/enrollmentserver/impl/service/MobileTokenService.java
@@ -28,6 +28,7 @@
 import com.wultra.security.powerauth.client.model.enumeration.SignatureType;
 import com.wultra.security.powerauth.client.model.enumeration.UserActionResult;
 import com.wultra.security.powerauth.client.model.error.PowerAuthClientException;
+import com.wultra.security.powerauth.client.model.request.OperationClaimRequest;
 import com.wultra.security.powerauth.client.model.request.OperationDetailRequest;
 import com.wultra.security.powerauth.client.model.request.OperationFailApprovalRequest;
 import com.wultra.security.powerauth.client.model.request.OperationListForUserRequest;
@@ -334,11 +335,11 @@ private OperationDetailResponse fetchOperationDetailInternal(@NotNull String ope
      * @throws MobileTokenException When the operation is in incorrect state.
      */
     private OperationDetailResponse claimOperationInternal(@NotNull String operationId, @NotNull String userId) throws PowerAuthClientException, MobileTokenException {
-        final OperationDetailRequest operationDetailRequest = new OperationDetailRequest();
-        operationDetailRequest.setOperationId(operationId);
-        operationDetailRequest.setUserId(userId);
-        final OperationDetailResponse operationDetail = powerAuthClient.operationDetail(
-                operationDetailRequest,
+        final OperationClaimRequest operationClaimRequest = new OperationClaimRequest();
+        operationClaimRequest.setOperationId(operationId);
+        operationClaimRequest.setUserId(userId);
+        final OperationDetailResponse operationDetail = powerAuthClient.operationClaim(
+                operationClaimRequest,
                 httpCustomizationService.getQueryParams(),
                 httpCustomizationService.getHttpHeaders()
         );

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.5</version>
+        <version>3.4.0</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -88,12 +88,13 @@
     </modules>
 
     <properties>
-        <openapi-generator-maven-plugin.version>7.9.0</openapi-generator-maven-plugin.version>
+        <openapi-generator-maven-plugin.version>7.10.0</openapi-generator-maven-plugin.version>
 
-        <shedlock.version>5.16.0</shedlock.version>
+        <okhttp3.version>4.12.0</okhttp3.version>
+        <shedlock.version>6.0.1</shedlock.version>
         <spring-statemachine.version>4.0.0</spring-statemachine.version>
-        <swagger-annotations-jakarta.version>2.2.25</swagger-annotations-jakarta.version>
-        <springdoc-openapi-starter-webmvc-ui.version>2.6.0</springdoc-openapi-starter-webmvc-ui.version>
+        <swagger-annotations-jakarta.version>2.2.26</swagger-annotations-jakarta.version>
+        <springdoc-openapi-starter-webmvc-ui.version>2.7.0</springdoc-openapi-starter-webmvc-ui.version>
         <moneta.version>1.4.4</moneta.version>
 
         <wultra-core.version>1.12.0-SNAPSHOT</wultra-core.version>
@@ -248,6 +249,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <!-- Testing -->
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>mockwebserver</artifactId>
+                <version>${okhttp3.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>