Skip to content

Commit 027f849

Browse files
alainabbasalainabbas
committed
deploy: 188589f 
1 parent 0f6cb92 commit 027f849

17 files changed

+366
-248
lines changed

‎classes/IdentitiesActivationService.html‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ <h3 id="methods">
732732
<tr>
733733
<td class="col-md-4">
734734
<span class="modifier-icon icon ion-ios-reset"></span>
735-
<code>checkMail(data)</code>
735+
<code>checkMail(identity, data)</code>
736736
</td>
737737
</tr>
738738

@@ -765,6 +765,15 @@ <h3 id="methods">
765765
</tr>
766766
</thead>
767767
<tbody>
768+
<tr>
769+
<td>identity</td>
770+
771+
<td>
772+
No
773+
</td>
774+
775+
776+
</tr>
768777
<tr>
769778
<td>data</td>
770779

@@ -878,7 +887,7 @@ <h3 id="methods">
878887
<tr>
879888
<td class="col-md-4">
880889
<span class="modifier-icon icon ion-ios-reset"></span>
881-
<code>checkUid(data)</code>
890+
<code>checkUid(identity, data)</code>
882891
</td>
883892
</tr>
884893

@@ -891,7 +900,7 @@ <h3 id="methods">
891900
</tr>
892901
<tr>
893902
<td class="col-md-4">
894-
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:247</a></code>
903+
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:252</a></code>
895904
</div>
896905
</td>
897906
</tr>
@@ -911,6 +920,15 @@ <h3 id="methods">
911920
</tr>
912921
</thead>
913922
<tbody>
923+
<tr>
924+
<td>identity</td>
925+
926+
<td>
927+
No
928+
</td>
929+
930+
931+
</tr>
914932
<tr>
915933
<td>data</td>
916934

‎classes/IdentitiesCrudService.html‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,7 +1315,7 @@ <h3 id="methods">
13151315
<tr>
13161316
<td class="col-md-4">
13171317
<span class="modifier-icon icon ion-ios-reset"></span>
1318-
<code>checkMail(data)</code>
1318+
<code>checkMail(identity, data)</code>
13191319
</td>
13201320
</tr>
13211321

@@ -1348,6 +1348,15 @@ <h3 id="methods">
13481348
</tr>
13491349
</thead>
13501350
<tbody>
1351+
<tr>
1352+
<td>identity</td>
1353+
1354+
<td>
1355+
No
1356+
</td>
1357+
1358+
1359+
</tr>
13511360
<tr>
13521361
<td>data</td>
13531362

@@ -1461,7 +1470,7 @@ <h3 id="methods">
14611470
<tr>
14621471
<td class="col-md-4">
14631472
<span class="modifier-icon icon ion-ios-reset"></span>
1464-
<code>checkUid(data)</code>
1473+
<code>checkUid(identity, data)</code>
14651474
</td>
14661475
</tr>
14671476

@@ -1474,7 +1483,7 @@ <h3 id="methods">
14741483
</tr>
14751484
<tr>
14761485
<td class="col-md-4">
1477-
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:247</a></code>
1486+
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:252</a></code>
14781487
</div>
14791488
</td>
14801489
</tr>
@@ -1494,6 +1503,15 @@ <h3 id="methods">
14941503
</tr>
14951504
</thead>
14961505
<tbody>
1506+
<tr>
1507+
<td>identity</td>
1508+
1509+
<td>
1510+
No
1511+
</td>
1512+
1513+
1514+
</tr>
14971515
<tr>
14981516
<td>data</td>
14991517

‎classes/IdentitiesDoublonService.html‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,7 @@ <h3 id="methods">
857857
<tr>
858858
<td class="col-md-4">
859859
<span class="modifier-icon icon ion-ios-reset"></span>
860-
<code>checkMail(data)</code>
860+
<code>checkMail(identity, data)</code>
861861
</td>
862862
</tr>
863863

@@ -890,6 +890,15 @@ <h3 id="methods">
890890
</tr>
891891
</thead>
892892
<tbody>
893+
<tr>
894+
<td>identity</td>
895+
896+
<td>
897+
No
898+
</td>
899+
900+
901+
</tr>
893902
<tr>
894903
<td>data</td>
895904

@@ -1003,7 +1012,7 @@ <h3 id="methods">
10031012
<tr>
10041013
<td class="col-md-4">
10051014
<span class="modifier-icon icon ion-ios-reset"></span>
1006-
<code>checkUid(data)</code>
1015+
<code>checkUid(identity, data)</code>
10071016
</td>
10081017
</tr>
10091018

@@ -1016,7 +1025,7 @@ <h3 id="methods">
10161025
</tr>
10171026
<tr>
10181027
<td class="col-md-4">
1019-
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:247</a></code>
1028+
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:252</a></code>
10201029
</div>
10211030
</td>
10221031
</tr>
@@ -1036,6 +1045,15 @@ <h3 id="methods">
10361045
</tr>
10371046
</thead>
10381047
<tbody>
1048+
<tr>
1049+
<td>identity</td>
1050+
1051+
<td>
1052+
No
1053+
</td>
1054+
1055+
1056+
</tr>
10391057
<tr>
10401058
<td>data</td>
10411059

‎classes/IdentitiesUpsertService.html‎

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ <h3 id="methods">
966966
<tr>
967967
<td class="col-md-4">
968968
<span class="modifier-icon icon ion-ios-reset"></span>
969-
<code>checkMail(data)</code>
969+
<code>checkMail(identity, data)</code>
970970
</td>
971971
</tr>
972972

@@ -999,6 +999,15 @@ <h3 id="methods">
999999
</tr>
10001000
</thead>
10011001
<tbody>
1002+
<tr>
1003+
<td>identity</td>
1004+
1005+
<td>
1006+
No
1007+
</td>
1008+
1009+
1010+
</tr>
10021011
<tr>
10031012
<td>data</td>
10041013

@@ -1112,7 +1121,7 @@ <h3 id="methods">
11121121
<tr>
11131122
<td class="col-md-4">
11141123
<span class="modifier-icon icon ion-ios-reset"></span>
1115-
<code>checkUid(data)</code>
1124+
<code>checkUid(identity, data)</code>
11161125
</td>
11171126
</tr>
11181127

@@ -1125,7 +1134,7 @@ <h3 id="methods">
11251134
</tr>
11261135
<tr>
11271136
<td class="col-md-4">
1128-
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:247</a></code>
1137+
<div class="io-line">Defined in <code><a href="../injectables/AbstractIdentitiesService.html#source" target="_self" >AbstractIdentitiesService:252</a></code>
11291138
</div>
11301139
</td>
11311140
</tr>
@@ -1145,6 +1154,15 @@ <h3 id="methods">
11451154
</tr>
11461155
</thead>
11471156
<tbody>
1157+
<tr>
1158+
<td>identity</td>
1159+
1160+
<td>
1161+
No
1162+
</td>
1163+
1164+
1165+
</tr>
11481166
<tr>
11491167
<td>data</td>
11501168

@@ -2686,10 +2704,10 @@ <h3 id="methods">
26862704
this.logger.log(&#x60;${logPrefix} Starting additionalFields validation.&#x60;);
26872705
let validations &#x3D; await this._validation.validate(data.additionalFields,true);
26882706
//validation email and uid
2689-
if (await this.checkMail(data) &#x3D;&#x3D;&#x3D; false) {
2707+
if (await this.checkMail(identity,data) &#x3D;&#x3D;&#x3D; false) {
26902708
validations[&#x27;inetOrgPerson.mail&#x27;] &#x3D; &quot;Email déjà présent dans une autre identité&quot;
26912709
}
2692-
if (await this.checkUid(data) &#x3D;&#x3D;&#x3D; false) {
2710+
if (await this.checkUid(identity,data) &#x3D;&#x3D;&#x3D; false) {
26932711
validations[&#x27;inetOrgPerson.uid&#x27;] &#x3D; &quot;Uid déjà présent dans une autre identité&quot;
26942712
}
26952713
this.logger.log(&#x60;${logPrefix} AdditionalFields validation successful.&#x60;);
@@ -2698,17 +2716,17 @@ <h3 id="methods">
26982716
crushedUpdate[&#x27;additionalFields.validations&#x27;] &#x3D; {};
26992717
} catch (error) {
27002718
data &#x3D; this.handleValidationError(error, data, logPrefix);
2701-
crushedUpdate[&#x27;state&#x27;] &#x3D; data.state;
2719+
crushedUpdate[&#x27;state&#x27;] &#x3D; IdentityState.TO_COMPLETE;
27022720
crushedUpdate[&#x27;additionalFields.validations&#x27;] &#x3D; data.additionalFields.validations;
27032721
}
27042722
//validation email and uid
2705-
if (await this.checkMail(data) &#x3D;&#x3D;&#x3D; false){
2723+
if (await this.checkMail(identity,data) &#x3D;&#x3D;&#x3D; false){
27062724
crushedUpdate[&#x27;additionalFields.validations&#x27;][&#x27;inetOrgPerson&#x27;]&#x3D;{mail:&quot;Email déjà présent dans une autre identité&quot;}
2707-
crushedUpdate[&#x27;state&#x27;] &#x3D; data.state;
2725+
crushedUpdate[&#x27;state&#x27;] &#x3D; IdentityState.TO_COMPLETE;
27082726
}
2709-
if (await this.checkUid(data) &#x3D;&#x3D;&#x3D; false){
2727+
if (await this.checkUid(identity,data) &#x3D;&#x3D;&#x3D; false){
27102728
crushedUpdate[&#x27;additionalFields.validations&#x27;][&#x27;inetOrgPerson&#x27;]&#x3D; {uid:&quot;Uid déjà présent dans une autre identité&quot;}
2711-
crushedUpdate[&#x27;state&#x27;] &#x3D; data.state;
2729+
crushedUpdate[&#x27;state&#x27;] &#x3D; IdentityState.TO_COMPLETE;
27122730
}
27132731

27142732
const fingerprint &#x3D; await this.previewFingerprint(

‎injectables/AbstractIdentitiesService.html‎

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ <h3 id="methods">
631631
<tr>
632632
<td class="col-md-4">
633633
<span class="modifier-icon icon ion-ios-reset"></span>
634-
<code>checkMail(data)</code>
634+
<code>checkMail(identity, data)</code>
635635
</td>
636636
</tr>
637637

@@ -658,6 +658,15 @@ <h3 id="methods">
658658
</tr>
659659
</thead>
660660
<tbody>
661+
<tr>
662+
<td>identity</td>
663+
664+
<td>
665+
No
666+
</td>
667+
668+
669+
</tr>
661670
<tr>
662671
<td>data</td>
663672

@@ -765,15 +774,15 @@ <h3 id="methods">
765774
<tr>
766775
<td class="col-md-4">
767776
<span class="modifier-icon icon ion-ios-reset"></span>
768-
<code>checkUid(data)</code>
777+
<code>checkUid(identity, data)</code>
769778
</td>
770779
</tr>
771780

772781

773782
<tr>
774783
<td class="col-md-4">
775-
<div class="io-line">Defined in <a href="" data-line="247"
776-
class="link-to-prism">src/management/identities/abstract-identities.service.ts:247</a></div>
784+
<div class="io-line">Defined in <a href="" data-line="252"
785+
class="link-to-prism">src/management/identities/abstract-identities.service.ts:252</a></div>
777786
</td>
778787
</tr>
779788

@@ -792,6 +801,15 @@ <h3 id="methods">
792801
</tr>
793802
</thead>
794803
<tbody>
804+
<tr>
805+
<td>identity</td>
806+
807+
<td>
808+
No
809+
</td>
810+
811+
812+
</tr>
795813
<tr>
796814
<td>data</td>
797815

@@ -2642,12 +2660,17 @@ <h3 id="inputs">
26422660
}
26432661
}
26442662

2645-
protected async checkMail(data): Promise&lt;boolean&gt; {
2663+
protected async checkMail(identity,data): Promise&lt;boolean&gt; {
26462664
let dataDup &#x3D; 0;
26472665
if (data.inetOrgPerson.hasOwnProperty(&#x27;mail&#x27;) &amp;&amp; data.inetOrgPerson.mail !&#x3D;&#x3D; &#x27;&#x27;) {
2648-
const id &#x3D; new Types.ObjectId(data[&#x27;_id&#x27;]);
2649-
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: id }, &#x27;inetOrgPerson.mail&#x27;: data.inetOrgPerson.mail };
2650-
dataDup &#x3D; await this._model.countDocuments(f).exec()
2666+
if (identity){
2667+
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: identity._id }, &#x27;inetOrgPerson.mail&#x27;: identity.inetOrgPerson.mail };
2668+
dataDup &#x3D; await this._model.countDocuments(f).exec()
2669+
}else{
2670+
const f: any &#x3D; { &#x27;inetOrgPerson.mail&#x27;: data.inetOrgPerson.mail };
2671+
dataDup &#x3D; await this._model.countDocuments(f).exec()
2672+
}
2673+
26512674
}
26522675
if (dataDup &gt; 0) {
26532676
return false
@@ -2656,11 +2679,16 @@ <h3 id="inputs">
26562679
}
26572680
}
26582681

2659-
protected async checkUid(data): Promise&lt;boolean&gt; {
2682+
protected async checkUid(identity,data): Promise&lt;boolean&gt; {
26602683
let dataDup &#x3D; 0;
2661-
const id &#x3D; new Types.ObjectId(data[&#x27;_id&#x27;]);
2662-
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: id }, &#x27;inetOrgPerson.uid&#x27;: data.inetOrgPerson.uid };
2663-
dataDup &#x3D; await this._model.countDocuments(f).exec()
2684+
if (identity){
2685+
const f: any &#x3D; { &#x27;_id&#x27;: { $ne: identity._id }, &#x27;inetOrgPerson.uid&#x27;: identity.inetOrgPerson.uid };
2686+
dataDup &#x3D; await this._model.countDocuments(f).exec()
2687+
}else{
2688+
const f: any &#x3D; { &#x27;inetOrgPerson.uid&#x27;: data.inetOrgPerson.uid };
2689+
dataDup &#x3D; await this._model.countDocuments(f).exec()
2690+
}
2691+
26642692
if (dataDup &gt; 0) {
26652693
return false
26662694
} else {

0 commit comments

Comments
 (0)