Skip to content

Commit fe19e27

Browse files
alainabbasalainabbas
committed
deploy: e051804 
1 parent 9eb2997 commit fe19e27

File tree

17 files changed

+275
-245
lines changed

17 files changed

+275
-245
lines changed

‎injectables/PasswdService.html‎

Lines changed: 32 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -420,8 +420,8 @@ <h3 id="methods">
420420

421421
<tr>
422422
<td class="col-md-4">
423-
<div class="io-line">Defined in <a href="" data-line="272"
424-
class="link-to-prism">src/management/passwd/passwd.service.ts:272</a></div>
423+
<div class="io-line">Defined in <a href="" data-line="276"
424+
class="link-to-prism">src/management/passwd/passwd.service.ts:276</a></div>
425425
</td>
426426
</tr>
427427

@@ -583,8 +583,8 @@ <h3 id="methods">
583583

584584
<tr>
585585
<td class="col-md-4">
586-
<div class="io-line">Defined in <a href="" data-line="475"
587-
class="link-to-prism">src/management/passwd/passwd.service.ts:475</a></div>
586+
<div class="io-line">Defined in <a href="" data-line="485"
587+
class="link-to-prism">src/management/passwd/passwd.service.ts:485</a></div>
588588
</td>
589589
</tr>
590590

@@ -623,8 +623,8 @@ <h3 id="methods">
623623

624624
<tr>
625625
<td class="col-md-4">
626-
<div class="io-line">Defined in <a href="" data-line="333"
627-
class="link-to-prism">src/management/passwd/passwd.service.ts:333</a></div>
626+
<div class="io-line">Defined in <a href="" data-line="337"
627+
class="link-to-prism">src/management/passwd/passwd.service.ts:337</a></div>
628628
</td>
629629
</tr>
630630

@@ -693,8 +693,8 @@ <h3 id="methods">
693693

694694
<tr>
695695
<td class="col-md-4">
696-
<div class="io-line">Defined in <a href="" data-line="310"
697-
class="link-to-prism">src/management/passwd/passwd.service.ts:310</a></div>
696+
<div class="io-line">Defined in <a href="" data-line="314"
697+
class="link-to-prism">src/management/passwd/passwd.service.ts:314</a></div>
698698
</td>
699699
</tr>
700700

@@ -775,8 +775,8 @@ <h3 id="methods">
775775

776776
<tr>
777777
<td class="col-md-4">
778-
<div class="io-line">Defined in <a href="" data-line="451"
779-
class="link-to-prism">src/management/passwd/passwd.service.ts:451</a></div>
778+
<div class="io-line">Defined in <a href="" data-line="459"
779+
class="link-to-prism">src/management/passwd/passwd.service.ts:459</a></div>
780780
</td>
781781
</tr>
782782

@@ -885,8 +885,8 @@ <h3 id="methods">
885885

886886
<tr>
887887
<td class="col-md-4">
888-
<div class="io-line">Defined in <a href="" data-line="436"
889-
class="link-to-prism">src/management/passwd/passwd.service.ts:436</a></div>
888+
<div class="io-line">Defined in <a href="" data-line="444"
889+
class="link-to-prism">src/management/passwd/passwd.service.ts:444</a></div>
890890
</td>
891891
</tr>
892892

@@ -1025,8 +1025,8 @@ <h3 id="methods">
10251025

10261026
<tr>
10271027
<td class="col-md-4">
1028-
<div class="io-line">Defined in <a href="" data-line="398"
1029-
class="link-to-prism">src/management/passwd/passwd.service.ts:398</a></div>
1028+
<div class="io-line">Defined in <a href="" data-line="406"
1029+
class="link-to-prism">src/management/passwd/passwd.service.ts:406</a></div>
10301030
</td>
10311031
</tr>
10321032

@@ -1095,8 +1095,8 @@ <h3 id="methods">
10951095

10961096
<tr>
10971097
<td class="col-md-4">
1098-
<div class="io-line">Defined in <a href="" data-line="355"
1099-
class="link-to-prism">src/management/passwd/passwd.service.ts:355</a></div>
1098+
<div class="io-line">Defined in <a href="" data-line="359"
1099+
class="link-to-prism">src/management/passwd/passwd.service.ts:359</a></div>
11001100
</td>
11011101
</tr>
11021102

@@ -1165,8 +1165,8 @@ <h3 id="methods">
11651165

11661166
<tr>
11671167
<td class="col-md-4">
1168-
<div class="io-line">Defined in <a href="" data-line="462"
1169-
class="link-to-prism">src/management/passwd/passwd.service.ts:462</a></div>
1168+
<div class="io-line">Defined in <a href="" data-line="470"
1169+
class="link-to-prism">src/management/passwd/passwd.service.ts:470</a></div>
11701170
</td>
11711171
</tr>
11721172

@@ -1540,7 +1540,7 @@ <h3 id="inputs">
15401540
try {
15411541
const identity &#x3D; (await this.identities.findOne({ &#x27;inetOrgPerson.uid&#x27;: initDto.uid })) as Identities;
15421542
//test si on peu reninitialiser le compte
1543-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
1543+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
15441544
throw new BadRequestException(
15451545
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
15461546
);
@@ -1619,7 +1619,7 @@ <h3 id="inputs">
16191619
try {
16201620
const identity &#x3D; (await this.identities.findOne({ &#x27;inetOrgPerson.uid&#x27;: initDto.uid })) as Identities;
16211621
//test si on peu reninitialiser le compte
1622-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
1622+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
16231623
throw new BadRequestException(
16241624
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
16251625
);
@@ -1683,7 +1683,7 @@ <h3 id="inputs">
16831683
&#x27;inetOrgPerson.uid&#x27;: passwdDto.uid,
16841684
state: IdentityState.SYNCED,
16851685
})) as Identities;
1686-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
1686+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
16871687
throw new BadRequestException(
16881688
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
16891689
);
@@ -1697,7 +1697,7 @@ <h3 id="inputs">
16971697
});
16981698
}
16991699
//tout est ok en envoie au backend
1700-
return await this.backends.executeJob(
1700+
const result &#x3D; await this.backends.executeJob(
17011701
ActionType.IDENTITY_PASSWORD_CHANGE,
17021702
identity._id,
17031703
{
@@ -1714,6 +1714,10 @@ <h3 id="inputs">
17141714
updateStatus: false,
17151715
},
17161716
);
1717+
// on met actif l&#x27;identité
1718+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
1719+
await identity.save()
1720+
return result;
17171721
} catch (e) {
17181722
let job &#x3D; undefined;
17191723
let _debug &#x3D; undefined;
@@ -1852,6 +1856,10 @@ <h3 id="inputs">
18521856
if (response?.status &#x3D;&#x3D;&#x3D; 0) {
18531857
this.logger.log(&#x27;delete key&#x27;);
18541858
await this.redis.del(data.token);
1859+
// mise de l indentité active
1860+
// on met actif l&#x27;identité
1861+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
1862+
await identity.save()
18551863
return [_, response];
18561864
}
18571865
this.logger.error(&#x27;Error from backend while reseting password by code&#x27;);
@@ -1931,6 +1939,8 @@ <h3 id="inputs">
19311939

19321940
private async setInitState(identity: Identities, state: InitStatesEnum): Promise&lt;any&gt; {
19331941
identity.initState &#x3D; state;
1942+
// on met actif l&#x27;identité
1943+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
19341944
if (state &#x3D;&#x3D;&#x3D; InitStatesEnum.SENT) {
19351945
identity.initInfo.initDate &#x3D; new Date();
19361946
identity.initInfo.sentDate &#x3D; null;

‎interfaces/CipherData.html‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ <h3 id="inputs">Properties</h3>
306306
try {
307307
const identity &#x3D; (await this.identities.findOne({ &#x27;inetOrgPerson.uid&#x27;: initDto.uid })) as Identities;
308308
//test si on peu reninitialiser le compte
309-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
309+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
310310
throw new BadRequestException(
311311
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
312312
);
@@ -385,7 +385,7 @@ <h3 id="inputs">Properties</h3>
385385
try {
386386
const identity &#x3D; (await this.identities.findOne({ &#x27;inetOrgPerson.uid&#x27;: initDto.uid })) as Identities;
387387
//test si on peu reninitialiser le compte
388-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
388+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
389389
throw new BadRequestException(
390390
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
391391
);
@@ -449,7 +449,7 @@ <h3 id="inputs">Properties</h3>
449449
&#x27;inetOrgPerson.uid&#x27;: passwdDto.uid,
450450
state: IdentityState.SYNCED,
451451
})) as Identities;
452-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
452+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
453453
throw new BadRequestException(
454454
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
455455
);
@@ -463,7 +463,7 @@ <h3 id="inputs">Properties</h3>
463463
});
464464
}
465465
//tout est ok en envoie au backend
466-
return await this.backends.executeJob(
466+
const result &#x3D; await this.backends.executeJob(
467467
ActionType.IDENTITY_PASSWORD_CHANGE,
468468
identity._id,
469469
{
@@ -480,6 +480,10 @@ <h3 id="inputs">Properties</h3>
480480
updateStatus: false,
481481
},
482482
);
483+
// on met actif l&#x27;identité
484+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
485+
await identity.save()
486+
return result;
483487
} catch (e) {
484488
let job &#x3D; undefined;
485489
let _debug &#x3D; undefined;
@@ -618,6 +622,10 @@ <h3 id="inputs">Properties</h3>
618622
if (response?.status &#x3D;&#x3D;&#x3D; 0) {
619623
this.logger.log(&#x27;delete key&#x27;);
620624
await this.redis.del(data.token);
625+
// mise de l indentité active
626+
// on met actif l&#x27;identité
627+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
628+
await identity.save()
621629
return [_, response];
622630
}
623631
this.logger.error(&#x27;Error from backend while reseting password by code&#x27;);
@@ -697,6 +705,8 @@ <h3 id="inputs">Properties</h3>
697705

698706
private async setInitState(identity: Identities, state: InitStatesEnum): Promise&lt;any&gt; {
699707
identity.initState &#x3D; state;
708+
// on met actif l&#x27;identité
709+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
700710
if (state &#x3D;&#x3D;&#x3D; InitStatesEnum.SENT) {
701711
identity.initInfo.initDate &#x3D; new Date();
702712
identity.initInfo.sentDate &#x3D; null;

‎interfaces/TokenData.html‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ <h3 id="inputs">Properties</h3>
345345
try {
346346
const identity &#x3D; (await this.identities.findOne({ &#x27;inetOrgPerson.uid&#x27;: initDto.uid })) as Identities;
347347
//test si on peu reninitialiser le compte
348-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
348+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
349349
throw new BadRequestException(
350350
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
351351
);
@@ -424,7 +424,7 @@ <h3 id="inputs">Properties</h3>
424424
try {
425425
const identity &#x3D; (await this.identities.findOne({ &#x27;inetOrgPerson.uid&#x27;: initDto.uid })) as Identities;
426426
//test si on peu reninitialiser le compte
427-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
427+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
428428
throw new BadRequestException(
429429
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
430430
);
@@ -488,7 +488,7 @@ <h3 id="inputs">Properties</h3>
488488
&#x27;inetOrgPerson.uid&#x27;: passwdDto.uid,
489489
state: IdentityState.SYNCED,
490490
})) as Identities;
491-
if ( identity.dataStatus &#x3D;&#x3D; DataStatusEnum.INACTIVE){
491+
if ( identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.INACTIVE || identity.dataStatus &#x3D;&#x3D;&#x3D; DataStatusEnum.DELETED){
492492
throw new BadRequestException(
493493
&#x27;Une erreur est survenue : Tentative de réinitialisation de mot de passe impossible&#x27;,
494494
);
@@ -502,7 +502,7 @@ <h3 id="inputs">Properties</h3>
502502
});
503503
}
504504
//tout est ok en envoie au backend
505-
return await this.backends.executeJob(
505+
const result &#x3D; await this.backends.executeJob(
506506
ActionType.IDENTITY_PASSWORD_CHANGE,
507507
identity._id,
508508
{
@@ -519,6 +519,10 @@ <h3 id="inputs">Properties</h3>
519519
updateStatus: false,
520520
},
521521
);
522+
// on met actif l&#x27;identité
523+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
524+
await identity.save()
525+
return result;
522526
} catch (e) {
523527
let job &#x3D; undefined;
524528
let _debug &#x3D; undefined;
@@ -657,6 +661,10 @@ <h3 id="inputs">Properties</h3>
657661
if (response?.status &#x3D;&#x3D;&#x3D; 0) {
658662
this.logger.log(&#x27;delete key&#x27;);
659663
await this.redis.del(data.token);
664+
// mise de l indentité active
665+
// on met actif l&#x27;identité
666+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
667+
await identity.save()
660668
return [_, response];
661669
}
662670
this.logger.error(&#x27;Error from backend while reseting password by code&#x27;);
@@ -736,6 +744,8 @@ <h3 id="inputs">Properties</h3>
736744

737745
private async setInitState(identity: Identities, state: InitStatesEnum): Promise&lt;any&gt; {
738746
identity.initState &#x3D; state;
747+
// on met actif l&#x27;identité
748+
identity.dataStatus &#x3D; DataStatusEnum.ACTIVE;
739749
if (state &#x3D;&#x3D;&#x3D; InitStatesEnum.SENT) {
740750
identity.initInfo.initDate &#x3D; new Date();
741751
identity.initInfo.sentDate &#x3D; null;

‎js/search/search_index.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)