Merge branch 'release-2.9'

adorsys · Feb 7, 2020 · ed0f919 · ed0f919
2 parents 718e242 + ae6244f
commit ed0f919
Show file tree

Hide file tree

Showing 180 changed files with 6,363 additions and 4,317 deletions.
diff --git a/certificate-generator/pom.xml b/certificate-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>psd2-dynamic-sandbox</artifactId>
         <groupId>de.adorsys.psd2.sandbox</groupId>
-        <version>2.8</version>
+        <version>2.9</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/developer-portal-ui/src/assets/UI/examples/xmls/payments/pain.001-sepa-credit-transfers.xml b/developer-portal-ui/src/assets/UI/examples/xmls/payments/pain.001-sepa-credit-transfers.xml
@@ -45,13 +45,14 @@
           </LclInstrm>
         </PmtTpInf>
         <Amt>
-          <InstdAmt Ccy="CHF">1.00</InstdAmt>
+          <InstdAmt Ccy="EUR">1.00</InstdAmt>
         </Amt>
+        <Cdtr>
+          <Nm>Some Creditor</Nm>
+        </Cdtr>
         <CdtrAcct>
           <Id>
-            <Othr>
-              <Id>01-39139-1</Id>
-            </Othr>
+            <IBAN>CH450021721745521840J</IBAN>
           </Id>
         </CdtrAcct>
         <RmtInf>

diff --git a/developer-portal-ui/src/assets/files/postman-tests.zip b/developer-portal-ui/src/assets/files/postman-tests.zip
diff --git a/developer-portal-ui/src/models/acceptType.model.ts b/developer-portal-ui/src/models/acceptType.model.ts
@@ -0,0 +1,4 @@
+export enum AcceptType {
+  xml = 'application/xml',
+  json = 'application/json',
+}
diff --git a/developer-portal-ui/src/models/paymentTypesMatrix.model.ts b/developer-portal-ui/src/models/paymentTypesMatrix.model.ts
@@ -0,0 +1,11 @@
+export interface PaymentTypesMatrix {
+  payments: Array<string>;
+  'periodic-payments': Array<string>;
+  'bulk-payments': Array<string>;
+}
+
+export enum PaymentType {
+  single = 'payments',
+  periodic = 'periodic-payments',
+  bulk = 'bulk-payments',
+}
diff --git a/...s/components/api-endpoints/accinf-transactions-get/accinf-transactions-get.component.html b/...s/components/api-endpoints/accinf-transactions-get/accinf-transactions-get.component.html
@@ -63,6 +63,7 @@
         [bookingStatusFlag]="true"
         [dateFromFlag]="true"
         [variablePathEnd]="'/transactions'"
+        acceptFlag="true"
         url="v1/accounts"
       ></app-play-wth-data>
     </ng-template>

diff --git a/...ses/components/api-endpoints/accinf-transactions-get/accinf-transactions-get.component.ts b/...ses/components/api-endpoints/accinf-transactions-get/accinf-transactions-get.component.ts
@@ -10,7 +10,6 @@ export class AccinfTransactionsGetComponent {
     'X-Request-ID': '2f77a125-aa7a-45c0-b414-cea25a116035',
     'Consent-ID': 'CONSENT_ID',
     'PSU-IP-Address': '1.1.1.1',
-    Accept: 'application/json',
   };
 
   changeSegment(segment) {

diff --git a/...ents/api-endpoints/emb-payment-init-create-post/emb-payment-init-create-post.component.ts b/...ents/api-endpoints/emb-payment-init-create-post/emb-payment-init-create-post.component.ts
@@ -29,7 +29,7 @@ export class EmbPaymentInitCreatePostComponent implements OnInit {
 
   constructor(private jsonService: JsonService) {
     jsonService
-      .getPreparedJsonData(jsonService.jsonLinks.singlePayment)
+      .getPreparedJsonData(jsonService.jsonLinks.singlePayment, true)
       .subscribe(data => (this.jsonData1 = data), error => console.log(error));
     jsonService
       .getPreparedJsonData(jsonService.jsonLinks.periodicPayment)
@@ -38,7 +38,10 @@ export class EmbPaymentInitCreatePostComponent implements OnInit {
       .getPreparedJsonData(jsonService.jsonLinks.bulkPayment)
       .subscribe(data => (this.jsonData3 = data), error => console.log(error));
     jsonService
-      .getPreparedJsonData(jsonService.jsonLinks.singlePaymentPlayWithData)
+      .getPreparedJsonData(
+        jsonService.jsonLinks.singlePaymentPlayWithData,
+        true
+      )
       .subscribe(data => (this.body = data), error => console.log(error));
     jsonService
       .getPreparedJsonData(jsonService.jsonLinks.debtorAccount)

diff --git a/...ents/api-endpoints/rdct-payment-initiation-post/rdct-payment-initiation-post.component.ts b/...ents/api-endpoints/rdct-payment-initiation-post/rdct-payment-initiation-post.component.ts
@@ -24,7 +24,7 @@ export class RdctPaymentInitiationPostComponent implements OnInit {
 
   constructor(private jsonService: JsonService) {
     jsonService
-      .getPreparedJsonData(jsonService.jsonLinks.singlePayment)
+      .getPreparedJsonData(jsonService.jsonLinks.singlePayment, true)
       .subscribe(data => (this.jsonData1 = data), error => console.log(error));
     jsonService
       .getPreparedJsonData(jsonService.jsonLinks.periodicPayment)
@@ -36,7 +36,10 @@ export class RdctPaymentInitiationPostComponent implements OnInit {
       .getPreparedJsonData(jsonService.jsonLinks.debtorAccount)
       .subscribe(data => (this.jsonData4 = data), error => console.log(error));
     jsonService
-      .getPreparedJsonData(jsonService.jsonLinks.singlePaymentPlayWithData)
+      .getPreparedJsonData(
+        jsonService.jsonLinks.singlePaymentPlayWithData,
+        true
+      )
       .subscribe(data => (this.body = data), error => console.log(error));
   }
 

diff --git a/...per-portal-ui/src/pages/test-cases/components/play-with-data/play-wth-data.component.html b/...per-portal-ui/src/pages/test-cases/components/play-with-data/play-wth-data.component.html
@@ -22,7 +22,7 @@
         id="paymentService"
         *ngIf="paymentServiceFlag"
         [(ngModel)]="paymentService"
-        (ngModelChange)="handlePaymentTypeChanged($event, false)"
+        (ngModelChange)="handlePaymentServiceChanged($event)"
       >
         <option [value]="ps" *ngFor="let ps of paymentServiceSelect">
           {{ ps }}
@@ -41,9 +41,13 @@
         id="paymentProduct"
         *ngIf="paymentProductFlag"
         [(ngModel)]="paymentProduct"
-        (ngModelChange)="handlePaymentTypeChanged($event, true)"
+        (ngModelChange)="handlePaymentProductChanged($event)"
       >
-        <option [value]="'/' + pp" *ngFor="let pp of paymentProductSelect">
+        <option
+          [value]="'/' + pp"
+          *ngFor="let pp of paymentProductSelect"
+          [selected]="'/' + pp == paymentProduct"
+        >
           {{ pp }}
         </option>
       </select>
@@ -127,10 +131,18 @@
     <span>{{ 'TEST_CASES.COMPONENTS.TH.TH_1' | translate }}</span>
     <span>{{ 'TEST_CASES.COMPONENTS.TH.TH_2' | translate }}</span>
   </div>
+
+  <div class="play-with-data-table" *ngIf="acceptFlag">
+    <span>Accept</span>
+    <select [(ngModel)]="acceptHeader" (ngModelChange)="onClear()">
+      <option *ngFor="let type of acceptTypes">{{ type }}</option>
+    </select>
+  </div>
+
   <div
     class="play-with-data-table"
     *ngFor="let item of (headers | keyvalue); let i = index; trackBy: trackByFn"
-    [ngClass]="i % 2 ? 'bg' : null"
+    [ngClass]="acceptFlag ? (i % 2 ? null : 'bg') : i % 2 ? 'bg' : null"
   >
     <span>{{ item.key }}</span>
     <input [(ngModel)]="headers[item.key]" type="text" />
@@ -184,15 +196,25 @@
 
     <div *ngIf="response['error']" class="response-body">
       <span class="status-style">Error details</span>
-      <p class="response-body-text">{{ response['error'] | json }}</p>
+      <p class="response-body-text" *ngIf="!acceptHeader || (acceptHeader == 'application/json')">
+        {{ response['error'] | json }}
+      </p>
+      <p class="response-body-text" *ngIf="acceptHeader == 'application/xml'">
+        {{ response['error'] }}
+      </p>
     </div>
 
     <div *ngIf="response.body" class="response-body">
       <span>Response body</span>
-      <p class="response-body-text">{{ response.body | json }}</p>
+      <p class="response-body-text" *ngIf="!acceptHeader || (acceptHeader == 'application/json')">
+        {{ response.body | json }}
+      </p>
+      <p class="response-body-text" *ngIf="acceptHeader == 'application/xml'">
+        {{ response.body }}
+      </p>
     </div>
 
-    <div *ngIf="fieldsToCopy.length && response.body">
+    <div *ngIf="(fieldsToCopy || resourceIds) && response.body">
       <table>
         <tr
           class="copy-field-wrapper"
@@ -225,6 +247,30 @@
             </td>
           </div>
         </tr>
+
+        <tr
+          class="copy-field-wrapper"
+          *ngFor="let resourceId of resourceIds; let i = index"
+        >
+          <div>
+            <td class="copy-label">
+              <label [for]="'input-' + i">resourceId {{ i + 1 }}</label>
+            </td>
+            <td class="copy-field">
+              <input type="text" [value]="resourceId" [id]="'input-' + i" />
+            </td>
+            <td>
+              <button
+                class="copy-btn"
+                (click)="
+                  copyService.copyThis(i, resourceIds, 'resourceId ' + (i + 1))
+                "
+              >
+                Copy
+              </button>
+            </td>
+          </div>
+        </tr>
       </table>
     </div>
   </ng-container>

diff --git a/...per-portal-ui/src/pages/test-cases/components/play-with-data/play-wth-data.component.scss b/...per-portal-ui/src/pages/test-cases/components/play-with-data/play-wth-data.component.scss
@@ -8,16 +8,19 @@
     align-items: center;
     margin-bottom: 2vw;
   }
+
   select {
     font-size: 1em;
     border: none;
     background: #f7f7f7;
     box-shadow: none;
     color: #3b4151;
   }
+
   select:focus {
     outline: unset !important;
   }
+
   .payment-id {
     font-size: 1em;
     margin-top: -0.15vw;
@@ -29,27 +32,32 @@
     background: #f7f7f7;
     color: #3b4151;
   }
+
   .payment-id:focus {
     outline: unset !important;
   }
 
   .full-path {
     margin-bottom: 2vw;
+
     span {
       padding-top: 0.5vw;
       padding-bottom: 0.5vw;
       color: #3b4151 !important;
       background: #f7f7f7;
     }
+
     span:first-child {
       font-weight: bold;
       padding-left: 0.5vw;
       padding-right: 0.35vw;
     }
+
     span:last-child {
       padding-right: 0.5vw;
     }
   }
+
   .line-command-wrapper {
     display: flex;
     align-items: center;
@@ -58,24 +66,29 @@
     padding: 0.5%;
     margin-right: 0.5vw;
     border-radius: 3px;
+
     span {
       color: #fff;
     }
   }
+
   .play-with-data-table {
     display: flex;
     align-items: center;
     padding: 0.8em 1em;
+
     span {
       width: 40%;
     }
+
     input {
       outline: none;
       width: 15vw;
       font-size: 1em;
       padding: 0.2vw 0.5vw;
     }
   }
+
   .send-body {
     textarea {
       display: block;
@@ -86,51 +99,61 @@
       margin-top: 1em;
     }
   }
+
   .send-body-title {
     margin: 2vw 0;
     display: block;
     font-size: 1.5rem;
   }
+
   .response-status {
     .status-style {
       margin: 2vw 0;
       display: block;
       font-size: 1.5rem;
     }
+
     .response-status-wrapper {
       background-color: #f3f3f3;
       padding: 0.5vw 0 0.5vw 1vw;
+
       span {
         &:first-of-type {
           margin-right: 2vw;
           font-weight: 800;
         }
       }
     }
+
     .clear-button {
-      color: red;
-      border: 2px solid red;
       min-height: 1.5rem;
       padding: 5px 25px 5px 25px;
-      font-size: 1rem;
       float: right;
       cursor: pointer;
+      background-color: #054f72;
+      color: #fff;
+      font-size: 0.8rem;
+      outline: none;
+
       &:hover {
         background-color: #d1d1d1;
         -webkit-transition: background-color 1s ease-out;
         transition: background-color 1s ease-out;
       }
     }
   }
+
   .response-body {
     overflow: hidden;
     white-space: nowrap;
     word-break: break-all;
+
     span {
       margin: 2vw 0;
       display: block;
       font-size: 1.5rem;
     }
+
     .response-body-text {
       padding: 0.7vw;
       font-size: 0.75rem;
@@ -143,20 +166,25 @@
 
   table {
     width: 100%;
+
     .copy-field-wrapper {
       div {
         width: 100%;
         display: flex;
         justify-content: space-between;
         align-items: center;
+
         .copy-label {
           width: 7vw;
+
           label {
             display: block;
           }
         }
+
         .copy-field {
           width: calc(100% - 20vw);
+
           input {
             width: 100%;
             display: block;
@@ -165,6 +193,7 @@
             font-size: 1em;
           }
         }
+
         .copy-btn {
           display: block;
           background-color: #054f72;