Skip to content

Commit

Permalink
Merge branch 'release-5.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
andriimurashkin committed May 20, 2021
2 parents 79abfb8 + f4ce894 commit f64503c
Show file tree
Hide file tree
Showing 144 changed files with 1,534 additions and 1,583 deletions.
10 changes: 5 additions & 5 deletions .env
@@ -1,6 +1,6 @@
QWAC_CERTIFICATE_MOCK=-----BEGIN CERTIFICATE-----MIIFNjCCAx6gAwIBAgIERd3y8TANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQGEwJERTEQMA4GA1UECAwHQkFWQVJJQTESMBAGA1UEBwwJTnVyZW1iZXJnMSIwIAYDVQQKDBlUcnVzdCBTZXJ2aWNlIFByb3ZpZGVyIEFHMR8wHQYDVQQLDBZJbmZvcm1hdGlvbiBUZWNobm9sb2d5MB4XDTIwMDMwNTEzMzk1MFoXDTMwMDMwMzAwMDAwMFowgcExITAfBgNVBAoMGEZpY3Rpb25hbCBDb3Jwb3JhdGlvbiBBRzElMCMGCgmSJomT8ixkARkWFXB1YmxpYy5jb3Jwb3JhdGlvbi5kZTEfMB0GA1UECwwWSW5mb3JtYXRpb24gVGVjaG5vbG9neTEQMA4GA1UEBhMHR2VybWFueTEPMA0GA1UECAwGQmF5ZXJuMRIwEAYDVQQHDAlOdXJlbWJlcmcxHTAbBgNVBGEMFFBTRERFLUZBS0VOQ0EtODdCMkFDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsHAdLWn7pEAlD5daEjKv7hE4FW+vMJRrA/Bw2M/Zsu8VFfW1ARmbTgTy7rGLFBK/Y2SToEj60+5GEkCgCvi+vI/Bdykk8XqjpVsJjTW67np1b2Av8F61zvCnn2UOxBtXBHCzR1j2yz2om1IMYieGu/cDTWLNkbuoGSnj0dq4CbHp2f8ch++goffqLRXr642j8cVlqZYsapB8y+Z8IydbtNBd/XAmRTAprmdRv9B4PC7P+lIYX8QbXw77f+9/2Kty7oVHtjle+GnTR8wH5nCiMQsA9V564/34lKwuEkzuryV1HzitQ/X7FSZoiSQRTxbxjVO+xdzI3hjF2FZjVvkqywIDAQABo34wfDB6BggrBgEFBQcBAwRuMGwGBgQAgZgnAjBiMDkwEQYHBACBmCcBAwwGUFNQX0FJMBEGBwQAgZgnAQIMBlBTUF9QSTARBgcEAIGYJwEEDAZQU1BfSUMMGVRydXN0IFNlcnZpY2UgUHJvdmlkZXIgQUcMCkRFLUZBS0VOQ0EwDQYJKoZIhvcNAQELBQADggIBACKUQc3O3TOFG8tWk4sQd3f9SGlOcBOMekSXCxRgskcYkjhWW4+EN1FYzlGuXPfq1yngKaM3ss9yCDVep0MFa4hDJ/hzSSD5upExzwWDkUa97AHCjZd39W6kLaCMAc5vTbR9r7zBvMKBcAmhZ9mWCvrvbHUOURv5yBfrrEk4AM1Vakf5l+fWP4JhA779+7JlwpQRpy5dgqROwKQ2L634d2osgXUV4CkqhSUQ5LcYI4uBFyKnM0pyGaNYdKhBC95J0y5GYa7NpKJNZXf+clTbe33gCt2SFSOMa7CV5NYpnohS201uNd/ffWLzGtFBnHLNpX8qTfFc16mtIcJo6Iiof2CYgfYAyJByBC1gZHf1wAtfQzAn6JcEaJzmehXKKl9x7X62aaGan7l+MblUT65Gd+Yed+rXLF6svefbrcIbZwt/W+v1fbfnip9QEFPV3VLjg0vk9Y30ftZCcFRSHLD3mdxcVEtmVxDDxyzDUwXF7J/mi4RQhZBb3OtwwEIWC2zUaycNMZWJRI+RqfLvanlDFFMoYeSZKTFf8jS/PPcfpKOAiTGu21iuuv+gYxh/rgjW419w26ya+Q3jabaz3E9Im/opSU5sQ9W92ALA14J9VZs6v8BVmqKTB5APKfeTYoXg9MjP9fjVM/hP26kIgQVs5Bz15ov8uQlQC+OTO+2y5ozs-----END CERTIFICATE-----
SANDBOX_VERSION=5.10
LEDGERS_VERSION=4.11
XS2A_CONNECTOR_VERSION=11.2
XS2A_ASPSP_PROFILE_VERSION=11.2
XS2A_CONSENT_MANAGEMENT_VERSION=11.2
SANDBOX_VERSION=5.11
LEDGERS_VERSION=4.12
XS2A_CONNECTOR_VERSION=11.4
XS2A_ASPSP_PROFILE_VERSION=11.4
XS2A_CONSENT_MANAGEMENT_VERSION=11.4
20 changes: 12 additions & 8 deletions .github/workflows/release.yaml
@@ -1,6 +1,6 @@
name: Release CI

on:
on:
push:
tags:
- '*.*.*'
Expand Down Expand Up @@ -41,17 +41,17 @@ jobs:
- name: Build Modelbank
run: mvn -ntp -DskipTests -DskipITs -Dmaven.javadoc.skip=true clean install

- name: Check pmd
- name: Check pmd
run: mvn -ntp pmd:check

- name: Generate javadocs
- name: Generate javadocs
run: mvn -ntp javadoc:javadoc

- name: Run UI tests
- name: Run UI tests
run: mvn -ntp -DskipITs --fail-at-end clean install

- name: Run IT tests
run: mvn -ntp failsafe:integration-test failsafe:verify
- name: Run IT tests
run: mvn -ntp failsafe:integration-test failsafe:verify

sonar:
name: Publish code coverage to Sonar Cloud
Expand Down Expand Up @@ -115,6 +115,10 @@ jobs:
run: |
gpg --version
export GPG_TTY="$( tty )" #need to run to sign artifacts with maven
echo ${{ secrets.GPG_SECRET_KEY }} | base64 --decode | gpg --import --batch
echo ${{ secrets.GPG_SECRET_KEY }} | base64 --decode | gpg --import --batch
echo ${{ secrets.GPG_OWNERTRUST }} | base64 --decode | gpg --batch --import-ownertrust
mvn -ntp --settings scripts/mvn-release-settings.xml -Prelease -DskipTests -U deploy
mvn -ntp --settings scripts/mvn-release-settings.xml \
-Dhttp.keepAlive=false \
-Dmaven.wagon.http.pool=false \
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
-Prelease -DskipTests -U deploy
2 changes: 1 addition & 1 deletion developer-portal-ui/info.json
@@ -1,5 +1,5 @@
{
"name": "developer-portal",
"version": "5.10",
"version": "5.11",
"build_number": "null"
}
2 changes: 2 additions & 0 deletions developer-portal-ui/src/app/app.module.ts
Expand Up @@ -33,6 +33,7 @@ import { SettingsHttpService } from './services/settings-http.service';
import { UrlLoadService } from './services/url-load.service';
import { UrlService } from './services/url.service';
import { SanitizeHtmlPipe } from './pipes/sanitize-html.pipe';
import { MatSnackBarModule } from '@angular/material/snack-bar';

export function app_Init(settingsHttpService: SettingsHttpService) {
return () => settingsHttpService.initializeApp();
Expand Down Expand Up @@ -81,6 +82,7 @@ export function url_Init(urlLoadService: UrlLoadService) {
MarkdownModule.forRoot({
sanitize: SecurityContext.NONE,
}),
MatSnackBarModule,
],
exports: [],
providers: [
Expand Down
Expand Up @@ -223,7 +223,7 @@ div ::ng-deep {
margin: 64px 0;

.product-history-header-wrapper {
width: 50vw;
width: 91vw;
margin: 0 auto;

.title {
Expand Down Expand Up @@ -389,7 +389,7 @@ div ::ng-deep {

.any-questions {
padding: 0 25px;
width: 50%;
width: 94vw;
margin: 0 auto;
font-weight: normal;

Expand Down
Expand Up @@ -9,6 +9,7 @@ import { HttpLoaderFactory, LanguageService } from '../../services/language.serv
import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
import { HttpClient } from '@angular/common/http';
import { of } from 'rxjs';
import { MatSnackBarModule } from '@angular/material/snack-bar';

describe('HomeComponent', () => {
let component: HomeComponent;
Expand Down Expand Up @@ -86,6 +87,7 @@ describe('HomeComponent', () => {
imports: [
MarkdownModule.forRoot(),
HttpClientTestingModule,
MatSnackBarModule,
TranslateModule.forRoot({
loader: {
provide: TranslateLoader,
Expand Down
35 changes: 26 additions & 9 deletions developer-portal-ui/src/app/components/home/home.component.ts
Expand Up @@ -3,6 +3,8 @@ import { AfterViewInit, Component, OnInit } from '@angular/core';
import { CustomizeService } from '../../services/customize.service';
import { ContactInfo, Theme } from '../../models/theme.model';
import { LanguageService } from '../../services/language.service';
import { MatSnackBarHorizontalPosition, MatSnackBarVerticalPosition, MatSnackBar } from '@angular/material/snack-bar';
import browser from 'browser-detect';

@Component({
selector: 'app-home',
Expand All @@ -16,42 +18,42 @@ export class HomeComponent implements OnInit, AfterViewInit {
{
title: 'HOME.FEATURES.SLIDES.SLIDE_1.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_1.CONTENT',
photoUrl: '../../assets/icons/plug&play.png',
photoUrl: '../../assets/icons/plug&play.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_2.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_2.CONTENT',
photoUrl: '../../assets/icons/developer.png',
photoUrl: '../../assets/icons/developer.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_3.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_3.CONTENT',
photoUrl: '../../assets/icons/tested.png',
photoUrl: '../../assets/icons/tested.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_4.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_4.CONTENT',
photoUrl: '../../assets/icons/customized.png',
photoUrl: '../../assets/icons/customized.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_5.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_5.CONTENT',
photoUrl: '../../assets/icons/user-centered.png',
photoUrl: '../../assets/icons/user-centered.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_6.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_6.CONTENT',
photoUrl: '../../assets/icons/prototyp.png',
photoUrl: '../../assets/icons/prototyp.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_7.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_7.CONTENT',
photoUrl: '../../assets/icons/service.png',
photoUrl: '../../assets/icons/service.svg',
},
{
title: 'HOME.FEATURES.SLIDES.SLIDE_8.TITLE',
description: 'HOME.FEATURES.SLIDES.SLIDE_8.CONTENT',
photoUrl: '../../assets/icons/open_source.png',
photoUrl: '../../assets/icons/open_source.svg',
},
];
productHistory = [
Expand Down Expand Up @@ -98,8 +100,11 @@ export class HomeComponent implements OnInit, AfterViewInit {
showSlider: boolean;

private carouselInterval = 3000;
horizontalPosition: MatSnackBarHorizontalPosition = 'right';
verticalPosition: MatSnackBarVerticalPosition = 'top';
durationInSeconds = 5000;

constructor(private languageService: LanguageService, private customizeService: CustomizeService) {
constructor(private languageService: LanguageService, private customizeService: CustomizeService, private _snackBar: MatSnackBar) {
if (this.customizeService.currentTheme) {
this.customizeService.currentTheme.subscribe((theme: Theme) => {
if (theme.pagesSettings) {
Expand All @@ -116,6 +121,18 @@ export class HomeComponent implements OnInit, AfterViewInit {
}

ngOnInit() {
const result = browser();
if (result.name !== 'chrome' && result.name !== 'edge' && result.name !== 'safari' && result.name !== 'firefox') {
this._snackBar.open(
`Unfortunately, you are using an outdated browser. Our website may not look quite right in it. Please consider updating your browser to enjoy an optimal experience.`,
'Close',
{
horizontalPosition: this.horizontalPosition,
verticalPosition: this.verticalPosition,
duration: this.durationInSeconds,
}
);
}
this.languageService.currentLanguage.subscribe((data) => {
this.pathToFile = `${this.customizeService.currentLanguageFolder}/${data}/home.md`;
});
Expand Down
Expand Up @@ -23,11 +23,7 @@
<div class="endpoint-documentation" *ngIf="activeSegment === 'documentation'; else play_with_data">
<h1>{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.TITLE' | translate }}</h1>
<span class="bold-text">{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.SUBTITLE_1' | translate }}</span>
<p>
{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.PART_1' | translate }}
<span class="italic-text">{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.ITALIC' | translate }}</span>
{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.PART_2' | translate }}
</p>

<p>
{{ 'TEST_CASES.COMPONENTS.EMB_CONS_PUT.PART_3' | translate }} <span class="bold-text">PUT</span> endpoint
<app-line-command title="/v1/consents/{consentId}/authorisations/{authorisationId}"></app-line-command>.
Expand Down
Expand Up @@ -165,16 +165,17 @@
</select>

<ng-template #regularInput>
<input
[(ngModel)]="headers[item.key]"
type="text"
[id]="item.key"
class="mr-1"
[disabled]="item.key === 'TPP-QWAC-Certificate' && default"
/>

<div class="input-group mb-3">
<input
[(ngModel)]="headers[item.key]"
type="text"
[id]="item.key"
class="form-control"
[disabled]="item.key === 'TPP-QWAC-Certificate' && default"
/>
</div>
<app-pop-up
class="ml-1"
class="ml-1 pb-3"
[default]="default"
*ngIf="item.key === 'TPP-QWAC-Certificate'"
[certificate]="headers['TPP-QWAC-Certificate']"
Expand All @@ -188,9 +189,11 @@

<div class="play-with-data-table bg" *ngIf="consentTypeFlag">
<span>Select consent type</span>
<select id="consentTypeSelector" [(ngModel)]="selectedConsentType" (ngModelChange)="handleConsentSelected($event)">
<option *ngFor="let consent of consentTypes | keyvalue; let i = index" [value]="consent.key">{{ consent.key }}</option>
</select>
<mat-form-field appearance="fill" style="width: 24vw">
<mat-select id="consentTypeSelector" [(ngModel)]="selectedConsentType" (ngModelChange)="handleConsentSelected($event)">
<mat-option *ngFor="let consent of consentTypes | keyvalue; let i = index" [value]="consent.key">{{ consent.key }}</mat-option>
</mat-select>
</mat-form-field>
</div>

<textarea name="" id="textAreaXml" cols="30" rows="10" *ngIf="body && xml" [value]="body"></textarea>
Expand All @@ -199,7 +202,7 @@

<ng-container *ngIf="response">
<div *ngIf="response.status || response.statusText" class="response-status">
<button class="clear-button" (click)="onClear()">Clear</button> <span class="status-style">Status</span>
<button mat-button-raised class="clear-button" (click)="onClear()">Clear</button> <span class="status-style">Status</span>
<div class="response-status-wrapper">
<span>{{ response.status }}</span> <span>{{ getStatusText(response.status) }}</span>
</div>
Expand Down
Expand Up @@ -257,3 +257,6 @@ select {
display: inline;
vertical-align: inherit;
}
.example-form-field {
width: 100%;
}
Expand Up @@ -115,3 +115,20 @@
background-color: var(--testCasesRightSectionBG);
}
}
.example-action-buttons {
padding-bottom: 20px;
}

.example-headers-align .mat-expansion-panel-header-title,
.example-headers-align .mat-expansion-panel-header-description {
flex-basis: 0;
}

.example-headers-align .mat-expansion-panel-header-description {
justify-content: space-between;
align-items: center;
}

.example-headers-align .mat-form-field + .mat-form-field {
margin-left: 8px;
}
@@ -1,10 +1,11 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router, NavigationEnd } from '@angular/router';
import { DataService } from '../../services/data.service';
import { CustomizeService } from '../../services/customize.service';
import { AspspService } from '../../services/aspsp.service';
import { LanguageService } from '../../services/language.service';
import { Theme } from '../../models/theme.model';
import { MatAccordion } from '@angular/material/expansion';

@Component({
selector: 'app-test-cases',
Expand All @@ -23,6 +24,9 @@ export class TestCasesComponent implements OnInit {
fundsConfirmationSupported = true;

pathToHeadTestCases = `./assets/content/i18n/en/test-cases/headTestCases.md`;
@ViewChild(MatAccordion) accordion: MatAccordion;
panelOpenState = false;
step = 0;

constructor(
public dataService: DataService,
Expand Down Expand Up @@ -102,4 +106,15 @@ export class TestCasesComponent implements OnInit {
}
});
}
setStep(index: number) {
this.step = index;
}

nextStep() {
this.step++;
}

prevStep() {
this.step--;
}
}
Expand Up @@ -38,6 +38,17 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
import { BrowserModule } from '@angular/platform-browser';
import { CertificateService } from '../../services/certificate.service';
import { FundsConfirmationComponent } from './components/api-endpoints/funds-confirmation/funds-confirmation.component';
import { MatExpansionModule } from '@angular/material/expansion';
import { MatIconModule } from '@angular/material/icon';
import { MatInputModule } from '@angular/material/input';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatDatepickerModule } from '@angular/material/datepicker';
import { MatNativeDateModule } from '@angular/material/core';

import { MatSelectModule } from '@angular/material/select';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatListModule } from '@angular/material/list';

@NgModule({
declarations: [
Expand Down Expand Up @@ -83,6 +94,17 @@ import { FundsConfirmationComponent } from './components/api-endpoints/funds-con
NgxImageZoomModule,
MarkdownModule.forRoot(),
NgbModule,
MatExpansionModule,
MatIconModule,
MatInputModule,
MatFormFieldModule,
MatDatepickerModule,
MatNativeDateModule,
MatInputModule,
MatSelectModule,
MatButtonModule,
MatDividerModule,
MatListModule,
],
providers: [CertificateService],
exports: [LineCommandComponent, PlayWthDataComponent, CodeAreaComponent],
Expand Down
6 changes: 3 additions & 3 deletions developer-portal-ui/src/assets/content/i18n/de.json
Expand Up @@ -154,7 +154,7 @@
"PART_10": "4. Drücken Sie ",
"ITALIC_SPAN": "\"Execute\"",
"PART_11": ". Es wird Ihnen Code 200 und weitere Informationen ausgegeben.",
"TITLE_2": "SCHRITT 3: Autorisieren der Zahlung",
"TITLE_2": "SCHRITT 3: Autorisieren der Stornierung",
"PART_12": "1. Beginnen Sie mit dem Autorisierungsprozess, folgen Sie hierfür dem",
"PART_13": "Link zu der Online Banking Website."
},
Expand Down Expand Up @@ -359,9 +359,9 @@
"PART_46": "Diese TAN wird nun in der Json für den auszuführenden PUT Befehl angegeben. Als Antwort sollten Sie erneu"
},
"EMB_CANS_GET": {
"PART_1": "12. Nutzen Sie den GET Endpunkt",
"PART_1": "1. Nutzen Sie den GET Endpunkt",
"PART_2": ", um den aktuellen Status der Stornierung zu erhalten.",
"PART_3": "13. Nutzen Sie den GET Endpunkt",
"PART_3": "2. Nutzen Sie den GET Endpunkt",
"PART_4": ", um den aktuellen Status der Zahlung zu erhalten. Der Status sollte nach erfolgreichen stornieren CANC sein (CANC steht für „cancelled“)."
},
"EMB_CONS_AUTH": {
Expand Down

0 comments on commit f64503c

Please sign in to comment.