From 2c6b0c582a7ae1252934a95d37077ab863cc2457 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 6 May 2021 16:12:25 +0200
Subject: [PATCH] FEAT #16982 TIME 3 WIP otp user creation
---
lang/fr.json | 8 +++--
.../otps/otp-create.component.html | 5 +++
.../otps/otp-create.component.scss | 7 +++-
.../visa-workflow/otps/otp.service.ts | 34 ++++++++++++++++++
.../otps/yousign/otp-yousign.component.html | 23 ++++++------
.../otps/yousign/otp-yousign.component.ts | 19 +++++++---
.../visa-workflow.component.html | 11 +++---
.../visa-workflow/visa-workflow.component.ts | 8 +++--
.../app/indexation/indexation.component.ts | 1 +
src/frontend/app/service/auth.service.ts | 11 +++++-
src/frontend/assets/yousign.png | Bin 0 -> 4763 bytes
11 files changed, 99 insertions(+), 28 deletions(-)
create mode 100644 src/frontend/app/document/visa-workflow/otps/otp.service.ts
create mode 100644 src/frontend/assets/yousign.png
diff --git a/lang/fr.json b/lang/fr.json
index 172d2c6c36..23fc764fe6 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -476,9 +476,13 @@
"receiveActivationNotification": "Recevoir le courriel d'activation",
"newOtp": "Ajouter un OTP",
"otpUser": "Utilisateur OTP",
- "notifyUserBy": "Notifier l'utilisateur par",
+ "securityCodeSendMode": "Mode d'envoi du code de sécurité",
"phoneAlt": "Mobile",
"sms": "Sms",
- "source": "Source"
+ "source": "Source",
+ "otp_visa_yousignUser": "viseur (yousign)",
+ "otp_sign_yousignUser": "signataire (yousign)",
+ "role": "Role",
+ "otpMsg": "L'utilisateur sera notifié par <b>mail</b> et recevra un <b>code de sécurité</b> par <b>{{security}}</b> au moment de son tour dans le circuit."
}
}
diff --git a/src/frontend/app/document/visa-workflow/otps/otp-create.component.html b/src/frontend/app/document/visa-workflow/otps/otp-create.component.html
index 66d8c5cf5a..3d7f1e33c5 100644
--- a/src/frontend/app/document/visa-workflow/otps/otp-create.component.html
+++ b/src/frontend/app/document/visa-workflow/otps/otp-create.component.html
@@ -9,6 +9,11 @@
</ion-toolbar>
</ion-header>
<ion-content>
+ <ion-card>
+ <ion-item color="primary">
+ <ion-label class="info" [innerHTML]="'lang.otpMsg' | translate : { security : appOtpYousign?.getSecurityMode()}"></ion-label>
+ </ion-item>
+ </ion-card>
<ion-card>
<ion-item>
<ion-label color="secondary">{{'lang.source' | translate}}</ion-label>
diff --git a/src/frontend/app/document/visa-workflow/otps/otp-create.component.scss b/src/frontend/app/document/visa-workflow/otps/otp-create.component.scss
index b6dd7ffb77..806b07f733 100644
--- a/src/frontend/app/document/visa-workflow/otps/otp-create.component.scss
+++ b/src/frontend/app/document/visa-workflow/otps/otp-create.component.scss
@@ -1,3 +1,8 @@
.my-custom-class {
--min-width: 400px;
- }
\ No newline at end of file
+}
+
+.info {
+ white-space: initial;
+ line-height: 24px;
+}
\ No newline at end of file
diff --git a/src/frontend/app/document/visa-workflow/otps/otp.service.ts b/src/frontend/app/document/visa-workflow/otps/otp.service.ts
new file mode 100644
index 0000000000..59741d7e79
--- /dev/null
+++ b/src/frontend/app/document/visa-workflow/otps/otp.service.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { catchError, tap } from 'rxjs/operators';
+import { of } from 'rxjs';
+import { NotificationService } from '../../../service/notification.service';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class OtpService {
+
+ constructor(
+ public http: HttpClient,
+ public notificationService: NotificationService,
+ ) { }
+
+ getUserOtpIcon(id: string) {
+ return new Promise((resolve) => {
+ this.http.get(`assets/${id}.png`, { responseType: 'blob' }).pipe(
+ tap((response: any) => {
+ const reader = new FileReader();
+ reader.readAsDataURL(response);
+ reader.onloadend = () => {
+ resolve(reader.result as any);
+ };
+ }),
+ catchError(err => {
+ this.notificationService.handleErrors(err);
+ return of(false);
+ })
+ ).subscribe();
+ });
+ }
+}
diff --git a/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.html b/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.html
index 8d37833aff..979fb5fb5c 100644
--- a/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.html
+++ b/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.html
@@ -14,26 +14,25 @@
<ion-label color="secondary" position="floating">{{'lang.phoneAlt' | translate}} <ng-container
*ngIf="otp.mode === 'sms'">*</ng-container>
</ion-label>
- <ion-input name="phone" pattern="^\+?[1-9]\d{1,14}$" [(ngModel)]="otp.phone" placeholder="+33646342143"
+ <ion-input name="phone" pattern="^\+?[1-9]\d{1,14}$" [(ngModel)]="otp.phone" placeholder="+33646342143" (keyup)="formatPhone($event)"
[required]="otp.mode === 'sms'"></ion-input>
</ion-item>
<ion-item>
- <ion-label color="secondary" position="floating">{{'lang.email' | translate}} <ng-container
- *ngIf="otp.mode === 'email'">*</ng-container>
+ <ion-label color="secondary" position="floating">{{'lang.email' | translate}} *
</ion-label>
<ion-input name="email" pattern="(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)"
- placeholder="alain.dupont@gmail.com" [(ngModel)]="otp.email" [required]="otp.mode === 'email'">
+ placeholder="alain.dupont@gmail.com" [(ngModel)]="otp.email" required>
</ion-input>
</ion-item>
</ion-list>
<ion-list>
- <ion-radio-group [(ngModel)]="otp.role" [value]="otp.role">
+ <ion-radio-group name="role" [(ngModel)]="otp.role" [value]="otp.role">
<ion-list-header>
- <ion-label color="secondary">{{'lang.role' | translate}}</ion-label>
+ <ion-label color="secondary">{{'lang.role' | translate}} *</ion-label>
</ion-list-header>
<div style="display:flex;">
<ion-item *ngFor="let role of roles" style="flex:1;">
- <ion-label>{{'lang.' + role | translate}}</ion-label>
+ <ion-label>{{'lang.' + role + 'User' | translate}}</ion-label>
<ion-radio slot="start" [value]="role"></ion-radio>
</ion-item>
</div>
@@ -46,11 +45,11 @@
</ion-list>
<ion-list>
<ion-item>
- <ion-label color="secondary" position="floating">{{'lang.notifyUserBy' | translate}}</ion-label>
- <ion-select name="mode" [(ngModel)]="otp.notify" [value]="otp.notify"
- cancelText="{{'lang.cancel' | translate}}" [disabled]="notificationModes.length === 1">
- <ion-select-option *ngFor="let mode of notificationModes" [value]="mode">
- {{'lang.' + mode | translate}}</ion-select-option>
+ <ion-label color="secondary" position="floating">{{'lang.securityCodeSendMode' | translate}} *</ion-label>
+ <ion-select name="mode" [(ngModel)]="otp.security" [value]="otp.security"
+ cancelText="{{'lang.cancel' | translate}}" [disabled]="securityModes.length === 1">
+ <ion-select-option *ngFor="let security of securityModes" [value]="security">
+ {{'lang.' + security | translate}}</ion-select-option>
</ion-select>
</ion-item>
</ion-list>
diff --git a/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.ts b/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.ts
index 48f33845f2..dd62f5be4e 100644
--- a/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.ts
+++ b/src/frontend/app/document/visa-workflow/otps/yousign/otp-yousign.component.ts
@@ -12,7 +12,7 @@ import { NgForm } from '@angular/forms';
export class OtpYousignComponent implements OnInit {
@ViewChild('otpForm', { static: false }) otpForm: NgForm;
- notificationModes: any[] = [];
+ securityModes: any[] = [];
roles: any[] = [
'otp_visa_yousign',
@@ -20,11 +20,12 @@ export class OtpYousignComponent implements OnInit {
];
otp: any = {
+ type: 'yousign',
firstname: '',
lastname: '',
email: '',
phone: '',
- notify: 'sms',
+ security: 'sms',
role: 'otp_sign_yousign'
};
@@ -40,11 +41,11 @@ export class OtpYousignComponent implements OnInit {
getConfig() {
// FOR TEST
- this.notificationModes = [
+ this.securityModes = [
'sms',
'email'
];
- this.otp.mode = this.notificationModes[0];
+ this.otp.security = this.securityModes[0];
/* this.http.get(`../rest/???`).pipe(
tap((data: any) => {
@@ -60,7 +61,17 @@ export class OtpYousignComponent implements OnInit {
return this.otp;
}
+ getSecurityMode() {
+ return this.translate.instant('lang.' + this.otp.security);
+ }
+
isValid() {
return this.otpForm.valid;
}
+
+ formatPhone(ev: any) {
+ if (this.otp.phone.length > 1 && this.otp.phone[0] === '0') {
+ this.otp.phone = this.otp.phone.replace('0', '+33');
+ }
+ }
}
diff --git a/src/frontend/app/document/visa-workflow/visa-workflow.component.html b/src/frontend/app/document/visa-workflow/visa-workflow.component.html
index b3f01cf772..aaf9961e88 100644
--- a/src/frontend/app/document/visa-workflow/visa-workflow.component.html
+++ b/src/frontend/app/document/visa-workflow/visa-workflow.component.html
@@ -14,22 +14,21 @@
<ion-searchbar #searchInput [(ngModel)]="visaUsersSearchVal" [placeholder]="'lang.searchUser' | translate"
(ionChange)="getVisaUsers($event)" (ionFocus)="visaUsersSearchVal=''"></ion-searchbar>
<ion-buttons slot="end">
- <ion-button fill="clear" slot="icon-only" shape="round" color="primary" [matMenuTriggerFor]="menu"
- [title]="'lang.circuitModels' | translate">
- <ion-icon slot="icon-only" name="albums-outline"></ion-icon>
+ <ion-button fill="clear" slot="icon-only" shape="round" color="primary" [matMenuTriggerFor]="menu">
+ <ion-icon slot="icon-only" name="ellipsis-vertical-outline"></ion-icon>
</ion-button>
</ion-buttons>
<mat-menu #menu="matMenu">
<ion-item button (click)="openOtpModal()" lines="none">
<ion-icon name="person-circle-outline" slot="start" color="primary"></ion-icon>
- <ion-label>{{'lang.newOtp' | translate}}</ion-label>
+ <ion-label style="font-size: 14px;">{{'lang.newOtp' | translate}}</ion-label>
</ion-item>
<button mat-menu-item [matMenuTriggerFor]="model"
(menuOpened)="getVisaUserModels()">{{'lang.circuitModels' | translate}}</button>
</mat-menu>
<mat-menu #model="matMenu">
<ion-item button lines="none" *ngFor="let model of visaWorkflowModels" (click)="loadVisaWorkflow(model)">
- <ion-label>{{model.title}}</ion-label>
+ <ion-label style="font-size: 14px;">{{model.title}}</ion-label>
<ion-buttons slot="end">
<ion-button fill="clear" slot="icon-only" shape="round" color="danger"
(click)="$event.stopPropagation();removeModel(model)">
@@ -38,7 +37,7 @@
</ion-buttons>
</ion-item>
<ion-item button (click)="createModel()" [disabled]="visaWorkflow.length === 0">
- <ion-label>{{'lang.newTemplate' | translate}}</ion-label>
+ <ion-label style="font-size: 14px;">{{'lang.newTemplate' | translate}}</ion-label>
</ion-item>
</mat-menu>
</ion-item>
diff --git a/src/frontend/app/document/visa-workflow/visa-workflow.component.ts b/src/frontend/app/document/visa-workflow/visa-workflow.component.ts
index a99c7ec7d4..45299a66c2 100644
--- a/src/frontend/app/document/visa-workflow/visa-workflow.component.ts
+++ b/src/frontend/app/document/visa-workflow/visa-workflow.component.ts
@@ -9,6 +9,7 @@ import { AlertController, IonReorderGroup, ModalController, PopoverController }
import { ItemReorderEventDetail } from '@ionic/core';
import { TranslateService } from '@ngx-translate/core';
import { OtpCreateComponent } from './otps/otp-create.component';
+import { OtpService } from './otps/otp.service';
@Component({
selector: 'app-visa-workflow',
@@ -40,6 +41,7 @@ export class VisaWorkflowComponent implements OnInit {
public authService: AuthService,
public notificationService: NotificationService,
public modalController: ModalController,
+ private otpService: OtpService,
) { }
ngOnInit(): void {
@@ -156,15 +158,17 @@ export class VisaWorkflowComponent implements OnInit {
await modal.present();
modal.onDidDismiss()
- .then((result: any) => {
+ .then(async (result: any) => {
if (typeof result.data === 'object') {
const obj: any = {
'userId': null,
'userDisplay': `${result.data.firstname} ${result.data.lastname}`,
+ 'userPicture': await this.otpService.getUserOtpIcon(result.data.type),
'role': result.data.role,
'processDate': null,
'current': false,
- 'modes': [result.data.role]
+ 'modes': [result.data.role],
+ 'otp': result.data
};
this.visaWorkflow.push(obj);
}
diff --git a/src/frontend/app/indexation/indexation.component.ts b/src/frontend/app/indexation/indexation.component.ts
index 1f2e755458..1fd81100dd 100644
--- a/src/frontend/app/indexation/indexation.component.ts
+++ b/src/frontend/app/indexation/indexation.component.ts
@@ -255,6 +255,7 @@ export class IndexationComponent implements OnInit {
encodedDocument: item.content
})),
workflow: this.appVisaWorkflow.getCurrentWorkflow().map((item: any, index: number) => ({
+ externalInformations: item.otp,
userId: item.userId,
mode: this.authService.getWorkflowMode(item.role),
signatureMode: this.authService.getSignatureMode(item.role),
diff --git a/src/frontend/app/service/auth.service.ts b/src/frontend/app/service/auth.service.ts
index c6c920d0d2..3b8616bcda 100755
--- a/src/frontend/app/service/auth.service.ts
+++ b/src/frontend/app/service/auth.service.ts
@@ -137,7 +137,16 @@ export class AuthService {
}
getWorkflowMode(id: string) {
- return this.signatureRoles.filter((item: any) => item.id === id)[0].type;
+ const type = this.signatureRoles.filter((item: any) => item.id === id)[0]?.type;
+ const isOtp = /otp_[.]*/g;
+ const isSign = /_sign_/g;
+
+ // OTP user
+ if (id.match(isOtp) !== null) {
+ return id.match(isSign) !== null ? 'sign' : 'sign';
+ } else {
+ return type;
+ }
}
setCachedUrl(url: string) {
diff --git a/src/frontend/assets/yousign.png b/src/frontend/assets/yousign.png
new file mode 100644
index 0000000000000000000000000000000000000000..d308e1de7bb85b2ec6c9ca2ff34f6739dafb3d47
GIT binary patch
literal 4763
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
literal 0
HcmV?d00001
--
GitLab