diff --git a/smp-angular/src/app/edit/edit-resources/edit-resource.component.html b/smp-angular/src/app/edit/edit-resources/edit-resource.component.html
index ef6fa4020a20167bdc3f297fe31064f8fe9c3817..dcee82a1444820c84dc7bc0e23675cb585aaddcb 100644
--- a/smp-angular/src/app/edit/edit-resources/edit-resource.component.html
+++ b/smp-angular/src/app/edit/edit-resources/edit-resource.component.html
@@ -5,7 +5,7 @@
[labelColumnContent]="searchGroupPanel">
<mat-tab-group #domainTabs
- *ngIf="!!resourceList && resourceList.length>0;else noUserAdminGroupsDataFound"
+ *ngIf="!!resourceList && resourceList.length>0;else noUserAdminGroupsDataFound"
style="height: 100%">
<mat-tab>
<ng-template mat-tab-label>
@@ -49,13 +49,13 @@
class="smp-no-data-panel"
icon="warning"
type="warning"
- label="User is not administrator of any of the resources"></smp-warning-panel>
+ [label]="filterResourceResults?'No resources for give filter':'User is not administrator of any of the resources'"></smp-warning-panel>
</ng-template>
</div>
<ng-template #searchGroupPanel>
<div
- *ngIf="!!resourceList && resourceList.length>0"
+ *ngIf="!!resourceList && resourceList.length>0 || filterResourceResults "
>
<mat-form-field style="width:100%">
<mat-label>Selected domain</mat-label>
diff --git a/smp-angular/src/app/edit/edit-resources/edit-resource.component.ts b/smp-angular/src/app/edit/edit-resources/edit-resource.component.ts
index 6b8c4e96cfc60f5feaef487c2186888eb7a46783..9af972cefa8658aa06f57971583074c014b4361b 100644
--- a/smp-angular/src/app/edit/edit-resources/edit-resource.component.ts
+++ b/smp-angular/src/app/edit/edit-resources/edit-resource.component.ts
@@ -180,6 +180,10 @@ export class EditResourceComponent implements OnInit, BeforeLeaveGuard {
this.refreshResources();
}
+ get filterResourceResults():boolean {
+ return !!this.filter["filter"]
+ }
+
get disabledResourceFilter(): boolean {
return !this._selectedGroup;
}
diff --git a/smp-angular/src/app/system-settings/user/user.service.ts b/smp-angular/src/app/system-settings/user/user.service.ts
index 250be93f341f85a77375cc70a4eaae9fb07fa92e..92deab57948fb3bff5e8e1db49370f43ad836f48 100644
--- a/smp-angular/src/app/system-settings/user/user.service.ts
+++ b/smp-angular/src/app/system-settings/user/user.service.ts
@@ -89,6 +89,7 @@ export class UserService {
.replace(SmpConstants.PATH_PARAM_ENC_CREDENTIAL_ID, credential.credentialId))
.subscribe((response: CredentialRo) => {
this.notifyAccessTokenUpdated(response)
+ this.alertService.success("Access token ["+response.name+"] has been deleted!")
}, error => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(error)){
return;
@@ -107,6 +108,7 @@ export class UserService {
.replace(SmpConstants.PATH_PARAM_ENC_CREDENTIAL_ID, credential.credentialId), credential)
.subscribe((response: CredentialRo) => {
this.notifyAccessTokenUpdated(response)
+ this.alertService.success("Access token ["+response.name+"] has been updated!")
}, error => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(error)){
return;
@@ -125,6 +127,7 @@ export class UserService {
.replace(SmpConstants.PATH_PARAM_ENC_CREDENTIAL_ID, credential.credentialId), credential)
.subscribe((response: CredentialRo) => {
this.notifyCertificateUpdated(response)
+ this.alertService.success("Certificate ["+response.name+"] has been updated!")
}, error => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(error)){
return;
@@ -143,6 +146,7 @@ export class UserService {
.replace(SmpConstants.PATH_PARAM_ENC_CREDENTIAL_ID, credential.credentialId))
.subscribe((response: CredentialRo) => {
this.notifyCertificateUpdated(response)
+ this.alertService.success("Certificate ["+response.name+"] has been deleted!")
}, error => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(error)){
return;
@@ -172,6 +176,7 @@ export class UserService {
.replace(SmpConstants.PATH_PARAM_ENC_CREDENTIAL_ID, credential.credentialId), credential)
.subscribe((response: CredentialRo) => {
this.notifyCertificateUpdated(response)
+ this.alertService.success("Certificate ["+response.name+"] has been successfully uploaded!")
}, error => {
if (this.httpErrorHandlerService.logoutOnInvalidSessionError(error)){
return;
diff --git a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts
index 7fa51b7c767fe7e59287ccc1265c1cd6ef0cb55c..facf09b10cf6ae7b220c3d7a72f00ff2ee6c8629 100644
--- a/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts
+++ b/smp-angular/src/app/user-settings/user-access-tokens/user-access-tokens.component.ts
@@ -67,7 +67,7 @@ export class UserAccessTokensComponent implements BeforeLeaveGuard {
this.dialog.open(ConfirmationDialogComponent, {
data: {
title: "Delete Access token",
- description: "Action will delete access token: " + credential.name + "!<br /><br />Do you wish to continue?"
+ description: "Action will delete access token: \"" + credential.name + "\"!<br /><br />Do you wish to continue?"
}
}).afterClosed().subscribe(result => {
if (result) {
@@ -90,7 +90,7 @@ export class UserAccessTokensComponent implements BeforeLeaveGuard {
this.dialog.open(ConfirmationDialogComponent, {
data: {
title: "Update Access token",
- description: "Action will update access token: " + credential.name + " data!<br /><br />Do you wish to continue?"
+ description: "Action will update access token: \"" + credential.name + "\"!<br /><br />Do you wish to continue?"
}
}).afterClosed().subscribe(result => {
if (result) {
diff --git a/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts b/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
index 0efdfaaf48d815e11beaf78e5c1b548d91818da4..18f4b691153d9371503f0cbddaea7724e9cb3467 100644
--- a/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
+++ b/smp-angular/src/app/user-settings/user-certificates/user-certificates.component.ts
@@ -69,8 +69,8 @@ export class UserCertificatesComponent implements BeforeLeaveGuard {
public onDeleteItemClicked(credential: CredentialRo) {
this.dialog.open(ConfirmationDialogComponent, {
data: {
- title: "Delete Access token",
- description: "Action will delete access token: " + credential.name + "!<br /><br />Do you wish to continue?"
+ title: "Delete Certificate",
+ description: "Action will delete certificate: \"" + credential.name + "\"!<br /><br />Do you wish to continue?"
}
}).afterClosed().subscribe(result => {
if (result) {
diff --git a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java
index fb3d9446574962c7c70d7c89d4bd27839cfae34f..a1da80a518ae4544cb3f70fbcf62390b171e2777 100644
--- a/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java
+++ b/smp-resource-extensions/oasis-cppa3-spi/src/main/java/eu/europa/ec/smp/spi/utils/CPPUtils.java
@@ -26,6 +26,7 @@ public class CPPUtils {
public static Certificate createCertificate(String certId, String keyInfoID) {
Certificate certificate = new Certificate();
+
certificate.setId(certId);
certificate.setKeyInfo(createCertificateKeyInfo(keyInfoID));
return certificate;
@@ -47,6 +48,7 @@ public class CPPUtils {
public static KeyInfo createCertificateKeyInfo(String keyInfoId) {
KeyInfo keyInfo = new KeyInfo();
keyInfo.setId(keyInfoId);
+
ObjectFactory xmldSigObjectFactory = new ObjectFactory();
keyInfo.getContent().add(xmldSigObjectFactory.createKeyName("cn=" + keyInfoId));
X509Data data = new X509Data();
diff --git a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPServiceMetadata20Handler.java b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPServiceMetadata20Handler.java
index 5289083d6f6e0f25e1f639507729080a8b279767..ff44ea91df42b330ca180caf5205a4c3d863d47d 100644
--- a/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPServiceMetadata20Handler.java
+++ b/smp-resource-extensions/oasis-smp-spi/src/main/java/eu/europa/ec/smp/spi/handler/OasisSMPServiceMetadata20Handler.java
@@ -93,7 +93,7 @@ public class OasisSMPServiceMetadata20Handler extends AbstractOasisSMPHandler {
endpoint.setAddressURI(new AddressURI());
endpoint.getAddressURI().setValue("http://test.ap.local/msh");
endpoint.setTransportProfileID(new TransportProfileID());
- endpoint.getTransportProfileID().setValue("bdxr-transport-ebms3-as4-v1p0");
+ endpoint.getTransportProfileID().setValue("bdxr-transport-ebms3-as4-v2p0");
Certificate certEnc = new Certificate();
certEnc.setExpirationDate(new ExpirationDate());
certEnc.setActivationDate(new ActivationDate());
@@ -105,7 +105,7 @@ public class OasisSMPServiceMetadata20Handler extends AbstractOasisSMPHandler {
certEnc.setContentBinaryObject(new ContentBinaryObject());
certEnc.getSubject().setValue("CN=test-ap-enc,OU=edelivery,O=digit,C=EU");
certEnc.getIssuer().setValue("CN=test-ap-enc,OU=edelivery,O=digit,C=EU");
- certEnc.getTypeCode().setValue("encryption");
+ certEnc.getTypeCode().setValue("http://www.w3.org/2002/03/xkms#Exchange");
certEnc.getContentBinaryObject().setValue("Put the real certificate data here".getBytes());
certEnc.getContentBinaryObject().setMimeCode("application/base64");
@@ -120,7 +120,7 @@ public class OasisSMPServiceMetadata20Handler extends AbstractOasisSMPHandler {
certSig.setIssuer(new Issuer());
certSig.getSubject().setValue("CN=test-ap-signature,OU=edelivery,O=digit,C=EU");
certSig.getIssuer().setValue("CN=test-ap-signature,OU=edelivery,O=digit,C=EU");
- certSig.getTypeCode().setValue("signature");
+ certSig.getTypeCode().setValue("http://www.w3.org/2002/03/xkms#Signature");
certSig.getContentBinaryObject().setValue("Put the real certificate data here".getBytes());
certSig.getContentBinaryObject().setMimeCode("application/base64");
endpoint.getCertificates().add(certEnc);