From c8dec74e743ee178a963d37b54041b7a3e48aa5b Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Thu, 16 Dec 2021 12:38:27 +0545
Subject: [PATCH] fix merge issues

---
 app/controllers/api/storage.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index de618a719f..bcbd46a0b4 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -638,8 +638,9 @@ App::post('/v1/storage/buckets/:bucketId/files')
 
         $sizeActual = $device->getFileSize($path);
         
+        $fileId = $fileId === 'unique()' ? $dbForInternal->getId() : $fileId;
         $data = [
-            '$id' => $fileId === 'unique()' ? $dbForInternal->getId() : $fileId,
+            '$id' => $fileId,
             '$read' => (is_null($read) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $read ?? [], // By default set read permissions for user
             '$write' => (is_null($write) && !$user->isEmpty()) ? ['user:'.$user->getId()] : $write ?? [], // By default set write permissions for user
             'dateCreated' => \time(),
@@ -652,17 +653,13 @@ App::post('/v1/storage/buckets/:bucketId/files')
             'sizeActual' => $sizeActual,
             'algorithm' => empty($compressor) ? '' : $compressor->getName(),
             'comment' => '',
-            'openSSLVersion' => '1',
-            'openSSLCipher' => OpenSSL::CIPHER_AES_128_GCM,
-            'openSSLTag' => \bin2hex($tag ?? ''),
-            'openSSLIV' => \bin2hex($iv),
             'search' => implode(' ', [$fileId, $file['name'] ?? '',]),
         ];
 
         if($bucket->getAttribute('encryption', true) && $size <= APP_LIMIT_ENCRYPTION) {
             $data['openSSLVersion'] = '1';
             $data['openSSLCipher'] = OpenSSL::CIPHER_AES_128_GCM;
-            $data['openSSLTag'] = \bin2hex($tag);
+            $data['openSSLTag'] = \bin2hex($tag ?? '');
             $data['openSSLIV'] = \bin2hex($iv);
         }