Merge pull request #1654 from wultra/develop

Merge develop to master
wultra · Jul 29, 2024 · f334918 · f334918
2 parents ffabec9 + 58886a6
commit f334918
Show file tree

Hide file tree

Showing 49 changed files with 877 additions and 191 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,3 +22,11 @@ updates:
     labels:
       - "npm"
       - "dependencies"
+  - package-ecosystem: "github-actions"
+    # Workflow files stored in the default location of `.github/workflows`. (You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.)
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    labels:
+      - "github-actions"
+      - "dependencies"
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -4,9 +4,6 @@ on:
   workflow_dispatch:
   push:
     branches: [ 'develop', 'master', 'releases/**' ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ 'develop', 'master', 'releases/**' ]
   schedule:
     - cron: '0 2 * * 4'
 

diff --git a/docs/Deploying-Wildfly.md b/docs/Deploying-Wildfly.md
@@ -12,7 +12,7 @@ Web Flow contains the following configuration in `jboss-deployment-structure.xml
 
 ```
 <?xml version="1.0"?>
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.3">
 	<deployment>
 		<exclude-subsystems>
 			<!-- disable the logging subsystem because the application manages its own logging independently -->
@@ -23,11 +23,6 @@ Web Flow contains the following configuration in `jboss-deployment-structure.xml
 			<module name="com.wultra.powerauth.webflow.conf" />
 		</dependencies>
 		
-		<resources>
-			<!-- use WAR provided Bouncy Castle -->
-			<resource-root path="WEB-INF/lib/bcprov-jdk18on-${BC_VERSION}.jar" use-physical-code-source="true"/>
-		</resources>
-
 		<local-last value="true" />
 	</deployment>
 </jboss-deployment-structure>
@@ -36,7 +31,7 @@ Web Flow contains the following configuration in `jboss-deployment-structure.xml
 Similarly, Next Step contains the following configuration in `jboss-deployment-structure.xml` file for JBoss / Wildfly:
 ```
 <?xml version="1.0"?>
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.3">
 	<deployment>
 		<exclude-subsystems>
 			<!-- disable the logging subsystem because the application manages its own logging independently -->
@@ -47,11 +42,6 @@ Similarly, Next Step contains the following configuration in `jboss-deployment-s
 			<module name="com.wultra.powerauth.nextstep.conf" />
 		</dependencies>
 		
-		<resources>
-			<!-- use WAR provided Bouncy Castle -->
-			<resource-root path="WEB-INF/lib/bcprov-jdk18on-${BC_VERSION}.jar" use-physical-code-source="true"/>
-		</resources>
-
 		<local-last value="true" />
 	</deployment>
 </jboss-deployment-structure>
@@ -60,7 +50,7 @@ Similarly, Next Step contains the following configuration in `jboss-deployment-s
 Optionally, TPP engine contains the following configuration in `jboss-deployment-structure.xml` file for JBoss / Wildfly:
 ```
 <?xml version="1.0"?>
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.3">
 	<deployment>
 		<exclude-subsystems>
 			<!-- disable the logging subsystem because the application manages its own logging independently -->
@@ -79,7 +69,7 @@ Optionally, Web Flow Client contains the following configuration in `jboss-deplo
 
 ```
 <?xml version="1.0"?>
-<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.2">
+<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.3">
 	<deployment>
 		<exclude-subsystems>
 			<!-- disable the resource-adapters subsystem to prevent the application's HSQLDB driver
@@ -180,15 +170,17 @@ For Next Step you can use the same configuration, just change the variable `LOG_
 
 The `application-ext.properties` file is used to override default configuration properties, for example:
 ```
+# Database Configuration
+spring.datasource.jndi-name=java:/jdbc/powerauth
+
 # PowerAuth Client configuration
 powerauth.service.url=http://[host]:[port]/powerauth-java-server/rest
 ```
 
+Mind that you should specify `spring.datasource.jndi-name` to use the application server datasource (its declaration is out of the scope of this guideline).
+When configure `spring.datasource.url`, the hikari connection pool is used.
+Spring Boot running on WildFly or JBoos initializes [JtaTransactionManager](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/transaction/jta/JtaTransactionManager.html).
+
 Web Flow Spring application uses the `ext` Spring profile which activates overriding of default properties by `application-ext.properties`.
 
 You need to configure separate `application-ext.properties` files for Web Flow and Next Step in each module. 
-
-### Bouncy Castle Installation
-
-The Bouncy Castle library for JBoss / Wildfly is included in the Web Flow and Next Step war files. The library is configured 
-using the `jboss-deployment-structure.xml` descriptor. Global module configuration of Bouncy Castle is no longer required.
diff --git a/docs/Migration-Instructions.md b/docs/Migration-Instructions.md
@@ -2,6 +2,7 @@
 
 This page contains PowerAuth Web Flow migration instructions.
 
+- [PowerAuth Web Flow 1.8.0](./Web-Flow-1.8.0.md)
 - [PowerAuth Web Flow 1.7.0](./Web-Flow-1.7.0.md)
 - [PowerAuth Web Flow 1.6.0](./Web-Flow-1.6.0.md)
 - [PowerAuth Web Flow 1.5.0](./Web-Flow-1.5.0.md)

diff --git a/docs/Next-Step-Server-REST-API-Reference.md b/docs/Next-Step-Server-REST-API-Reference.md
@@ -8823,7 +8823,6 @@ The list of expected status codes:
 ```json
 {
   "requestObject": {
-    "credentialName": "RETAIL_CREDENTIAL",
     "userId": "test1234",
     "credentialValue": ")wOI6ijUkwYI",
     "authenticationMode": "MATCH_EXACT",

diff --git a/docs/Web-Flow-1.8.0.md b/docs/Web-Flow-1.8.0.md
@@ -0,0 +1,10 @@
+# Migration from 1.7.0 to 1.8.0
+
+This guide contains instructions for migration from PowerAuth WebFlow version `1.7.x` to version `1.8.0`.
+
+## API
+
+### Attribute `credentialName` modification
+
+The attribute `credentialName` has been removed from the request object of the API endpoint `/auth/combined`. This change
+was made because the attribute was not utilized in the underlying functionality.
diff --git a/docs/Web-Flow-Configuration.md b/docs/Web-Flow-Configuration.md
@@ -27,13 +27,17 @@ powerauth.nextstep.service.url=http://localhost:8080/powerauth-nextstep
 
 # PowerAuth Server URL
 powerauth.service.url=http://localhost:8080/powerauth-java-server/rest
+powerauth.service.restClientConfig.responseTimeout=60s
+powerauth.service.restClientConfig.maxIdleTime=200s
 powerauth.service.security.clientToken=
 powerauth.service.security.clientSecret=
 # Whether invalid SSL certificates should be accepted
 powerauth.service.ssl.acceptInvalidSslCertificate=false
 
 # PowerAuth Push Server URL
 powerauth.push.service.url=http://localhost:8080/powerauth-push-server
+powerauth.push.service.restClientConfig.responseTimeout=60s
+powerauth.push.service.restClientConfig.maxIdleTime=200s
 
 # Dynamic CSS stylesheet URL
 powerauth.webflow.page.title=PowerAuth Web Flow
@@ -192,6 +196,8 @@ powerauth.dataAdapter.service.url=http://localhost:8080/powerauth-data-adapter
 
 # PowerAuth Server URL
 powerauth.service.url=http://localhost:8080/powerauth-java-server/rest
+powerauth.service.restClientConfig.responseTimeout=60s
+powerauth.service.restClientConfig.maxIdleTime=200s
 powerauth.service.security.clientToken=
 powerauth.service.security.clientSecret=
 # Whether invalid SSL certificates should be accepted

diff --git a/pom.xml b/pom.xml
@@ -8,13 +8,13 @@
 
     <groupId>io.getlime.security</groupId>
     <artifactId>powerauth-webflow-parent</artifactId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.2.4</version>
+        <version>3.3.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -91,23 +91,23 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
-        <bcprov-jdk18on.version>1.77</bcprov-jdk18on.version>
+        <bcprov-jdk18on.version>1.78.1</bcprov-jdk18on.version>
         <zxing.version>3.5.3</zxing.version>
         <passay.version>1.6.4</passay.version>
 
         <!-- Documentation Dependencies -->
-        <springdoc-openapi-starter-webmvc-ui.version>2.5.0</springdoc-openapi-starter-webmvc-ui.version>
-        <swagger-annotations-jakarta.version>2.2.21</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.22</swagger-annotations-jakarta.version>
 
         <moneta.version>1.4.4</moneta.version>
         <owasp-java-html-sanitizer.version>20240325.1</owasp-java-html-sanitizer.version>
         <logstash.version>7.4</logstash.version>
 
         <!--  Wultra dependencies  -->
-        <wultra-core.version>1.9.0</wultra-core.version>
-        <powerauth.version>1.7.0</powerauth.version>
-        <powerauth-crypto.version>1.7.0</powerauth-crypto.version>
-        <powerauth-push.version>1.7.0</powerauth-push.version>
+        <wultra-core.version>1.10.0</wultra-core.version>
+        <powerauth.version>1.8.0</powerauth.version>
+        <powerauth-crypto.version>1.8.0</powerauth-crypto.version>
+        <powerauth-push.version>1.8.0</powerauth-push.version>
     </properties>
 
     <dependencyManagement>

diff --git a/powerauth-data-adapter-client/pom.xml b/powerauth-data-adapter-client/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-data-adapter-model/pom.xml b/powerauth-data-adapter-model/pom.xml
@@ -28,7 +28,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-mtoken-model/pom.xml b/powerauth-mtoken-model/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <dependencies>

diff --git a/powerauth-nextstep-client/pom.xml b/powerauth-nextstep-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <artifactId>powerauth-webflow-parent</artifactId>
         <groupId>io.getlime.security</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <artifactId>powerauth-nextstep-client</artifactId>