#20347 TIME 0:30 Rapatriment FRONT and BACK from an old MR

migration/2301.2.0.sql

+-- *************************************************************************--
+--                                                                          --
+--                                                                          --
+-- Model migration script - 2301.1.3 to 2301.2.0                            --
+--                                                                          --
+--                                                                          --
+-- *************************************************************************--
+
+ALTER TABLE docservers add column is_encrypted BOOL NOT NULL default FALSE;
+
+UPDATE parameters SET param_value_string = '2301.2.0' WHERE id = 'database_version';
\ No newline at end of file

src/app/docserver/controllers/DocserverController.php

@@ -147,6 +147,7 @@ class DocserverController
         $check = $check && Validator::notEmpty()->intVal()->validate($data['size_limit_number']);
         $check = $check && Validator::stringType()->notEmpty()->validate($data['path_template']);
         $check = $check && Validator::boolType()->validate($data['is_readonly']);
+        $check = $check && Validator::boolType()->validate($data['is_encrypted']);
         if (!$check) {
             return $response->withStatus(400)->withJson(['errors' => 'Bad Request']);
         }
@@ -178,7 +179,8 @@ class DocserverController
                 'device_label'          => $data['device_label'],
                 'size_limit_number'     => $data['size_limit_number'],
                 'path_template'         => $data['path_template'],
-                'is_readonly'           => empty($data['is_readonly']) ? 'N' : 'Y'
+                'is_readonly'           => empty($data['is_readonly']) ? 'N' : 'Y',
+                'is_encrypted'          => empty($data['is_encrypted']) ? 'false':'true'
             ],
             'where' => ['id = ?'],
             'data'  => [$aArgs['id']]

src/app/docserver/models/DocserverModelAbstract.php

@@ -82,6 +82,7 @@ class DocserverModelAbstract
         ValidatorModel::notEmpty($aArgs, ['docserver_id', 'docserver_type_id', 'device_label', 'path_template', 'coll_id', 'size_limit_number', 'is_readonly']);
         ValidatorModel::stringType($aArgs, ['docserver_id', 'docserver_type_id', 'device_label', 'path_template', 'coll_id', 'is_readonly']);
         ValidatorModel::intVal($aArgs, ['size_limit_number']);
+        ValidatorModel::boolType($aArgs, ['is_encrypted']);
 
         $nextSequenceId = DatabaseModel::getNextSequenceValue(['sequenceId' => 'docservers_id_seq']);
 
@@ -96,7 +97,8 @@ class DocserverModelAbstract
                 'coll_id'               => $aArgs['coll_id'],
                 'size_limit_number'     => $aArgs['size_limit_number'],
                 'is_readonly'           => $aArgs['is_readonly'],
-                'creation_date'         => 'CURRENT_TIMESTAMP'
+                'creation_date'         => 'CURRENT_TIMESTAMP',
+                'is_encrypted'          => empty($aArgs['is_encrypted']) ? 'false':'true',
             ]
         ]);
 

src/frontend/app/administration/docserver/docserver-administration.component.html

@@ -67,6 +67,11 @@
                                         placeholder="{{'lang.path' | translate}}" [(ngModel)]="docserver.path_template"
                                         [disabled]="docserver.is_readonly">
                                 </mat-form-field>
+                                <mat-slide-toggle style="height:40px;" color="primary" 
+                                    [checked]="docserver.is_encrypted === 'true'" 
+                                    (toggleChange)="toggle(docserver.is_encrypted)">
+                                    {{'lang.docserverEncryptResource' | translate}}
+                                </mat-slide-toggle>
                             </div>
                             <div class="col-md-12 text-center" style="padding:10px;">
                                 <button mat-raised-button color="primary" type="submit"

src/frontend/app/administration/docserver/docserver-administration.component.ts

@@ -20,7 +20,7 @@ export class DocserverAdministrationComponent implements OnInit {
     loading: boolean = false;
     dataSource: any;
 
-    docserver: any = { coll_id: 'letterbox_coll', docserver_type_id: 'DOC', limitSizeFormatted: '50' };
+    docserver: any = { coll_id: 'letterbox_coll', docserver_type_id: 'DOC', limitSizeFormatted: '50', is_encrypted: false };
     docserversTypes: any = [];
 
     constructor(
@@ -44,6 +44,9 @@ export class DocserverAdministrationComponent implements OnInit {
             });
     }
 
+    toggle(is_encrypted: boolean) {
+        this.docserver.is_encrypted = !is_encrypted;
+    }
 
     onSubmit(docserver: any) {
         docserver.size_limit_number = docserver.limitSizeFormatted * 1000000000;

src/frontend/app/administration/docserver/docservers-administration.component.html

@@ -117,6 +117,13 @@
                                                             [disabled]="docserver.is_readonly">
                                                     </mat-form-field>
                                                 </div>
+                                                <div class="col-md-12">
+                                                    <mat-slide-toggle style="height:40px;" color="primary" 
+                                                        [checked]="docserver.is_encrypted == true" 
+                                                        (toggleChange)="toggleEncryption(docserver)">
+                                                        {{'lang.docserverEncryptResource' | translate}}
+                                                    </mat-slide-toggle>
+                                                </div>
                                                 <div class="col-md-12 text-center" style="padding:10px;">
                                                     <button mat-raised-button color="primary" type="submit"
                                                         [disabled]="checkModif(docserver,this.docserversClone[docserverType.docserver_type_id][i])">{{'lang.update' | translate}}</button>

src/frontend/app/administration/docserver/docservers-administration.component.ts

@@ -104,4 +104,8 @@ export class DocserversAdministrationComponent implements OnInit {
         ).subscribe();
 
     }
+
+    toggleEncryption(docserver: any) {
+        docserver.is_encrypted = !docserver.is_encrypted;
+    }
 }

src/lang/lang-fr.json

@@ -2742,5 +2742,6 @@
     "labelBAN":  "Base Adresse Nationale",
     "labelSectors":  "Secteurs",
     "editDocFileDesc": "Veuillez noter qu'il est important d'éditer le fichier avec l'extension <b>.doc</b> avant de valider",
-    "cannotAttachSummarySheet": "<b>Présence d'un utilisateur externe : la fiche de liaison ne sera pas jointe en annexe.</b>"
+    "cannotAttachSummarySheet": "<b>Présence d'un utilisateur externe : la fiche de liaison ne sera pas jointe en annexe.</b>",
+    "docserverEncryptResource": "Chiffrement du docserver"
 }