FEAT #8974 #8931 Revoke cookie + count documents

rest/index.php

@@ -35,6 +35,7 @@ $app->add(function (\Slim\Http\Request $request, \Slim\Http\Response $response,
             $GLOBALS['id'] = $id;
             $response = $next($request, $response);
         } else {
+            \SrcCore\models\AuthenticationModel::deleteCookieAuth();
             $response = $response->withStatus(401)->withJson(['errors' => 'Authentication Failed']);
         }
     }

src/app/document/controllers/DocumentController.php

@@ -46,26 +46,34 @@ class DocumentController
 
         $where = ['processing_user = ?', 'status = ?'];
         $dataGet = [$GLOBALS['id'], $status['id']];
+        $count = [];
         if (!empty($data['mode'])) {
             $where[] = 'mode = ?';
             $dataGet[] = $data['mode'];
+            $secondMode = ($data['mode'] == 'SIGN' ? 'NOTE' : 'SIGN');
+            $documents = DocumentModel::get([
+                'select'    => ['count(1) OVER()'],
+                'where'     => $where,
+                'data'      => [$GLOBALS['id'], $status['id'], $secondMode]
+            ]);
+            $count[$secondMode] = $documents[0]['count'];
         }
         $documents = DocumentModel::get([
-            'select'    => ['id', 'reference', 'subject', 'status', 'count(1) OVER()'],
+            'select'    => ['id', 'reference', 'subject', 'status', 'mode', 'count(1) OVER()'],
             'where'     => $where,
             'data'      => $dataGet,
             'limit'     => $data['limit'],
             'offset'    => $data['offset'],
             'orderBy'   => ['creation_date desc']
         ]);
-        $fullCount = empty($documents[0]['count']) ? 0 : $documents[0]['count'];
+        $count[$data['mode']] = empty($documents[0]['count']) ? 0 : $documents[0]['count'];
         foreach ($documents as $key => $document) {
             $status = StatusModel::getById(['select' => ['label'], 'id' => $document['status']]);
             $documents[$key]['statusDisplay'] = $status['label'];
             unset($documents[$key]['count']);
         }
 
-        return $response->withJson(['documents' => $documents, 'fullCount' => $fullCount]);
+        return $response->withJson(['documents' => $documents, 'count' => $count]);
     }
 
     public function getById(Request $request, Response $response, array $args)

src/app/user/controllers/UserController.php

@@ -183,6 +183,8 @@ class UserController
 
         UserModel::updatePassword(['id' => $args['id'], 'password' => $data['newPassword']]);
 
+        AuthenticationModel::revokeCookie(['userId' => $args['id']]);
+
         HistoryController::add([
             'tableName' => 'users',
             'recordId'  => $args['id'],

src/core/models/AuthenticationModel.php

@@ -122,6 +122,26 @@ class AuthenticationModel
         return true;
     }
 
+    public static function revokeCookie(array $args)
+    {
+        ValidatorModel::notEmpty($args, ['userId']);
+        ValidatorModel::intVal($args, ['userId']);
+
+        DatabaseModel::update([
+            'table' => 'users',
+            'set'   => [
+                'cookie_key'    => null,
+                'cookie_date'   => null,
+            ],
+            'where' => ['id = ?'],
+            'data'  => [$args['userId']]
+        ]);
+
+        AuthenticationModel::setCookieAuth(['id' => $args['userId']]);
+
+        return true;
+    }
+
     public static function deleteCookieAuth()
     {
         $previousCookie = AuthenticationModel::getCookieAuth();

src/frontend/app/modal/confirm-modal.component.ts

@@ -51,13 +51,14 @@ export class ConfirmModalComponent {
             this.msgButton = 'Envoi...';
             this.http.put('../rest/documents/' + this.signaturesService.mainDocumentId + '/actions/' + this.signaturesService.currentAction, {'signatures': signatures})
                 .subscribe(() => {
+                    var mode = this.signaturesService.documentsList[this.signaturesService.indexDocumentsList]["mode"];
+                    this.signaturesService.documentsList.splice(this.signaturesService.indexDocumentsList, 1);
+                    if (this.signaturesService.documentsListCount[mode] > 0) {
+                        this.signaturesService.documentsListCount[mode]--;
+                    }
                     this.disableState = false;
                     this.msgButton = 'Valider';
                     this.dialogRef.close('sucess');
-                    this.signaturesService.documentsList.splice(this.signaturesService.indexDocumentsList, 1);
-                    if (this.signaturesService.documentsListCount > 0) {
-                        this.signaturesService.documentsListCount--;
-                    }
                 }, (err: any) => {
                     this.notificationService.handleErrors(err);
                     this.disableState = false;

src/frontend/app/modal/warn-modal.component.ts

@@ -52,9 +52,10 @@ export class WarnModalComponent {
             this.msgButton = 'Envoi...';
             this.http.put('../rest/documents/' + this.signaturesService.mainDocumentId + '/actions/' + this.signaturesService.currentAction, {'signatures': signatures})
                 .subscribe(() => {
+                    var mode = this.signaturesService.documentsList[this.signaturesService.indexDocumentsList]["mode"];
                     this.signaturesService.documentsList.splice(this.signaturesService.indexDocumentsList, 1);
-                    if (this.signaturesService.documentsListCount > 0) {
-                        this.signaturesService.documentsListCount--;
+                    if (this.signaturesService.documentsListCount[mode] > 0) {
+                        this.signaturesService.documentsListCount[mode]--;
                     }
                     this.disableState = false;
                     this.msgButton = 'Refuser ce document';

src/frontend/app/service/notification.service.ts

@@ -2,7 +2,6 @@ import { MatSnackBar } from '@angular/material';
 import { Injectable, Component, Inject } from '@angular/core';
 import { MAT_SNACK_BAR_DATA } from '@angular/material';
 import { Router } from '@angular/router';
-import { empty } from 'rxjs';
 
 @Component({
     selector: 'app-custom-snackbar',
@@ -14,8 +13,10 @@ export class CustomSnackbarComponent {
 
 @Injectable()
 export class NotificationService {
+
     constructor(private router: Router, public snackBar: MatSnackBar) {
     }
+
     success(message: string) {
         this.snackBar.openFromComponent(CustomSnackbarComponent, {
             duration: 3000,

src/frontend/app/service/signatures.service.ts

@@ -2,57 +2,58 @@ import { Injectable } from '@angular/core';
 
 @Injectable()
 export class SignaturesContentService {
-    userLogged: any = {};
-    mainDocumentId: Number = 0;
-    signaturesContent: any[] = [];
-    notesContent: any[] = [];
-    signaturesList: any[] = [];
-    currentPage = 1;
-    totalPage = 1;
-    isTaggable = true;
-    signWidth = 200;
-    annotationMode = false;
-    lockNote = false;
-    showSign = false;
-    showPad = false;
-    showDrawer = false;
-    showProfile = false;
-    currentAction = 0;
-    loadingSign = true;
-    indexDocumentsList = 0;
-    documentsList: any[] = [];
-    documentsListCount = 0;
-    newSign: any = {};
-    workingAreaWidth = 0;
-    workingAreaHeight = 0;
-    renderingDoc = true;
-    scale = 1;
+
+    userLogged          : any       = {};
+    mainDocumentId      : number    = 0;
+    signaturesContent   : any[]     = [];
+    notesContent        : any[]     = [];
+    signaturesList      : any[]     = [];
+    currentPage         : number    = 1;
+    totalPage           : number    = 1;
+    isTaggable          : boolean   = true;
+    signWidth           : number    = 200;
+    annotationMode      : boolean   = false;
+    lockNote            : boolean   = false;
+    showSign            : boolean   = false;
+    showPad             : boolean   = false;
+    showDrawer          : boolean   = false;
+    showProfile         : boolean   = false;
+    currentAction       : number    = 0;
+    loadingSign         : boolean   = true;
+    indexDocumentsList  : number    = 0;
+    documentsList       : any[]     = [];
+    documentsListCount  : any       = {};
+    newSign             : any       = {};
+    workingAreaWidth    : number    = 0;
+    workingAreaHeight   : number    = 0;
+    renderingDoc        : boolean   = true;
+    scale               : number    = 1;
 
     reset () {
-        this.userLogged = {};
-        this.mainDocumentId = 0;
-        this.signaturesContent = [];
-        this.notesContent = [];
-        this.signaturesList = [];
-        this.currentPage = 1;
-        this.totalPage = 1;
-        this.isTaggable = true;
-        this.signWidth = 200;
-        this.annotationMode = false;
-        this.lockNote = false;
-        this.showSign = false;
-        this.showPad = false;
-        this.showDrawer = false;
-        this.showProfile = false;
-        this.currentAction = 0;
-        this.loadingSign = true;
+        this.userLogged         = {};
+        this.mainDocumentId     = 0;
+        this.signaturesContent  = [];
+        this.notesContent       = [];
+        this.signaturesList     = [];
+        this.currentPage        = 1;
+        this.totalPage          = 1;
+        this.isTaggable         = true;
+        this.signWidth          = 200;
+        this.annotationMode     = false;
+        this.lockNote           = false;
+        this.showSign           = false;
+        this.showPad            = false;
+        this.showDrawer         = false;
+        this.showProfile        = false;
+        this.currentAction      = 0;
+        this.loadingSign        = true;
         this.indexDocumentsList = 0;
-        this.documentsList = [];
-        this.documentsListCount = 0;
-        this.newSign = {};
-        this.workingAreaWidth = 0;
-        this.workingAreaHeight = 0;
-        this.renderingDoc = true;
-        this.scale = 1;
+        this.documentsList      = [];
+        this.documentsListCount = {};
+        this.newSign            = {};
+        this.workingAreaWidth   = 0;
+        this.workingAreaHeight  = 0;
+        this.renderingDoc       = true;
+        this.scale              = 1;
     }
 }

src/frontend/app/sidebar/sidebar.component.html

@@ -11,16 +11,10 @@
       </div>
     </header>
     <header class="sidebar-header">
-      <section class="sidebar-header-icon notification">
-        <i class="fa fa-folder-open fa-2x"></i>
-      </section>
-      <section>
-        <div class="sidebar-header-title">{{signaturesService.documentsListCount}} documents à traiter</div>
-      </section>
     </header>
     <section class="sidebar-btn">
-      <button class="btn btn-xs blue filter" [ngClass]="[mode == 'NOTE' ? 'active' : '']" (click)="filter('NOTE')">Annotation</button>
-      <button class="btn btn-xs blue filter" [ngClass]="[mode == 'SIGN' ? 'active' : '']" (click)="filter('SIGN')">Paraphe</button>
+      <button class="btn btn-xs blue filter" [ngClass]="[mode == 'NOTE' ? 'active' : '']" (click)="filter('NOTE')">Annotation {{signaturesService.documentsListCount["NOTE"]}}</button>
+      <button class="btn btn-xs blue filter" [ngClass]="[mode == 'SIGN' ? 'active' : '']" (click)="filter('SIGN')">Paraphe {{signaturesService.documentsListCount["SIGN"]}}</button>
     </section>
   </div>
   <ul #listContent class="nav" detect-scroll (onScroll)="handleScroll($event)" [bottomOffset]="1" [topOffset]="1">

src/frontend/app/sidebar/sidebar.component.ts

@@ -31,14 +31,15 @@ export class SidebarComponent implements OnInit {
         this.http.get('../rest/documents?limit=' + this.limit + '&offset=' + this.offset + '&mode=' + this.mode)
             .subscribe((data: any) => {
                 this.signaturesService.documentsList = data.documents;
-                this.signaturesService.documentsListCount = data["fullCount"];
+                this.signaturesService.documentsListCount["SIGN"] = data["count"]["SIGN"];
+                this.signaturesService.documentsListCount["NOTE"] = data["count"]["NOTE"];
             }, (err: any) => {
                 this.notificationService.handleErrors(err);
             });
     }
 
     handleScroll(event: ScrollEvent) {
-        if (event.isReachingBottom && !this.loadingList && this.signaturesService.documentsList.length < this.signaturesService.documentsListCount) {
+        if (event.isReachingBottom && !this.loadingList && this.signaturesService.documentsList.length < this.signaturesService.documentsListCount[this.mode]) {
 
             this.loadingList = true;
             this.listContent.nativeElement.style.overflowY = 'hidden';
@@ -83,7 +84,8 @@ export class SidebarComponent implements OnInit {
         this.http.get('../rest/documents?limit=' + this.limit + '&offset=' + this.offset + '&mode=' + this.mode)
             .subscribe((data: any) => {
                 this.signaturesService.documentsList = data.documents;
-                this.signaturesService.documentsListCount = data["fullCount"];
+                this.signaturesService.documentsListCount["SIGN"] = data["count"]["SIGN"];
+                this.signaturesService.documentsListCount["NOTE"] = data["count"]["NOTE"];
             }, (err: any) => {
                 this.notificationService.handleErrors(err);
             });