From c2356dc36977c1608481f3114b022532cbb94fe6 Mon Sep 17 00:00:00 2001
From: Joze RIHTARSIC <joze.rihtarsic@ext.ec.europa.eu>
Date: Fri, 30 Nov 2018 06:13:34 +0100
Subject: [PATCH] Fix sql migration scrip for mysql UI disable domain item if
is not configured properly
---
...ervice-group-details-dialog.component.html | 2 +-
.../service-group-details-dialog.component.ts | 9 +++++++++
.../mysql5innoDb_4.0_to_4.1.sql | 4 ++--
.../oracle10g_4.0_to_4.1.sql | 8 ++++----
.../smp-keystore_multiple_domains.jks | Bin 62596 -> 65202 bytes
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html
index 9b0d8901b..e751dae6d 100644
--- a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html
+++ b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html
@@ -105,7 +105,7 @@
(selectionChange)="onDomainSelectionChanged($event)"
style="height: 200px; overflow-y: scroll; overflow-x: auto;">
<mat-list-option *ngFor="let domain of lookups.cachedDomainList" [value]='domain'
- style="max-width: 450px !important; word-wrap: break-word !important; height: auto; min-height: 30px !important;">
+ style="max-width: 450px !important; word-wrap: break-word !important; height: auto; min-height: 30px !important;" [disabled]="!isDomainProperlyConfigured(domain)">
{{domain.domainCode}} ({{domain.smlSubdomain}})
</mat-list-option>
</mat-selection-list>
diff --git a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
index 4ceaf7702..8feb2a986 100644
--- a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
+++ b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.ts
@@ -132,6 +132,15 @@ export class ServiceGroupDetailsDialogComponent implements OnInit {
this.changeDetector.detectChanges()
}
+ isDomainProperlyConfigured(domain: DomainRo){
+ if (this.lookups.cachedApplicationInfo.smlIntegrationOn) {
+ return domain.smlSmpId && (domain.smlClientKeyAlias || domain.smlClientCertHeader);
+ } else {
+ return true;
+ }
+
+ }
+
submitForm() {
this.checkValidity(this.dialogForm);
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql
index a704070f8..050a8452b 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/mysql5innoDb_4.0_to_4.1.sql
@@ -52,7 +52,7 @@ alter table smp_user rename to SMP_USER_BCK;
SML_SMP_ID varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
SML_SUBDOMAIN varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
SML_REGISTERED bit,
- SML_BLUE_COAT_AUTH bit;
+ SML_BLUE_COAT_AUTH bit,
primary key (ID)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -70,7 +70,7 @@ alter table smp_user rename to SMP_USER_BCK;
SML_SMP_ID varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
SML_SUBDOMAIN varchar(256) CHARACTER SET utf8 COLLATE utf8_bin,
SML_REGISTERED bit,
- SML_BLUE_COAT_AUTH bit;
+ SML_BLUE_COAT_AUTH bit,
primary key (ID, REV)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql
index dd52f2725..497d1e5ce 100644
--- a/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql
+++ b/smp-webapp/src/main/smp-setup/database-scripts/migration from 4.0.x to 4.1.0/oracle10g_4.0_to_4.1.sql
@@ -13,10 +13,10 @@ alter table SMP_USER rename to SMP_USER_BCK;
-- ---------------------------------------------------------------------------------------------------------
create sequence SMP_DOMAIN_SEQ start with 1 increment by 1;
create sequence SMP_REVISION_SEQ start with 1 increment by 1;
-create sequence SMP_SERVICE_GROUP_DOMAIN_SEQ start with 1 increment by 50;
-create sequence SMP_SERVICE_GROUP_SEQ start with 1 increment by 50;
-create sequence SMP_SERVICE_METADATA_SEQ start with 1 increment by 50;
-create sequence SMP_USER_SEQ start with 1 increment by 50;
+create sequence SMP_SERVICE_GROUP_DOMAIN_SEQ start with 1 increment by 1;
+create sequence SMP_SERVICE_GROUP_SEQ start with 1 increment by 1;
+create sequence SMP_SERVICE_METADATA_SEQ start with 1 increment by 1;
+create sequence SMP_USER_SEQ start with 1 increment by 1;
create table SMP_CERTIFICATE (
ID number(19,0) not null,
diff --git a/smp-webapp/src/test/resources/keystores/smp-keystore_multiple_domains.jks b/smp-webapp/src/test/resources/keystores/smp-keystore_multiple_domains.jks
index 349a9a10107127e59243beb1e1f3caf669b80f5d..c09e75a016ca3d746829484f349d4bfeb67f74cf 100644
GIT binary patch
delta 1442
zcmV;T1zq}t=>xL;0}TG{{_Ow&00IC205X%I#u~9ESWF5uH~;_vXJZEUd6RKR9DnU;
zgWC<$sWka$k>rzH$2idq9g$y5(4;(gZuBjo^)Zv$23eDGGqn*4Yx%E#W4fI_ODa@)
zu>1I8H|ne2d+d%;c2MGO9oqT0Cz2FzXJ|F)M*ak9<3ezT9vc*cFJ2a-I0KLn>=jO^
ztFZXAYCwiVzJY8-cMu~)z&S*VJAa*AyrX{+qn-y7BS<|25X7&ot%1ik_7n1@sO9uY
za~2hIS#%uwkL6saw-y7<2Care0fZ%l_9G)ay@E(hSiJCU!Or{`T~lvf!zEpnZ1vGn
zq3QeXg3LY9yHtT71+$%DCH6?zYN?1lAyz&%LvyTFptBx*H7M1IJdIR@?|+PTlSoU1
zdSz<Z6J8#nG6fqGxjp=}v2XtO{52tG5illsZ(<gq_o6G;^-D_TvPccSyB_8osu^87
ziaWhL^<yeV_ArElfwF36T<|9PU!>-GRA7f@^O_KK>k2)XdzS0clVTA7=!QXMRzzEd
zYiee($^qhz%l<DhD=h=&f`6_jsRWXn8O4%`jBF*0q99KGHt4>iW$Cyn`uB$Tr#F9d
z{8qAc)qTV(a402YGh|C-8ZXr~R+ox=qsm1L=Ds#^Ku!*=BW9f8_xN}KtNSwo4Z`jN
zPEPI120hjWxk2Bxh~p?X2FM<g#QZf-S4|tBteX;8`3c4{`5(I=bAR7v^l|J7&QcHt
zJJSB5{*eM?<!jypp>l!?1dY+nQy<ITBTZj(98{~0S+#5+Sp_qkM+t9Ld;X{4tBBx&
z`9vToMY1`5!Wrc!WiMP(QZFqSsol2k40ix8oJh)jFvw)EVlrBPx=1m%Ovlj)HbJ!;
z8l?bLEBWJYiw0AO78ASlb$q604Tk#as!aL6%(Z%|k+T7PWCF8)OfCuuHvj+uXJX=m
zgp+Yc9DlIwj2@v)g9H>+jz-dekmWONp7o_p0P~iKfRl+ALc<y?jV)uRDy4a3cSf|X
zy$ahta$EKyGK?PCWpRA-(|?H`m}5O<2>rik`As$Ju5Tk{>$|z9k1TTw9^}ril`l)J
zeTPW&G?^A2-PWqn3k7!E!ocl1g#R2T^0dZBD}PuLiRF)6X@SyQa6db%TTA4Ohk<pD
zO=xq#lLYp$WLYCjgwS3m$Jlc1z$4VBJYkE5f+9u0r9V+a&e%_756ln72YN|pOEFAo
z$^O!&k29dJ#LzjX-Ikp0&~!z9+((r+{WYrY2)7&rG0RMXiQ4?$Ey$!@3@Cq{9XM#n
z0Drl1bd~=M)*jDFIQU(Gma;CL2y)K>FpjAxH(|bM4q}s!`IRCTDlrLbYTaWsQZ=oT
zMCg)ZbCGt2Tn+zJLqNB#Gw}}>i43HcC7)k4J=Ysg6lCOqAGIs)&9QD7)VnxWM<G1_
zal_1}%=>h36xSkBQ5Cg*5vZuzNzFd1*MCN%L02aMa?=~rzjDEErqkm)Q&FJbM)I$n
zmzU-fl%^sijY}j<*B%I?$@<VW2o8RRBx#t}v$XOk%<>U}>q#a4Z%vpql*#qoSY*Hs
zZ^?;GsZyN{S2n_eua5eg`&xZXX_6M*CYE+N5UO#?sgH}#t)WFEeHtrLF8Aa9n}2MZ
z)J#cwYI4nya0_!zWtH4Fk2>e#%HZhfpah^q7dsR5J6Oj<Zx1-@w&>cGvgd~!bL0^l
zSwV=6EIYw*YA*##vzhIkFg6625C?Q-TkgFL>;&9*S^5WRk8@IStJ^|&v91kTrCuNO
zt-nU$dcY3CruYaGlWKa)ex@Rs@e_~8w<E%z$8NIY#XR}6(t4SI>9YZSWCF9qTNVYg
wtX3EWv)f=*N3%z*7zML2s1^mYUa}HG6h)+e3_rR;G7y4^r7&O~fnfKCBlm`>p#T5?
delta 83
zcmdn=m$~I7Gta-b|K2h%FfakJ!Q_R<q&BKW_-vjUsL!?eQ>r-Y=GzHkteZKq!`wHQ
nZU=JXHc7B<?%gBkB$BmGPRIPPuY2R3n^UCSt?jl19GeFKh8ZEH
--
GitLab