diff --git a/api/api-iam/iam-internal/src/main/config/dev-vitam/access-external-client.conf b/api/api-iam/iam-internal/src/main/config/dev-vitam/access-external-client.conf deleted file mode 100755 index ca4c9f08baf873d9aa9785cad2653545cdc0b1fa..0000000000000000000000000000000000000000 --- a/api/api-iam/iam-internal/src/main/config/dev-vitam/access-external-client.conf +++ /dev/null @@ -1,11 +0,0 @@ -serverHost: access-external.service.consul -serverPort: 8444 -secure: true -sslConfiguration : - keystore : - - keyPath: keystore_ihm-demo.p12 - keyPassword: azerty4 - truststore : - - keyPath: truststore_ihm-demo.jks - keyPassword: azerty10 -hostnameVerification: true diff --git a/api/api-iam/iam-internal/src/main/config/dev-vitam/ingest-external-client.conf b/api/api-iam/iam-internal/src/main/config/dev-vitam/ingest-external-client.conf deleted file mode 100755 index 7663d51796e848dd122012666636168b048fe99e..0000000000000000000000000000000000000000 --- a/api/api-iam/iam-internal/src/main/config/dev-vitam/ingest-external-client.conf +++ /dev/null @@ -1,11 +0,0 @@ -serverHost: ingest-external.service.consul -serverPort: 8443 -secure: true -sslConfiguration : - keystore : - - keyPath: keystore_ihm-demo.p12 - keyPassword: azerty4 - truststore : - - keyPath: truststore_ihm-demo.jks - keyPassword: azerty10 -hostnameVerification: true diff --git a/api/api-iam/iam-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 b/api/api-iam/iam-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 deleted file mode 100644 index 652b1b4c5a06351fd936695a604a0024eab3cd1d..0000000000000000000000000000000000000000 Binary files a/api/api-iam/iam-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 and /dev/null differ diff --git a/api/api-iam/iam-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks b/api/api-iam/iam-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks deleted file mode 100644 index d533f7cfe83e4a29c67eff203fecb23f9e409137..0000000000000000000000000000000000000000 Binary files a/api/api-iam/iam-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks and /dev/null differ diff --git a/api/api-referential/referential-internal/src/main/config/dev-vitam/access-external-client.conf b/api/api-referential/referential-internal/src/main/config/dev-vitam/access-external-client.conf deleted file mode 100755 index ca4c9f08baf873d9aa9785cad2653545cdc0b1fa..0000000000000000000000000000000000000000 --- a/api/api-referential/referential-internal/src/main/config/dev-vitam/access-external-client.conf +++ /dev/null @@ -1,11 +0,0 @@ -serverHost: access-external.service.consul -serverPort: 8444 -secure: true -sslConfiguration : - keystore : - - keyPath: keystore_ihm-demo.p12 - keyPassword: azerty4 - truststore : - - keyPath: truststore_ihm-demo.jks - keyPassword: azerty10 -hostnameVerification: true diff --git a/api/api-referential/referential-internal/src/main/config/dev-vitam/ingest-external-client.conf b/api/api-referential/referential-internal/src/main/config/dev-vitam/ingest-external-client.conf deleted file mode 100755 index 7663d51796e848dd122012666636168b048fe99e..0000000000000000000000000000000000000000 --- a/api/api-referential/referential-internal/src/main/config/dev-vitam/ingest-external-client.conf +++ /dev/null @@ -1,11 +0,0 @@ -serverHost: ingest-external.service.consul -serverPort: 8443 -secure: true -sslConfiguration : - keystore : - - keyPath: keystore_ihm-demo.p12 - keyPassword: azerty4 - truststore : - - keyPath: truststore_ihm-demo.jks - keyPassword: azerty10 -hostnameVerification: true diff --git a/api/api-referential/referential-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 b/api/api-referential/referential-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 deleted file mode 100644 index 652b1b4c5a06351fd936695a604a0024eab3cd1d..0000000000000000000000000000000000000000 Binary files a/api/api-referential/referential-internal/src/main/config/dev-vitam/keystore_ihm-demo.p12 and /dev/null differ diff --git a/api/api-referential/referential-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks b/api/api-referential/referential-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks deleted file mode 100644 index d533f7cfe83e4a29c67eff203fecb23f9e409137..0000000000000000000000000000000000000000 Binary files a/api/api-referential/referential-internal/src/main/config/dev-vitam/truststore_ihm-demo.jks and /dev/null differ diff --git a/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java b/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java index b17b90add6102fbb90bc2f29ff4652e6db08e77d..527e2f1095f3b9ba2536f3591e378eeb77be2078 100644 --- a/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java +++ b/commons/commons-api/src/main/java/fr/gouv/vitamui/commons/api/domain/ServicesData.java @@ -325,15 +325,6 @@ public class ServicesData { //------------------------------ PROFILES (ARCHIVE PROFILES) -------------------------------------- public static final String ROLE_GET_ARCHIVE_PROFILES = ROLE_PREFIX + "GET_ARCHIVE_PROFILES"; - - //------------------------------------ API LOGBOOK OPERATION ----------------------------------------- - - public static final String SERVICE_API_LOGBOOK_OPERATION_ROLE = "LOGBOOK_OPERATION_API"; - - public static final String ROLE_CREATE_LOGBOOK_OPERATION_ROLE = CREATE_ROLE_PREFIX + SERVICE_API_LOGBOOK_OPERATION_ROLE; - public static final String ROLE_GET_LOGBOOK_OPERATION_ROLE = GET_ROLE_PREFIX + SERVICE_API_LOGBOOK_OPERATION_ROLE; - public static final String ROLE_GET_ALL_LOGBOOK_OPERATION_ROLE = GET_ROLE_PREFIX + "ALL_" + SERVICE_API_LOGBOOK_OPERATION_ROLE; - //@formatter:off /** @@ -412,11 +403,7 @@ public class ServicesData { ROLE_RUN_AUDITS, ROLE_GET_OPERATIONS, - ROLE_RUN_PROBATIVE_VALUE, - - ROLE_CREATE_LOGBOOK_OPERATION_ROLE, - ROLE_GET_LOGBOOK_OPERATION_ROLE, - ROLE_GET_ALL_LOGBOOK_OPERATION_ROLE + ROLE_RUN_PROBATIVE_VALUE ); @@ -519,11 +506,7 @@ public class ServicesData { ROLE_DELETE_ONTOLOGIES, ROLE_RUN_AUDITS, - ROLE_RUN_PROBATIVE_VALUE, - - ROLE_CREATE_LOGBOOK_OPERATION_ROLE, - ROLE_GET_LOGBOOK_OPERATION_ROLE, - ROLE_GET_ALL_LOGBOOK_OPERATION_ROLE + ROLE_RUN_PROBATIVE_VALUE ); //@formatter:on diff --git a/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2 b/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2 index 5843cb4988b4df40052e9674a71170ffbe7c24c5..ec3c1402067f92b9c25547f1cfcb9696f1323399 100644 --- a/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2 +++ b/deployment/scripts/mongod/1.0.0/207_iam_ref.js.j2 @@ -419,15 +419,6 @@ db.profiles.insert({ "readonly": false, "customerId": "system_customer", "roles": [ - { - "name": "ROLE_CREATE_LOGBOOK_OPERATION_API" - }, - { - "name": "ROLE_GET_LOGBOOK_OPERATION_API" - }, - { - "name": "ROLE_GET_ALL_LOGBOOK_OPERATION_API" - }, { "name": "ROLE_LOGBOOKS" } diff --git a/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2 b/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2 index 906a74f65231b85b91fcb9c7d66ff6b1734cd970..2773ba60414d23be59906af9cdc2df5b6a47eeec 100644 --- a/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2 +++ b/deployment/scripts/mongod/1.0.0/210_security_ref.js.j2 @@ -25,7 +25,7 @@ db.contexts.insert({ "ROLE_GET_CONTEXTS", "ROLE_UPDATE_CONTEXTS", "ROLE_CREATE_CONTEXTS", "ROLE_GET_SECURITY_PROFILES", "ROLE_UPDATE_SECURITY_PROFILES", "ROLE_CREATE_SECURITY_PROFILES", "ROLE_DELETE_SECURITY_PROFILES", "ROLE_GET_OPERATIONS", "ROLE_RUN_AUDITS", "ROLE_RUN_PROBATIVE_VALUE", - "ROLE_CREATE_LOGBOOK_OPERATION_API", "ROLE_GET_LOGBOOK_OPERATION_API", "ROLE_GET_ALL_LOGBOOK_OPERATION_API", "ROLE_LOGBOOKS" + "ROLE_LOGBOOKS" ] }); diff --git a/ui/ui-frontend/package-lock.json b/ui/ui-frontend/package-lock.json index 2b551c337fb2f61218929a56ca25eb6b302fa324..11d01dd68c1bae2e8cec777480842965b005a862 100644 --- a/ui/ui-frontend/package-lock.json +++ b/ui/ui-frontend/package-lock.json @@ -843,7 +843,7 @@ }, "@angular/material-moment-adapter": { "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-8.2.3.tgz", + "resolved": "https://nexus.dev.programmevitam.fr/repository/npm-group/@angular/material-moment-adapter/-/material-moment-adapter-8.2.3.tgz", "integrity": "sha512-x0WE9MyQajqzGPYKm8eHcDmWWlwiobOX9rZ+V5uqY80fsvm2czk6TYnc1drFYcPAHIaIcx7je7NYOULPF1rTpw==", "requires": { "tslib": "^1.7.1" @@ -12964,7 +12964,7 @@ }, "ui-frontend-common": { "version": "file:../ui-frontend-common/ui-frontend-common-0.1.0.tgz", - "integrity": "sha512-RluantRkfYcd+qFzfD/DYQ9huDtpU+mCjAi3ugR9csL+q30ssKDjeR1yK7c11n85Sbd9hVMg1R9m0oarN/P0RA==", + "integrity": "sha512-wY+WkyoMe7RllQ8gIdculWTweuSgnMwhdTzrKMyqOxprLTObj2FBRLm95va/3JNMgAuWf5/d7VlSObjjgjnusg==", "requires": { "@angular/animations": "8.2.14", "@angular/cdk": "^8.2.3", @@ -13494,6 +13494,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -13536,6 +13537,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" } @@ -13545,6 +13547,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } diff --git a/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html index 334e844c00ff7a8a1b458af5ce71d858cb24b81c..035c5e6b03d12b3bd789f9f1ca3d4ff421c31ea3 100644 --- a/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html +++ b/ui/ui-frontend/projects/referential/src/app/logbook-operation/logbook-operation-list/logbook-operation-list.component.html @@ -2,7 +2,7 @@ <thead> <tr> <th style="width: 60px;" class="no-first-cell-padding"> - <i class="vitamui-icon vitamui-row-icon"></i> + <i class="vitamui-icon vitamui-icon-api-supervision vitamui-row-icon"></i> </th> <th> diff --git a/ui/ui-frontend/projects/referential/src/sass/styles.scss b/ui/ui-frontend/projects/referential/src/sass/styles.scss index de83712e7949dcca2ae12680fa011a6645997bc8..1e1c07caa4fbd771102c8b173680921870830b28 100644 --- a/ui/ui-frontend/projects/referential/src/sass/styles.scss +++ b/ui/ui-frontend/projects/referential/src/sass/styles.scss @@ -20,8 +20,9 @@ $grid-gutter-width: 20px; @import "tooltip"; @import "text"; -@import '../../../../dist/vitamui-library/src/sass/icons/vitamui-icons.css'; -@import '../../../../dist/vitamui-library/src/sass/styles'; + +@import '../../../../dist/sass/icons/vitamui-icons.css'; +@import '../../../../dist/sass/styles'; vitamui-common-slide-toggle {