Merge pull request #1505 from wultra/develop

Merge develop to master

.github/workflows/scp-deploy.yml

@@ -0,0 +1,47 @@
+name: Run SCP deploy
+
+on:
+  workflow_dispatch:
+
+jobs:
+  scp-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v3
+        with:
+          java-version: 21
+          distribution: 'temurin'
+          server-id: jfrog-central
+          server-username: INTERNAL_USERNAME
+          server-password: INTERNAL_PASSWORD
+          cache: maven
+      - name: Run Maven Package Step
+        run: |
+          mvn -B -U package -Dmaven.test.skip=true -DuseInternalRepo=true
+        env:
+          INTERNAL_USERNAME: ${{ secrets.JFROG_USERNAME }}
+          INTERNAL_PASSWORD: ${{ secrets.JFROG_PASSWORD }}
+      - name: Set up SSH key
+        run: |
+          mkdir -p ~/.ssh
+          echo "${{ secrets.SCP_CERTIFICATE }}" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -t rsa ${{ secrets.SCP_HOST }} >> ~/.ssh/known_hosts
+      - name: Deploy powerauth-webflow.war
+        shell: bash
+        run: |
+          scp -i ~/.ssh/id_rsa **/target/powerauth-webflow-*.war ${{ secrets.SCP_USERNAME }}@${{ secrets.SCP_HOST }}:/opt/apache-tomcat/webapps/powerauth-webflow.war
+      - name: Deploy powerauth-nextstep.war
+        shell: bash
+        run: |
+          scp -i ~/.ssh/id_rsa **/target/powerauth-nextstep-*.war ${{ secrets.SCP_USERNAME }}@${{ secrets.SCP_HOST }}:/opt/apache-tomcat/webapps/powerauth-nextstep.war
+      - name: Deploy powerauth-webflow-client.war
+        shell: bash
+        run: |
+          scp -i ~/.ssh/id_rsa **/target/webflow-client-*.war ${{ secrets.SCP_USERNAME }}@${{ secrets.SCP_HOST }}:/opt/apache-tomcat/webapps/webflow-client.war
+      - name: Deploy powerauth-tpp-engine.war
+        shell: bash
+        run: |
+          scp -i ~/.ssh/id_rsa **/target/powerauth-tpp-engine-*.war ${{ secrets.SCP_USERNAME }}@${{ secrets.SCP_HOST }}:/opt/apache-tomcat/webapps/powerauth-tpp-engine.war

doc-private/Developer-How-To-Start.md

@@ -6,7 +6,6 @@
 
 ### Standalone Run
 
-- Enable maven profile `standalone`
 - Use IntelliJ Idea run configuration at `../.run/PowerAuthWebFlowApplication.run.xml`
 - Open [http://localhost:9080/powerauth-webflow/actuator/health](http://localhost:9080/powerauth-webflow/actuator/health) and you should get `{"status":"UP"}`
 
@@ -29,7 +28,6 @@ liquibase --changelog-file=./docs/db/changelog/changesets/powerauth-webflow/db.c
 
 ### Standalone Run
 
-- Enable maven profile `standalone`
 - Use IntelliJ Idea run configuration at `../.run/TppEngineApplication.run.xml`
 - Open [http://localhost:9081/tpp-engine/actuator/health](http://localhost:9081/tpp-engine/actuator/health) and you should get `{"status":"UP"}`
 
@@ -52,7 +50,6 @@ liquibase --changelog-file=./docs/db/changelog/changesets/powerauth-tpp-engine/d
 
 ### Standalone Run
 
-- Enable maven profile `standalone`
 - Use IntelliJ Idea run configuration at `../.run/NextStepApplication.run.xml`
 - Open [http://localhost:9082/powerauth-nextstep/actuator/health](http://localhost:9082/powerauth-nextstep/actuator/health) and you should get `{"status":"UP"}`
 
@@ -85,6 +82,5 @@ ALTER TABLE ns_authentication ADD CONSTRAINT ns_auth_user_fk FOREIGN KEY (user_i
 
 ### Standalone Run
 
-- Enable maven profile `standalone`
 - Use IntelliJ Idea run configuration at `../.run/PowerAuthWebFlowClientApplication.run.xml`
 - Open [http://localhost:9083/powerauth-webflow-client/actuator/health](http://localhost:9083/powerauth-webflow-client/actuator/health) and you should get `{"status":"UP"}`

docs/Data-Adapter-REST-API-Reference.md

@@ -21,10 +21,10 @@ Following topics are covered in this chapter:
 - [Verify authorization SMS code](#verify-authorization-sms-code)
 - [Verify authorization SMS code and password](#verify-authorization-sms-code-and-password)
 - [Verify a client TLS certificate](#verify-a-client-tls-certificate)
-- [Initialize OAuth 2.1 consent form](#initialize-oauth-20-consent-form)
-- [Create OAuth 2.1 consent form](#create-oauth-20-consent-form)
-- [Validate OAuth 2.1 consent form](#validate-oauth-20-consent-form)
-- [Save OAuth 2.1 consent form](#save-oauth-20-consent-form)
+- [Initialize OAuth 2.1 consent form](#initialize-oauth-21-consent-form)
+- [Create OAuth 2.1 consent form](#create-oauth-21-consent-form)
+- [Validate OAuth 2.1 consent form](#validate-oauth-21-consent-form)
+- [Save OAuth 2.1 consent form](#save-oauth-21-consent-form)
 - [Execute an AFS action](#execute-an-afs-action)
 
 You can access the generated REST API documentation in deployed Data Adapter:

docs/Deploying-Wildfly.md

@@ -25,7 +25,7 @@ Web Flow contains the following configuration in `jboss-deployment-structure.xml
 		
 		<resources>
 			<!-- use WAR provided Bouncy Castle -->
-			<resource-root path="WEB-INF/lib/bcprov-jdk18on-1.76.jar" use-physical-code-source="true"/>
+			<resource-root path="WEB-INF/lib/bcprov-jdk18on-${BC_VERSION}.jar" use-physical-code-source="true"/>
 		</resources>
 
 		<local-last value="true" />
@@ -49,7 +49,7 @@ Similarly, Next Step contains the following configuration in `jboss-deployment-s
 		
 		<resources>
 			<!-- use WAR provided Bouncy Castle -->
-			<resource-root path="WEB-INF/lib/bcprov-jdk18on-1.76.jar" use-physical-code-source="true"/>
+			<resource-root path="WEB-INF/lib/bcprov-jdk18on-${BC_VERSION}.jar" use-physical-code-source="true"/>
 		</resources>
 
 		<local-last value="true" />

docs/Migration-Instructions.md

@@ -2,6 +2,7 @@
 
 This page contains PowerAuth Web Flow migration instructions.
 
+- [PowerAuth Web Flow 1.6.0](./Web-Flow-1.6.0.md)
 - [PowerAuth Web Flow 1.5.0](./Web-Flow-1.5.0.md)
 - [PowerAuth Web Flow 1.4.0](./Web-Flow-1.4.0.md)
 - [PowerAuth Web Flow 1.3.0](./Web-Flow-1.3.0.md)