Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop to master #1505

Merged
merged 54 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
12adabb
Bump org.springframework.boot:spring-boot-starter-parent
dependabot[bot] Sep 25, 2023
5ee0d3f
Fix #1441: Filter jboss descriptor with bouncycastle version from pom
banterCZ Oct 5, 2023
32a039a
Fix #1442: Set develop version to 1.6.0-SNAPSHOT
banterCZ Oct 6, 2023
8a86be2
Merge pull request #1444 from wultra/issues/1442-version-1.6.0-SNAPSHOT
banterCZ Oct 6, 2023
f2c5caf
Merge pull request #1430 from wultra/dependabot/maven/org.springframe…
dependabot[bot] Oct 6, 2023
698cc22
Fix #1445: Exclude lombok from war
banterCZ Oct 6, 2023
47a8623
Merge pull request #1447 from wultra/issues/1445-exclude-lombok
banterCZ Oct 6, 2023
3f7069b
Fix #1453: DocuCheck Warnings
banterCZ Oct 11, 2023
3692968
Merge pull request #1454 from wultra/issues/docucheck-warnings
banterCZ Oct 16, 2023
a5815b0
Bump org.springframework.boot:spring-boot-starter-parent
dependabot[bot] Oct 23, 2023
88e1e63
Merge pull request #1461 from wultra/dependabot/maven/org.springframe…
dependabot[bot] Oct 23, 2023
fd5ac42
Fix #1462: Update documentation regarding AS support (#1466)
jnpsk Oct 31, 2023
2282c04
Merge pull request #1443 from wultra/issues/1441-filter-jboss-descriptor
banterCZ Nov 1, 2023
c0405e2
Fix #1469: Update Wultra dependencies to SNAPSHOT version
banterCZ Nov 1, 2023
7ad6883
Fix #1457: Executable war (#1465)
jandusil Nov 2, 2023
7cf170f
Add GitHub action for SCP deploy
banterCZ Nov 8, 2023
da21d3e
Fix #1473: HHH90000025: PostgreSQLDialect does not need to be specifi…
jnpsk Nov 8, 2023
0797659
Bump bcprov-jdk18on.version from 1.76 to 1.77
dependabot[bot] Nov 20, 2023
646a5d5
Merge pull request #1481 from wultra/dependabot/maven/bcprov-jdk18on.…
dependabot[bot] Nov 20, 2023
7994bc8
Fix #1484: Remove DELETE methods from the Next Step documentation (#1…
petrdvorak Nov 23, 2023
c774254
Bump org.springframework.boot:spring-boot-starter-parent
dependabot[bot] Nov 27, 2023
24a1c27
Merge pull request #1488 from wultra/dependabot/maven/org.springframe…
dependabot[bot] Nov 27, 2023
7ffb175
Fix #1489: Update migration guide for Postgres for OAuth 2.1 migration
romanstrobl Nov 28, 2023
4bca170
Merge pull request #1490 from wultra/issues/1489-update-migration-guide
romanstrobl Nov 29, 2023
942e231
Bump org.springdoc:springdoc-openapi-starter-webmvc-ui
dependabot[bot] Dec 4, 2023
3989619
Merge pull request #1491 from wultra/dependabot/maven/org.springdoc-s…
dependabot[bot] Dec 4, 2023
fee6ff5
Fix #1493: Update logback
banterCZ Dec 8, 2023
1edd7ec
Bump zxing.version from 3.5.0 to 3.5.2
dependabot[bot] Dec 11, 2023
a4b7e67
Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre
dependabot[bot] Dec 11, 2023
e52a3de
Merge pull request #1498 from wultra/dependabot/maven/com.google.guav…
dependabot[bot] Dec 11, 2023
bb36650
Merge pull request #1494 from wultra/issues/1493-update-logback
banterCZ Dec 12, 2023
203278b
Merge pull request #1470 from wultra/issues/1469-wultra-dependencies-…
banterCZ Dec 18, 2023
f576cc7
Fix #1506: Set release version to 1.6.0
banterCZ Dec 18, 2023
a0a8e79
Fix #1509: Update Wultra dependencies
banterCZ Dec 18, 2023
72bc61b
Fix #1511: Add Migration Guide for 1.6.0
banterCZ Dec 18, 2023
8730ffb
Merge pull request #1472 from wultra/issues/scp-deploy
banterCZ Dec 18, 2023
455fafa
Merge pull request #1512 from wultra/issues/1511-migration-guide
banterCZ Dec 18, 2023
207d0b8
Fix #1495: Custom Spring Boot Banner (#1501)
banterCZ Dec 19, 2023
1124e6c
Fix #1513: The request to non existent resource ends in 302
banterCZ Dec 20, 2023
20acb7b
Fix #1518: Prefer List.of over guava ImmutableList
banterCZ Dec 20, 2023
8452a21
Fix #1514: Add support for more languages (#1516)
zcgandcomp Dec 20, 2023
3f35ff2
Merge pull request #1519 from wultra/issues/1518-immutable-list
banterCZ Dec 20, 2023
157a891
Fix #1520: Allowed languages are not working
zcgandcomp Dec 20, 2023
82df0e9
Merge pull request #1517 from wultra/issues/1513-resources-auth
banterCZ Dec 21, 2023
4e0d6c3
Merge pull request #1523 from wultra/issues/1520-allowed-languages-no…
zcgandcomp Dec 21, 2023
b73a8f7
Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre
dependabot[bot] Dec 25, 2023
8ff8671
Merge pull request #1533 from wultra/dependabot/maven/com.google.guav…
dependabot[bot] Jan 2, 2024
6ffb439
Merge pull request #1510 from wultra/issues/1509-wultra-dependencies
banterCZ Jan 8, 2024
4e0317a
Fix #1527: Update JavaScript dependencies (#1530)
romanstrobl Jan 11, 2024
d51f03f
Bump @snyk/protect from 1.1266.0 to 1.1269.0 in /powerauth-webflow
dependabot[bot] Jan 11, 2024
1f503ad
Merge pull request #1544 from wultra/dependabot/npm_and_yarn/poweraut…
zcgandcomp Jan 12, 2024
57cd56f
Fix #1515: Enable show password (#1545)
zcgandcomp Jan 15, 2024
b1ce685
Merge pull request #1497 from wultra/dependabot/maven/zxing.version-3…
dependabot[bot] Jan 16, 2024
a6d0d94
Merge pull request #1508 from wultra/issues/1506-version-1.6.0
banterCZ Jan 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions .github/workflows/scp-deploy.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 0 additions & 4 deletions doc-private/Developer-How-To-Start.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"}`

Expand All @@ -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"}`

Expand All @@ -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"}`

Expand Down Expand 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"}`
8 changes: 4 additions & 4 deletions docs/Data-Adapter-REST-API-Reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions docs/Deploying-Wildfly.md
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions docs/Migration-Instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading