Merge pull request #1316 from OpenSignLabs/validation

refactor: changes in output of file-adapter's cloud function

Author: prafull-opensignlabs

apps/OpenSignServer/cloud/parsefunction/addFileAdapter.js

@@ -39,7 +39,7 @@ export default async function addFileAdapter(request) {
         // assign existing file adapters or empty array
         let updatedFileAdapters = existsFileAdaptes;
         const uniqueId = generateId(10);
-        const id = extUser?.get('TenantId')?.id + '_' + uniqueId;
+        let id = extUser?.get('TenantId')?.id + '_' + uniqueId;
         const index = updatedFileAdapters?.findIndex(x => x.fileAdapterName === fileAdapterName);
 
         if (index !== -1) {
@@ -52,6 +52,7 @@ export default async function addFileAdapter(request) {
           } else {
             const adapterConfig = { accessKeyId: accessKeyId, secretAccessKey: secretAccessKey };
             updatedFileAdapters[index] = { ...updatedFileAdapters[index], ...adapterConfig };
+            id = updatedFileAdapters[index].id;
           }
         } else {
           if (bucketName && region && endpoint && baseUrl) {
@@ -90,7 +91,8 @@ export default async function addFileAdapter(request) {
           protectedFields: { '*': ['FileAdapters'] },
         });
         await tenantSchema.update();
-        return updateTenant.updatedAt;
+        const ActiveFileAdapter = adapter === 'opensign' ? 'opensign' : id;
+        return { ActiveFileAdapter: ActiveFileAdapter, updateAt: updateTenant.updatedAt };
       } else {
         throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
       }
@@ -123,7 +125,7 @@ export default async function addFileAdapter(request) {
           protectedFields: { '*': ['FileAdapters'] },
         });
         await tenantSchema.update();
-        return updateTenant.updatedAt;
+        return { ActiveFileAdapter: 'opensign', updateAt: updateTenant.updatedAt };
       } else {
         throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
       }

apps/OpenSignServer/cloud/parsefunction/getFileAdapter.js

@@ -9,29 +9,10 @@ export default async function getFileAdapter(request) {
     const extUser = await extUserCls.first({ useMasterKey: true });
     if (extUser) {
       const _extUser = JSON.parse(JSON.stringify(extUser));
-      const isFileAdapter = _extUser?.TenantId?.FileAdapters?.length > 0 ? true : false;
-      if (_extUser?.TenantId?.ActiveFileAdapter && isFileAdapter) {
-        const lastIndex = _extUser?.TenantId?.FileAdapters?.length - 1;
-        const lastObj = _extUser?.TenantId?.FileAdapters[lastIndex];
-        if (lastIndex >= 0) {
-          const adapterConfig = {
-            id: lastObj?.id,
-            fileAdapterName: lastObj?.fileAdapterName,
-            bucketName: lastObj?.bucketName,
-            region: lastObj?.region,
-            endpoint: lastObj?.endpoint,
-            baseUrl: lastObj?.baseUrl,
-            accessKeyId: lastObj?.accessKeyId,
-            secretAccessKey: lastObj?.secretAccessKey,
-            fileAdapter: lastObj?.fileAdapter,
-          };
-          return adapterConfig;
-        } else {
-          return {};
-        }
-      } else {
-        return {};
-      }
+      const FileAdapters =
+        _extUser?.TenantId?.FileAdapters?.length > 0 ? _extUser?.TenantId?.FileAdapters : [];
+      const ActiveFileAdapter = _extUser?.TenantId?.ActiveFileAdapter || 'opensign';
+      return { ActiveFileAdapter: ActiveFileAdapter, FileAdapters: FileAdapters };
     } else {
       throw new Parse.Error(Parse.Error.OBJECT_NOT_FOUND, 'User not found.');
     }