📂Fix public link backend (#2786)

* Fix public link backend * Fix return without resolve
linagora · Mar 27, 2023 · ed3df1f · ed3df1f
1 parent e2eb2f7
commit ed3df1f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ Twake offers all the features for collaboration :
 - Video call and conferencing
 - Real time document collaboration
 
-<a href="https://twakeapp.com"><img width=800 src="https://github.com/linagora/Twake/raw/main/twake.png"/></a>
+<a href="https://twake.app"><img width=800 src="https://github.com/linagora/Twake/raw/main/twake.png"/></a>
 
 ## Demo
 

diff --git a/twake/backend/node/src/cli/cmds/migration_cmds/php-drive-file/drive-migrator-service.ts b/twake/backend/node/src/cli/cmds/migration_cmds/php-drive-file/drive-migrator-service.ts
@@ -228,6 +228,7 @@ class DriveMigrator {
           ) {
             logger.info(`item is already migrated - ${item.id} - skipping`);
             console.log(`item is already migrated - ${item.id} - skipping`);
+            resolve(true);
             return;
           }
 
@@ -311,6 +312,7 @@ class DriveMigrator {
 
           if (createdVersions === 0) {
             await this.nodeRepository.remove(newDriveItem);
+            resolve(true);
             return;
           }
         }

diff --git a/twake/backend/node/src/services/documents/utils.ts b/twake/backend/node/src/services/documents/utils.ts
@@ -319,7 +319,7 @@ export const checkAccess = async (
   repository: Repository<DriveFile>,
   context: CompanyExecutionContext & { public_token?: string; twake_tab_token?: string },
 ): Promise<boolean> => {
-  if (context.user.server_request) {
+  if (context.user?.server_request) {
     return true;
   }
 
@@ -674,7 +674,7 @@ export const getFileMetadata = async (
       company_id: context.company.id,
     },
     context,
-    { ...(context.user.server_request ? {} : { waitForThumbnail: true }) },
+    { ...(context.user?.server_request ? {} : { waitForThumbnail: true }) },
   );
 
   if (!file) {

diff --git a/twake/frontend/src/app/views/applications/drive/browser.tsx b/twake/frontend/src/app/views/applications/drive/browser.tsx
@@ -86,7 +86,7 @@ export default memo(
 
     //In case we are kicked out of the current folder, we need to reset the parent id
     useEffect(() => {
-      if (!loading && !path?.length) setParentId('root');
+      if (!loading && !path?.length && !inPublicSharing) setParentId('root');
     }, [path, loading, setParentId]);
 
     useEffect(() => {