Skip to content

Commit

Permalink
Merge branch 'release-0.1.16'
Browse files Browse the repository at this point in the history
  • Loading branch information
berezkin88 committed Oct 4, 2021
2 parents 2409fed + 20b54d6 commit e7c7bb3
Show file tree
Hide file tree
Showing 202 changed files with 5,836 additions and 105 deletions.
65 changes: 37 additions & 28 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ env:
XS2A_ADAPTER_ORGANIZATION_NAME: adorsys

jobs:
build:
name: Publish project artifacts to Maven Central
build-and-push-to-dockerhub:
name: Build and push image to Dockerhub
runs-on: ubuntu-latest
steps:
- name: Git checkout
Expand All @@ -25,37 +25,14 @@ jobs:
with:
java-version: 11

- uses: actions/cache@v1
- name: Cache local Maven repository
uses: actions/cache@v2
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build & Publish
run: |
export GPG_TTY="$( tty )"
echo ${{ secrets.GPG_SECRET_KEY }} | base64 --decode | gpg --import --batch --yes
echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --batch --import-ownertrust --yes
mvn -ntp --settings scripts/mvn-release-settings.xml \
-Dhttp.keepAlive=false \
-Dmaven.wagon.http.pool=false \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
-Prelease -DskipTests -B -U deploy
shell: bash

build-and-push-to-dockerhub:
name: Build and push image to Dockerhub
runs-on: ubuntu-latest
steps:
- name: Git checkout
uses: actions/checkout@v2

- name: Setup java
uses: actions/setup-java@v1
with:
java-version: 11

- name: Build project
run: mvn clean package -Dmaven.test.skip=true -B

Expand All @@ -75,7 +52,39 @@ jobs:
with:
context: .
push: true
tags: ${DOCKERHUB_IMAGE_NAME}
tags: ${{ env.DOCKERHUB_IMAGE_NAME }}

build:
name: Publish project artifacts to Maven Central
needs: build-and-push-to-dockerhub
runs-on: ubuntu-latest
steps:
- name: Git checkout
uses: actions/checkout@v2

- name: Setup java
uses: actions/setup-java@v1
with:
java-version: 11

- uses: actions/cache@v1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Build & Publish
run: |
export GPG_TTY="$( tty )"
echo ${{ secrets.GPG_SECRET_KEY }} | base64 --decode | gpg --import --batch --yes
echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --batch --import-ownertrust --yes
mvn -ntp --settings scripts/mvn-release-settings.xml \
-Dhttp.keepAlive=false \
-Dmaven.wagon.http.pool=false \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
-Prelease -DskipTests -B -U deploy
shell: bash

build-and-deploy-docs:
name: Build and deploy documentation
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ Not all adapters have written stubs though. Responses available for the next ada
- ing-adapter
- sparkasse-adapter
- verlag-adapter
- santander-adapter
- unicredit-adapter
- commerzbank-adapter
- comdirect-adapter

New stubs will be added in time.

Expand Down
2 changes: 1 addition & 1 deletion adapters/adorsys-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>de.adorsys.xs2a.adapter</groupId>
<artifactId>xs2a-adapter</artifactId>
<version>0.1.15</version>
<version>0.1.16</version>
<relativePath>../..</relativePath>
</parent>

Expand Down
Empty file.
9 changes: 8 additions & 1 deletion adapters/comdirect-adapter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>de.adorsys.xs2a.adapter</groupId>
<artifactId>xs2a-adapter</artifactId>
<version>0.1.15</version>
<version>0.1.16</version>
<relativePath>../..</relativePath>
</parent>

Expand All @@ -24,6 +24,13 @@

<!-- test dependencies -->

<dependency>
<groupId>de.adorsys.xs2a.adapter</groupId>
<artifactId>xs2a-adapter-test</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>pro.javatar.commons</groupId>
<artifactId>javatar-commons</artifactId>
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
{
"id" : "ecb7864a-81d7-4ef0-ab96-8c9f382eb0ae",
"name" : "berlingroup_v1_consents",
"request" : {
"urlPattern" : ".*/v1/consents",
"method" : "POST",
"headers" : {
"X-Request-ID" : {
"matches" : ".+"
},
"TPP-Redirect-URI" : {
"matches" : ".+"
},
"PSU-IP-Address" : {
"matches" : ".+"
},
"Content-Type" : {
"equalTo" : "application/json; charset=UTF-8"
}
},
"bodyPatterns" : [ {
"equalToJson" : "{\"access\":{\"accounts\":[{\"iban\":\"FR7630076020821234567890186\",\"currency\":\"EUR\"}],\"balances\":[{\"iban\":\"FR7630076020821234567890186\",\"currency\":\"EUR\"}],\"transactions\":[{\"iban\":\"FR7630076020821234567890186\",\"currency\":\"EUR\"}]},\"recurringIndicator\":true,\"validUntil\":\"${json-unit.regex}\\\\d{4}-[01]\\\\d-[0-3]\\\\d\",\"frequencyPerDay\":4,\"combinedServiceIndicator\":false}",
"ignoreArrayOrder" : true,
"ignoreExtraElements" : true
} ]
},
"response" : {
"status" : 201,
"body" : "{\n \"consentStatus\" : \"received\",\n \"consentId\" : \"VALID_CONSENT_ID\",\n \"_links\" : {\n \"scaOAuth\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/.well-known/openid-configuration?authorizationId=22222222-2222-2222-2222-222222222222\"\n },\n \"scaStatus\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/consents/VALID_CONSENT_ID/authorisations/22222222-2222-2222-2222-222222222222\"\n },\n \"status\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/consents/VALID_CONSENT_ID/status\"\n },\n \"self\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/consents/VALID_CONSENT_ID\"\n }\n }\n}",
"headers" : {
"Server" : "nginx",
"Date" : "Fri, 24 Sep 2021 08:17:50 GMT",
"Content-Type" : "application/json;charset=UTF-8",
"X-Request-ID" : "a719675a-339a-45c6-be0a-7d995a65a6b0",
"Strict-Transport-Security" : [ "max-age=31536000 ; includeSubDomains", "max-age=15768000; includeSubDomains" ],
"ASPSP-SCA-Approach" : "REDIRECT",
"Location" : "https://xs2a-sandbox.comdirect.de/berlingroup/v1/consents/VALID_CONSENT_ID",
"X-Content-Type-Options" : "nosniff",
"X-XSS-Protection" : "1; mode=block",
"Pragma" : "no-cache",
"Expires" : "0",
"X-Frame-Options" : "DENY",
"Cache-Control" : "no-store, no-cache",
"Content-Security-Policy" : "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src 'self'; style-src 'self' 'unsafe-inline' https://*.googleapis.com; font-src 'self' https://*.gstatic.com; object-src 'none'",
"Referrer-Policy" : "strict-origin"
}
},
"uuid" : "ecb7864a-81d7-4ef0-ab96-8c9f382eb0ae",
"persistent" : true,
"insertionIndex" : 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"id" : "73b0a3c8-be6a-47cc-855b-be1d2ac5dc18",
"name" : "berlingroup_v1_consents_valid_consent_id",
"request" : {
"urlPattern" : ".*/v1/consents/.+",
"method" : "DELETE",
"headers" : {
"X-Request-ID" : {
"matches" : ".+"
},
"Authorization" : {
"equalTo" : "Bearer 91bf86c06f494054a164154891d462c23caf8fe7b0994d4d8da674bc78c2141a5c84866e122c461fae87ca71ae6fe487"
}
}
},
"response" : {
"status" : 204,
"headers" : {
"Server" : "nginx",
"Date" : "Fri, 24 Sep 2021 08:18:15 GMT",
"X-Request-ID" : "0e708551-89f1-4285-91c0-c875db300361",
"Strict-Transport-Security" : [ "max-age=31536000 ; includeSubDomains", "max-age=15768000; includeSubDomains" ],
"X-Content-Type-Options" : "nosniff",
"X-XSS-Protection" : "1; mode=block",
"Pragma" : "no-cache",
"Expires" : "0",
"X-Frame-Options" : "DENY",
"Cache-Control" : "no-store, no-cache",
"Content-Security-Policy" : "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src 'self'; style-src 'self' 'unsafe-inline' https://*.googleapis.com; font-src 'self' https://*.gstatic.com; object-src 'none'",
"Referrer-Policy" : "strict-origin"
}
},
"uuid" : "73b0a3c8-be6a-47cc-855b-be1d2ac5dc18",
"persistent" : true,
"insertionIndex" : 9
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"id" : "fe49eda2-bf1a-4a21-bd07-365dfdab5bb1",
"name" : "berlingroup_v1_token",
"request" : {
"urlPattern" : ".*/v1/token",
"method" : "POST",
"headers" : {
"Content-Type" : {
"equalTo" : "application/x-www-form-urlencoded"
}
},
"bodyPatterns" : [ {
"contains" : "code=AIS_VALID_CODE",
"caseInsensitive" : false
} ]
},
"response" : {
"status" : 200,
"body" : "{\n \"access_token\" : \"91bf86c06f494054a164154891d462c23caf8fe7b0994d4d8da674bc78c2141a5c84866e122c461fae87ca71ae6fe487\",\n \"token_type\" : \"Bearer\",\n \"expires_in\" : 3600,\n \"refresh_token\" : \"d6a8c7f67044463eb71fec654d69008515f3967dda4a4133b7f93470f5eb24394a7640fedbbb4660a05a2001a03a70e8\",\n \"scope\" : \"AIS:VALID_CONSENT_ID\"\n}",
"headers" : {
"Server" : "nginx",
"Date" : "Fri, 24 Sep 2021 08:17:53 GMT",
"Content-Type" : "application/json;charset=UTF-8",
"Strict-Transport-Security" : [ "max-age=31536000 ; includeSubDomains", "max-age=15768000; includeSubDomains" ],
"X-Content-Type-Options" : "nosniff",
"X-XSS-Protection" : "1; mode=block",
"Pragma" : "no-cache",
"Expires" : "0",
"X-Frame-Options" : "DENY",
"Cache-Control" : "no-store, no-cache",
"Content-Security-Policy" : "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src 'self'; style-src 'self' 'unsafe-inline' https://*.googleapis.com; font-src 'self' https://*.gstatic.com; object-src 'none'",
"Referrer-Policy" : "strict-origin"
}
},
"uuid" : "fe49eda2-bf1a-4a21-bd07-365dfdab5bb1",
"persistent" : true,
"insertionIndex" : 2
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"id" : "dbf8f9d9-b727-48f5-8ba8-4b13a32e9427",
"name" : "berlingroup_v1_accounts",
"request" : {
"urlPattern" : ".*/v1/accounts\\?withBalance=false",
"method" : "GET",
"headers" : {
"X-Request-ID" : {
"matches" : ".+"
},
"Consent-ID" : {
"equalTo" : "VALID_CONSENT_ID"
},
"Authorization" : {
"equalTo" : "Bearer 91bf86c06f494054a164154891d462c23caf8fe7b0994d4d8da674bc78c2141a5c84866e122c461fae87ca71ae6fe487"
}
}
},
"response" : {
"status" : 200,
"body" : "{\n \"accounts\" : [ {\n \"resourceId\" : \"ACCOUNT_ID_4\",\n \"name\" : \"Personal account 4\",\n \"bic\" : \"NORDFRPP\",\n \"currency\" : \"EUR\",\n \"cashAccountType\" : \"CACC\",\n \"iban\" : \"FR7630076020821234567890186\",\n \"_links\" : {\n \"account\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID_4\"\n }\n },\n \"product\" : \"SAC\"\n }, {\n \"resourceId\" : \"ACCOUNT_ID\",\n \"name\" : \"Main personal account\",\n \"bic\" : \"CCFRFRPP\",\n \"currency\" : \"EUR\",\n \"cashAccountType\" : \"CACC\",\n \"iban\" : \"FR7630056009271234567890182\",\n \"_links\" : {\n \"account\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID\"\n },\n \"balances\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID/balances\"\n },\n \"transactions\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID/transactions\"\n }\n },\n \"product\" : \"SAC\"\n }, {\n \"resourceId\" : \"ACCOUNT_ID_2\",\n \"name\" : \"Personal account 2\",\n \"bic\" : \"CMCIFRPAXXX\",\n \"currency\" : \"EUR\",\n \"cashAccountType\" : \"CACC\",\n \"iban\" : \"FR7611808009101234567890147\",\n \"_links\" : {\n \"account\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID_2\"\n },\n \"balances\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID_2/balances\"\n }\n },\n \"product\" : \"SAC\"\n }, {\n \"resourceId\" : \"ACCOUNT_ID_3\",\n \"name\" : \"Personal account 3\",\n \"bic\" : \"PSSTFRPPCNE\",\n \"currency\" : \"EUR\",\n \"cashAccountType\" : \"CACC\",\n \"iban\" : \"FR7610011000201234567890188\",\n \"_links\" : {\n \"account\" : {\n \"href\" : \"https://xs2a-sandbox.comdirect.de/berlingroup/v1/accounts/ACCOUNT_ID_3\"\n }\n },\n \"product\" : \"SAC\"\n } ]\n}",
"headers" : {
"Server" : "nginx",
"Date" : "Fri, 24 Sep 2021 08:17:57 GMT",
"Content-Type" : "application/json;charset=UTF-8",
"X-Request-ID" : "1eadb9b6-05fb-43cd-ad3e-d22daf50facc",
"Strict-Transport-Security" : [ "max-age=31536000 ; includeSubDomains", "max-age=15768000; includeSubDomains" ],
"X-Content-Type-Options" : "nosniff",
"X-XSS-Protection" : "1; mode=block",
"Pragma" : "no-cache",
"Expires" : "0",
"X-Frame-Options" : "DENY",
"Cache-Control" : "no-store, no-cache",
"Content-Security-Policy" : "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src 'self'; style-src 'self' 'unsafe-inline' https://*.googleapis.com; font-src 'self' https://*.gstatic.com; object-src 'none'",
"Referrer-Policy" : "strict-origin"
}
},
"uuid" : "dbf8f9d9-b727-48f5-8ba8-4b13a32e9427",
"persistent" : true,
"insertionIndex" : 3
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"id" : "e1b93eb0-85a0-488c-aaed-1466d71ed8d4",
"name" : "berlingroup_v1_accounts_account_id_balances",
"request" : {
"urlPattern" : ".*/v1/accounts/.+/balances",
"method" : "GET",
"headers" : {
"X-Request-ID" : {
"matches" : ".+"
},
"Consent-ID" : {
"equalTo" : "VALID_CONSENT_ID"
},
"Authorization" : {
"equalTo" : "Bearer 91bf86c06f494054a164154891d462c23caf8fe7b0994d4d8da674bc78c2141a5c84866e122c461fae87ca71ae6fe487"
}
}
},
"response" : {
"status" : 200,
"body" : "{\n \"account\" : {\n \"iban\" : \"FR7630056009271234567890182\",\n \"currency\" : \"EUR\"\n },\n \"balances\" : [ {\n \"balanceAmount\" : {\n \"currency\" : \"EUR\",\n \"amount\" : 150.02\n },\n \"lastChangeDateTime\" : \"2018-02-26T00:00:00\",\n \"referenceDate\" : \"2021-09-24\",\n \"balanceType\" : \"closingBooked\"\n }, {\n \"balanceAmount\" : {\n \"currency\" : \"EUR\",\n \"amount\" : 100.02\n },\n \"lastChangeDateTime\" : \"2021-09-24T00:00:00\",\n \"referenceDate\" : \"2018-02-27\",\n \"balanceType\" : \"expected\"\n }, {\n \"balanceAmount\" : {\n \"currency\" : \"EUR\",\n \"amount\" : 100.02\n },\n \"lastChangeDateTime\" : \"2021-09-24T00:00:00\",\n \"referenceDate\" : \"2021-09-24\",\n \"balanceType\" : \"interimAvailable\"\n }, {\n \"balanceAmount\" : {\n \"currency\" : \"EUR\",\n \"amount\" : 110\n },\n \"lastChangeDateTime\" : \"2021-09-24T00:00:00\",\n \"referenceDate\" : \"2018-02-01\",\n \"balanceType\" : \"openingBooked\"\n }, {\n \"balanceAmount\" : {\n \"currency\" : \"EUR\",\n \"amount\" : 13.37\n },\n \"lastChangeDateTime\" : \"2021-09-24T00:00:00\",\n \"referenceDate\" : \"2021-09-24\",\n \"balanceType\" : \"interimBooked\"\n }, {\n \"balanceAmount\" : {\n \"currency\" : \"EUR\",\n \"amount\" : 42\n },\n \"lastChangeDateTime\" : \"2021-09-24T00:00:00\",\n \"referenceDate\" : \"2021-09-24\",\n \"balanceType\" : \"forwardAvailable\"\n } ]\n}",
"headers" : {
"Server" : "nginx",
"Date" : "Fri, 24 Sep 2021 08:18:04 GMT",
"Content-Type" : "application/json;charset=UTF-8",
"X-Request-ID" : "c144f3f6-8881-4be9-9143-2b49e9c1949f",
"Strict-Transport-Security" : [ "max-age=31536000 ; includeSubDomains", "max-age=15768000; includeSubDomains" ],
"X-Content-Type-Options" : "nosniff",
"X-XSS-Protection" : "1; mode=block",
"Pragma" : "no-cache",
"Expires" : "0",
"X-Frame-Options" : "DENY",
"Cache-Control" : "no-store, no-cache",
"Content-Security-Policy" : "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src 'self'; style-src 'self' 'unsafe-inline' https://*.googleapis.com; font-src 'self' https://*.gstatic.com; object-src 'none'",
"Referrer-Policy" : "strict-origin"
}
},
"uuid" : "e1b93eb0-85a0-488c-aaed-1466d71ed8d4",
"persistent" : true,
"insertionIndex" : 5
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"id" : "cafd9844-e3f2-4117-a87d-52095c9313ab",
"name" : "berlingroup_v1_consents_valid_consent_id_authorisations",
"request" : {
"urlPattern" : ".*/v1/consents/.+/authorisations",
"method" : "GET",
"headers" : {
"X-Request-ID" : {
"matches" : ".+"
},
"Authorization" : {
"equalTo" : "Bearer 91bf86c06f494054a164154891d462c23caf8fe7b0994d4d8da674bc78c2141a5c84866e122c461fae87ca71ae6fe487"
}
}
},
"response" : {
"status" : 200,
"body" : "{\n \"authorisationIds\" : [ \"11111111-1111-1111-1111-111111111111\", \"22222222-2222-2222-2222-222222222222\", \"99999999-9999-9999-9999-999999999999\" ]\n}",
"headers" : {
"Server" : "nginx",
"Date" : "Fri, 24 Sep 2021 08:18:08 GMT",
"Content-Type" : "application/json;charset=UTF-8",
"X-Request-ID" : "93ab06a1-aecf-4aec-8df4-471fa9982783",
"Strict-Transport-Security" : [ "max-age=31536000 ; includeSubDomains", "max-age=15768000; includeSubDomains" ],
"X-Content-Type-Options" : "nosniff",
"X-XSS-Protection" : "1; mode=block",
"Pragma" : "no-cache",
"Expires" : "0",
"X-Frame-Options" : "DENY",
"Cache-Control" : "no-store, no-cache",
"Content-Security-Policy" : "default-src 'self'; script-src 'self' 'unsafe-eval'; img-src 'self'; style-src 'self' 'unsafe-inline' https://*.googleapis.com; font-src 'self' https://*.gstatic.com; object-src 'none'",
"Referrer-Policy" : "strict-origin"
}
},
"uuid" : "cafd9844-e3f2-4117-a87d-52095c9313ab",
"persistent" : true,
"insertionIndex" : 6
}
Loading

0 comments on commit e7c7bb3

Please sign in to comment.