From 0b2d7c92ee5924e18c322314c403e8cecdc188c3 Mon Sep 17 00:00:00 2001
From: "florian.azizian" <florian.azizian@maarch.org>
Date: Wed, 31 Jul 2019 14:50:14 +0100
Subject: [PATCH] FEAT #11307 TIME 1 remove signature delegation
---
lang/en.json | 2 -
lang/fr.json | 2 -
rest/index.php | 1 -
sql/1909.sql | 9 ++++
sql/structure.sql | 1 -
.../user/controllers/SignatureController.php | 54 ++-----------------
.../app/document/document.component.ts | 11 ----
.../app/profile/profile.component.html | 6 ---
.../app/profile/profile.component.scss | 10 ----
src/frontend/app/profile/profile.component.ts | 9 ----
.../app/service/signatures.service.ts | 2 -
.../app/signatures/signatures.component.html | 7 ---
.../app/signatures/signatures.component.scss | 7 ---
.../app/signatures/signatures.component.ts | 3 +-
14 files changed, 13 insertions(+), 111 deletions(-)
create mode 100755 sql/1909.sql
diff --git a/lang/en.json b/lang/en.json
index 864951d323..c31257f10a 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -159,7 +159,6 @@
"search": "Search",
"substitute": "Substitute user",
"substitution": "Substitution",
- "signSubstituted": "Signatures to substitute",
"chooseSubstitute": "Choose a substitute",
"noResult": "No result",
"circuit": "Circuit",
@@ -171,7 +170,6 @@
"substitutionDeleted": "Substitution deleted",
"substitutionInfo": "You are in substitution mode, you can't make any action",
"substitutedDoc": "Substituted document",
- "substitutedSignature": "Substituted signature",
"substituteMsg": "You act as",
"substitutionWarn": "You choose a substitution, you will not be able to make any action.",
"manage_users": "Users",
diff --git a/lang/fr.json b/lang/fr.json
index 578b6e8530..fe83bff78d 100755
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -159,7 +159,6 @@
"search": "Rechercher",
"substitution": "Délégation",
"substitute": "Utilisateur délégataire",
- "signSubstituted": "Signature(s) à déléguer",
"chooseSubstitute": "Choisissez un utilisateur",
"noResult": "Aucun résultat",
"circuit": "Circuit",
@@ -171,7 +170,6 @@
"substitutionDeleted": "Délégation supprimée",
"substitutionInfo": "Vous avez délégué vos documents, vous ne pouvez pas faire d'action",
"substitutedDoc": "Document délégué",
- "substitutedSignature": "Signature déléguée",
"substituteMsg": "Vous agissez en tant que",
"substitutionWarn": "Vous avez choisi une délégation, vous ne pourrez plus faire d'action.",
"manage_users": "Utilisateurs",
diff --git a/rest/index.php b/rest/index.php
index 226bfcd5c7..32d1c85c3c 100755
--- a/rest/index.php
+++ b/rest/index.php
@@ -113,7 +113,6 @@ $app->get('/users/{id}/signatures', \User\controllers\SignatureController::class
$app->post('/users/{id}/signatures', \User\controllers\SignatureController::class . ':create');
$app->delete('/users/{id}/signatures/{signatureId}', \User\controllers\SignatureController::class . ':delete');
$app->put('/users/{id}/externalSignatures', \User\controllers\SignatureController::class . ':updateExternalSignatures');
-$app->patch('/users/{id}/signatures/substituted', \User\controllers\SignatureController::class . ':updateSubstituted');
//Emails
$app->post('/emails', \Email\controllers\EmailController::class . ':send');
diff --git a/sql/1909.sql b/sql/1909.sql
new file mode 100755
index 0000000000..2de987ebe8
--- /dev/null
+++ b/sql/1909.sql
@@ -0,0 +1,9 @@
+-- *************************************************************************--
+-- --
+-- --
+-- Model migration script - 19.07 to 19.09 --
+-- --
+-- --
+-- *************************************************************************--
+
+ALTER TABLE signatures DROP COLUMN IF EXISTS substituted;
diff --git a/sql/structure.sql b/sql/structure.sql
index 676ce32c92..7f7af18f54 100755
--- a/sql/structure.sql
+++ b/sql/structure.sql
@@ -181,7 +181,6 @@ CREATE TABLE signatures
path character varying(255) NOT NULL,
filename character varying(255) NOT NULL,
fingerprint character varying(255) NOT NULL,
- substituted boolean DEFAULT FALSE NOT NULL,
external_application CHARACTER VARYING(255),
CONSTRAINT signatures_pkey PRIMARY KEY (id)
)
diff --git a/src/app/user/controllers/SignatureController.php b/src/app/user/controllers/SignatureController.php
index 991b5feb0f..0fdc9198d5 100755
--- a/src/app/user/controllers/SignatureController.php
+++ b/src/app/user/controllers/SignatureController.php
@@ -28,26 +28,15 @@ class SignatureController
{
public function get(Request $request, Response $response, array $args)
{
- if ($GLOBALS['id'] != $args['id']) {
- $user = UserModel::getById(['id' => $args['id'], 'select' => ['substitute']]);
- if (empty($user) || $user['substitute'] != $GLOBALS['id']) {
- return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']);
- }
- }
-
$docserver = DocserverModel::getByType(['type' => 'SIGNATURE', 'select' => ['path']]);
if (empty($docserver['path']) || !is_dir($docserver['path'])) {
return $response->withStatus(400)->withJson(['errors' => 'Docserver \'SIGNATURE\' does not exist']);
}
- $where = ['user_id = ?'];
- if ($GLOBALS['id'] != $args['id']) {
- $where[] = 'substituted = true';
- }
$rawSignatures = SignatureModel::get([
- 'select' => ['id', 'path', 'filename', 'fingerprint', 'substituted'],
- 'where' => $where,
- 'data' => [$args['id']],
+ 'select' => ['id', 'path', 'filename', 'fingerprint'],
+ 'where' => ['user_id = ?'],
+ 'data' => [$GLOBALS['id']],
'orderBy' => ['id DESC']
]);
@@ -59,7 +48,6 @@ class SignatureController
if ($signature['fingerprint'] == $fingerprint) {
$signatures[] = [
'id' => $signature['id'],
- 'substituted' => $signature['substituted'],
'encodedSignature' => base64_encode(file_get_contents($pathToSignature))
];
}
@@ -203,40 +191,4 @@ class SignatureController
return $response->withStatus(204);
}
-
- public function updateSubstituted(Request $request, Response $response, array $args)
- {
- if ($GLOBALS['id'] != $args['id'] && !PrivilegeController::hasPrivilege(['userId' => $GLOBALS['id'], 'privilege' => 'manage_users'])) {
- return $response->withStatus(403)->withJson(['errors' => 'Privilege forbidden']);
- }
-
- $user = UserModel::getById(['select' => [1], 'id' => $args['id']]);
- if (empty($user)) {
- return $response->withStatus(400)->withJson(['errors' => 'User does not exist']);
- }
-
- $body = $request->getParsedBody();
-
- if (!Validator::arrayType()->notEmpty()->validate($body['signatures'])) {
- return $response->withStatus(400)->withJson(['errors' => 'Body signature is empty or not an array']);
- }
-
- foreach ($body['signatures'] as $key => $signature) {
- if (!Validator::intVal()->notEmpty()->validate($signature['id'])) {
- return $response->withStatus(400)->withJson(['errors' => "Body signatures[{$key}] id is empty or not an integer"]);
- } elseif (!Validator::boolType()->validate($signature['substituted'])) {
- return $response->withStatus(400)->withJson(['errors' => "Body signatures[{$key}] substituted is not a boolean"]);
- }
- }
-
- foreach ($body['signatures'] as $signature) {
- SignatureModel::update([
- 'set' => ['substituted' => $signature['substituted'] ? 'true' : 'false'],
- 'where' => ['user_id = ?', 'id = ?'],
- 'data' => [$args['id'], $signature['id']]
- ]);
- }
-
- return $response->withStatus(204);
- }
}
diff --git a/src/frontend/app/document/document.component.ts b/src/frontend/app/document/document.component.ts
index 9530292ab6..8adc5539a4 100755
--- a/src/frontend/app/document/document.component.ts
+++ b/src/frontend/app/document/document.component.ts
@@ -173,17 +173,6 @@ export class DocumentComponent implements OnInit {
this.initDoc();
- const realUserWorkflow = this.mainDocument.workflow.filter((line: { current: boolean; }) => line.current === true)[0];
-
- if (realUserWorkflow.userId !== this.authService.user.id) {
- this.http.get('../rest/users/' + realUserWorkflow.userId + '/signatures')
- .subscribe((dataSign: any) => {
- this.signaturesService.signaturesListSubstituted = dataSign.signatures;
- this.signaturesService.loadingSign = false;
- });
- } else {
- this.signaturesService.signaturesListSubstituted = [];
- }
this.docList.push({ 'id': this.mainDocument.id, 'title': this.mainDocument.title, 'pages': this.mainDocument.pages, 'imgContent': [], 'imgUrl': '../rest/documents/' + this.mainDocument.id + '/thumbnails' });
this.mainDocument.attachments.forEach((attach: any) => {
this.docList.push({ 'id': attach.id, 'title': attach.title, 'pages': attach.pages, 'imgContent': [], 'imgUrl': '../rest/attachments/' + attach.id + '/thumbnails' });
diff --git a/src/frontend/app/profile/profile.component.html b/src/frontend/app/profile/profile.component.html
index 146d6c83c0..4133262748 100644
--- a/src/frontend/app/profile/profile.component.html
+++ b/src/frontend/app/profile/profile.component.html
@@ -223,12 +223,6 @@
</mat-form-field>
</div>
</div>
- <fieldset *ngIf="profileInfo.substitute != null && signaturesService.signaturesList.length > 0">
- <legend align="left">{{'lang.signSubstituted' | translate}} :</legend>
- <ng-container>
- <button type="button" class="signListButton" mat-stroked-button *ngFor="let signature of signaturesService.signaturesList; let i=index" (click)="toggleSignature(i)" [class.selected]="signature.substituted"><img [src]="sanitizer.bypassSecurityTrustUrl('data:image/png;base64,' + signature.encodedSignature)"/></button>
- </ng-container>
- </fieldset>
</fieldset>
</div>
</div>
diff --git a/src/frontend/app/profile/profile.component.scss b/src/frontend/app/profile/profile.component.scss
index 472f7ecaaf..42d57aa32b 100644
--- a/src/frontend/app/profile/profile.component.scss
+++ b/src/frontend/app/profile/profile.component.scss
@@ -190,16 +190,6 @@ legend {
height:auto;
}
-
-.signListButton {
- margin:5px;
- border: solid white;
-
- img {
- width: 150px;
- }
-}
-
.selected {
border: solid #F99830;
}
\ No newline at end of file
diff --git a/src/frontend/app/profile/profile.component.ts b/src/frontend/app/profile/profile.component.ts
index fc37a10ff5..d49637a325 100644
--- a/src/frontend/app/profile/profile.component.ts
+++ b/src/frontend/app/profile/profile.component.ts
@@ -420,15 +420,6 @@ export class ProfileComponent implements OnInit {
this.translate.use(lang);
}
- toggleSignature(i: number) {
- this.signaturesService.signaturesList[i].substituted = !this.signaturesService.signaturesList[i].substituted;
-
- this.http.patch('../rest/users/' + this.authService.user.id + '/signatures/substituted', { 'signatures': this.signaturesService.signaturesList })
- .subscribe((data: any) => {
- this.notificationService.success('lang.modificationSaved');
- });
- }
-
refreshUserList(opened: any) {
if (opened) {
this.http.get('../rest/users')
diff --git a/src/frontend/app/service/signatures.service.ts b/src/frontend/app/service/signatures.service.ts
index 71d30a0198..51110434ae 100755
--- a/src/frontend/app/service/signatures.service.ts
+++ b/src/frontend/app/service/signatures.service.ts
@@ -7,7 +7,6 @@ export class SignaturesContentService {
signaturesContent: any[] = [];
notesContent: any[] = [];
signaturesList: any[] = [];
- signaturesListSubstituted: any[] = [];
currentPage = 1;
totalPage = 1;
isTaggable = true;
@@ -63,7 +62,6 @@ export class SignaturesContentService {
this.signaturesContent = [];
this.notesContent = [];
this.signaturesList = [];
- this.signaturesListSubstituted = [];
this.currentPage = 1;
this.totalPage = 1;
this.isTaggable = true;
diff --git a/src/frontend/app/signatures/signatures.component.html b/src/frontend/app/signatures/signatures.component.html
index 6d5d45ffd6..d0f7aa2e01 100755
--- a/src/frontend/app/signatures/signatures.component.html
+++ b/src/frontend/app/signatures/signatures.component.html
@@ -12,13 +12,6 @@
<i class="fas fa-pen-nib fa-2x"></i>
{{'lang.createNewSignature' | translate}}
</div>
- <div [@listAnimation]="signaturesService.signaturesListSubstituted.length" style="display: contents;">
- <div *ngFor="let signature of signaturesService.signaturesListSubstituted;let i=index" class="list-item" style="position: relative;overflow: hidden" (tap)="tapEvent(signature,i,'substitute')">
- <img [src]="sanitization.bypassSecurityTrustUrl('data:image/png;base64,' + signature.encodedSignature)"
- style="width: 190px;">
- <div class="substituteInfo">{{'lang.substitutedSignature' | translate}}</div>
- </div>
- </div>
<div [@listAnimation]="signaturesService.signaturesList.length" style="display: contents;">
<div *ngFor="let signature of signaturesService.signaturesList;let i=index" class="list-item" style="position: relative;overflow: hidden" (tap)="tapEvent(signature,i,'')">
<span class="remove_icon_{{i}}" style="display:none;position: absolute;top: 5px;left: 5px;" (tap)="removeSignature(signature,i);"><i style="border-radius: 25px;background: white;left:0px;top:0px;color:red;font-size: 50px;" class="fa fa-times-circle fa-2x"></i></span>
diff --git a/src/frontend/app/signatures/signatures.component.scss b/src/frontend/app/signatures/signatures.component.scss
index e6ff4efe14..4e4d194cfe 100644
--- a/src/frontend/app/signatures/signatures.component.scss
+++ b/src/frontend/app/signatures/signatures.component.scss
@@ -33,13 +33,6 @@
display: flex;
justify-content: center;
align-items: center;
- .substituteInfo {
- color: #F99830;
- font-size: 10px;
- position: absolute;
- top: 0px;
- right: 10px;
- }
&.create {
background-color: #F1F4F4;
flex-direction: column;
diff --git a/src/frontend/app/signatures/signatures.component.ts b/src/frontend/app/signatures/signatures.component.ts
index 79b2dc8222..2e158a8c21 100755
--- a/src/frontend/app/signatures/signatures.component.ts
+++ b/src/frontend/app/signatures/signatures.component.ts
@@ -62,8 +62,7 @@ export class SignaturesComponent implements OnInit {
this.signaturesService.signaturesList.unshift(
{
id: this.signaturesService.newSign.id,
- encodedSignature: this.signaturesService.newSign.encodedSignature,
- substituted: false
+ encodedSignature: this.signaturesService.newSign.encodedSignature
}
);
this.signaturesService.newSign = {};
--
GitLab