From 90980c9d00787c23f08f4aacdd304e722bd92b25 Mon Sep 17 00:00:00 2001
From: "Marco A. Nina Mena" <marco.antonio.nina@processmaker.com>
Date: Mon, 21 Dec 2015 13:24:20 -0400
Subject: [PATCH] =?UTF-8?q?GI-217=20no=20se=20a=C3=B1aden=20derechos...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add validation in folder after upload
---
 .../engine/classes/class.AppDocumentDrive.php | 46 +++++++++----------
 workflow/engine/classes/class.pmDrive.php     |  1 +
 workflow/engine/templates/admin/pmGmail.js    |  1 +
 3 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/workflow/engine/classes/class.AppDocumentDrive.php b/workflow/engine/classes/class.AppDocumentDrive.php
index 75f6f6dda..ba7e5f41b 100644
--- a/workflow/engine/classes/class.AppDocumentDrive.php
+++ b/workflow/engine/classes/class.AppDocumentDrive.php
@@ -332,13 +332,11 @@ class AppDocumentDrive
         $criteria = new Criteria( 'workflow' );
         $criteria->addSelectColumn(AppDocumentPeer::APP_DOC_UID);
         $criteria->addSelectColumn(AppDocumentPeer::DOC_VERSION);
-        $criteria->add( AppDocumentPeer::SYNC_WITH_DRIVE, 'UNSYNCHRONIZED' );
-        //Verify other permissions
-        /*$criteria->add(
+        $criteria->add(
             $criteria->getNewCriterion( AppDocumentPeer::SYNC_WITH_DRIVE, 'UNSYNCHRONIZED', Criteria::EQUAL )->
-            addOr($criteria->getNewCriterion( AppDocumentPeer::SYNC_WITH_DRIVE, 'NO_EXIST_FILE_PM', Criteria::NOT_EQUAL )->
-            addAnd($criteria->getNewCriterion( AppDocumentPeer::SYNC_PERMISSIONS, null, Criteria::NOT_EQUAL )))
-        );*/
+            addOr($criteria->getNewCriterion( AppDocumentPeer::SYNC_PERMISSIONS, null, Criteria::NOT_EQUAL ))
+        );
+
         $criteria->addAscendingOrderByColumn( 'APP_DOC_CREATE_DATE' );
         $criteria->addAscendingOrderByColumn( 'APP_UID' );
         $rs = AppDocumentPeer::doSelectRS( $criteria );
@@ -410,48 +408,46 @@ class AppDocumentDrive
             if ($sw_file_exists) {
 
                 $this->loadApplication($appDoc->getAppUid());
+                $this->loadUser($fields['USR_UID']);
 
                 $emails = $appDoc->getSyncPermissions();
                 $emails = !empty($emails) ? explode('|', $emails) : array();
                 $result = null;
                 foreach ($emails as $index => $email) {
                     if (!empty($email)) {
+
                         if ($index == 0 && $fields['SYNC_WITH_DRIVE'] == 'UNSYNCHRONIZED') {
                             if ($log) {
                                 eprintln('upload file:' .  $name , 'green');
                             }
                             $this->drive->setDriveUser($email);
-                            $this->loadUser($fields['USR_UID']);
                             $info = finfo_open(FILEINFO_MIME_TYPE);
-
+                            $mime = finfo_file($info, $realPath);
+                            $type = $appDoc->getAppDocType();
 
                             if ($appDoc->getAppDocType() == 'OUTPUT') {
 
                                 if ($sw_file_exists_doc) {
-                                    $nameDoc = explode('/', $realPathDoc);
-                                    $result = $this->upload($fields, 'OUTPUT_DOC', 'application/msword', $realPathDoc, array_pop($nameDoc));
+                                    $realPath = $realPathDoc;
+                                    $name = array_pop(explode('/', $realPathDoc));
+                                    $mime = 'application/msword';
+                                    $type = 'OUTPUT_DOC';
                                 }
                                 if ($sw_file_exists_pdf) {
-                                    $namePdf = explode('/', $realPathPdf);
+                                    $realPath = $realPathPdf;
+                                    $name = array_pop(explode('/', $realPathPdf));
                                     $mime = finfo_file($info, $realPathPdf);
-                                    $result = $this->upload($fields, 'OUTPUT_PDF', $mime, $realPathPdf, array_pop($namePdf));
+                                    $type = 'OUTPUT_PDF';
                                 }
-                            } else {
-                                $mime = finfo_file($info, $realPath);
-                                $result = $this->upload($fields, $appDoc->getAppDocType(), $mime, $realPath, $name);
                             }
-
-                            if ($log) {
-                                eprintln('Set Permission:' .  $email , 'green');
-                            }
-
-                            $this->drive->setPermission($this->app->getAppDriveFolderUid(), $email, 'user', 'writer');
+                            $result = $this->upload($fields, $type, $mime, $realPath, $name);
                         } else {
-                            if ($log) {
-                                eprintln('Set Permission:' .  $email , 'green');
-                            }
-                            $this->drive->setPermission($this->app->getAppDriveFolderUid(), $email, 'user', 'writer');
+                            $this->drive->setDriveUser($this->user->getUsrEmail());
                         }
+                        if ($log) {
+                            eprintln('Set Permission:' .  $email , 'green');
+                        }
+                        $this->drive->setPermission($this->app->getAppDriveFolderUid(), $email, 'user', 'writer');
 
                     }
                 }
diff --git a/workflow/engine/classes/class.pmDrive.php b/workflow/engine/classes/class.pmDrive.php
index 56fa06b2b..16915a642 100755
--- a/workflow/engine/classes/class.pmDrive.php
+++ b/workflow/engine/classes/class.pmDrive.php
@@ -246,6 +246,7 @@ class PMDrive extends PMGoogleApi
         $this->setScope(static::DRIVE_FILE);
 
         $service = $this->serviceDrive();
+        $permission = null;
 
         $newPermission = new Google_Service_Drive_Permission();
         $newPermission->setValue($value);
diff --git a/workflow/engine/templates/admin/pmGmail.js b/workflow/engine/templates/admin/pmGmail.js
index 15184eac0..a4e52b59e 100644
--- a/workflow/engine/templates/admin/pmGmail.js
+++ b/workflow/engine/templates/admin/pmGmail.js
@@ -352,6 +352,7 @@ Ext.onReady(function(){
 
     Ext.getCmp('status_pmgmail').checked = enablePMGmail;
     Ext.getCmp('status_pmgmail').setValue(enablePMGmail);
+    Ext.getCmp('typeAuthentication').setValue('serviceAccount');
     if (enablePMGmail){
         changeType();
     }