Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

fix(backend:shares): ensure correct file path for root space shares owned by user

johavenf5adb5561262
diff --git a/backend/src/applications/files/services/files-queries.service.ts b/backend/src/applications/files/services/files-queries.service.ts
index 66984b61..ad51c187 100644
--- a/backend/src/applications/files/services/files-queries.service.ts
+++ b/backend/src/applications/files/services/files-queries.service.ts
@@ -22,7 +22,7 @@ import { FileRecentLocation } from '../interfaces/file-recent-location.interface
import { FileRecent } from '../schemas/file-recent.interface'
import { File } from '../schemas/file.interface'
import { filesRecents } from '../schemas/files-recents.schema'
-import { childFilesFindRegexp, childFilesReplaceRegexp, files } from '../schemas/files.schema'
+import { childFilesFindRegexp, childFilesReplaceRegexp, filePathSQL, files } from '../schemas/files.schema'
import { dirName, fileName } from '../utils/files'
@Injectable()
@@ -91,6 +91,18 @@ export class FilesQueries {
return q
}
+ async getUserFile(userId: number, fileId: number): Promise<Pick<File, 'id' | 'path'>> {
+ if (fileId > 0) {
+ const [fileInDB] = await this.db
+ .select({ id: files.id, path: filePathSQL(files) })
+ .from(files)
+ .where(and(eq(files.ownerId, userId), eq(files.id, fileId)))
+ .limit(1)
+ return fileInDB
+ }
+ return null
+ }
+
async getOrCreateUserFile(userId: number, file: FileProps): Promise<number> {
if (file.id && file.id > 0) {
const [searchFileInDB] = await this.db
diff --git a/backend/src/applications/shares/services/shares-manager.service.ts b/backend/src/applications/shares/services/shares-manager.service.ts
index 2c9d2f50..1b20f1b8 100644
--- a/backend/src/applications/shares/services/shares-manager.service.ts
+++ b/backend/src/applications/shares/services/shares-manager.service.ts
@@ -156,6 +156,12 @@ export class SharesManager {
if (createOrUpdateShareDto.file.ownerId) {
/* PERSONAL SPACE CASE */
// check file
+ if (createOrUpdateShareDto.file.ownerId === user.id && createOrUpdateShareDto.file.id > 0) {
+ // When a user shares a root space they own, it is recommended to create the share from their personal space.
+ // `file.path` come from a root space with a custom name (invalid in the personal space context); if so, retrieve the original path.
+ const f = await this.spacesQueries.getUserFile(user.id, createOrUpdateShareDto.file.id)
+ if (f) createOrUpdateShareDto.file.path = f.path
+ }
const realPath = path.join(user.filesPath, createOrUpdateShareDto.file.path)
if (!(await isPathExists(realPath))) {
this.logger.warn(`${this.createShare.name} - location does not exist : ${realPath}`)
@@ -219,7 +225,7 @@ export class SharesManager {
}
// create share
share.id = await this.sharesQueries.createShare(share)
- // check & update members
+ // check and update members
await this.createOrUpdateLinksAsMembers(user, share, LINK_TYPE.SHARE, createOrUpdateShareDto.links)
await this.updateMembers(user, share, [], createOrUpdateShareDto.members)
return this.getShareWithMembers(user, share.id)
diff --git a/backend/src/applications/spaces/services/spaces-queries.service.ts b/backend/src/applications/spaces/services/spaces-queries.service.ts
index 441084ed..bd738324 100644
--- a/backend/src/applications/spaces/services/spaces-queries.service.ts
+++ b/backend/src/applications/spaces/services/spaces-queries.service.ts
@@ -25,6 +25,7 @@ import {
import { fileHasCommentsSubquerySQL } from '../../comments/schemas/comments.schema'
import { FileDBProps } from '../../files/interfaces/file-db-props.interface'
import { FileProps } from '../../files/interfaces/file-props.interface'
+import { File } from '../../files/schemas/file.interface'
import { filePathSQL, files } from '../../files/schemas/files.schema'
import { FilesQueries } from '../../files/services/files-queries.service'
import { links } from '../../links/schemas/links.schema'
@@ -649,11 +650,15 @@ export class SpacesQueries {
}
}
- async getOrCreateUserFile(userId: number, file: FileProps): Promise<number> {
+ getUserFile(userId: number, fileId: number): Promise<Pick<File, 'id' | 'path'>> {
+ return this.filesQueries.getUserFile(userId, fileId)
+ }
+
+ getOrCreateUserFile(userId: number, file: FileProps): Promise<number> {
return this.filesQueries.getOrCreateUserFile(userId, file)
}
- async getOrCreateSpaceFile(fileId: number, file: FileProps, dbFile: FileDBProps): Promise<number> {
+ getOrCreateSpaceFile(fileId: number, file: FileProps, dbFile: FileDBProps): Promise<number> {
return this.filesQueries.getOrCreateSpaceFile(fileId, file, dbFile)
}