Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.
TypeScript cloud-alternativecollaborationcollaborative-editingdropboxfile-serverfile-sharingfile-storagefile-syncfull-text-searchhomelabnextcloudon-premiseopen-sourceprivacy-firstprivate-cloudrealtimesecureself-hostedstorage-serverwebdav
refactor(backend/frontend:files): remove FileSettings interface and related logic to simplify configuration handling
johavend120eb5c151c
diff --git a/backend/src/applications/files/constants/routes.ts b/backend/src/applications/files/constants/routes.tsindex a29ccd00..ff8c7222 100644--- a/backend/src/applications/files/constants/routes.ts+++ b/backend/src/applications/files/constants/routes.ts@@ -9,7 +9,6 @@ import { FILE_OPERATION } from './operations'export const FILES_ROUTE = {BASE: SPACES_ROUTE.BASE,- SETTINGS: 'settings',OPERATION: 'operation',TASK_OPERATION: 'task/operation',TASKS: 'tasks',@@ -28,6 +27,5 @@ export const API_FILES_TASK_OPERATION_COMPRESS = `${API_FILES_TASK_OPERATION}/${export const API_FILES_TASK_OPERATION_DECOMPRESS = `${API_FILES_TASK_OPERATION}/${FILE_OPERATION.DECOMPRESS}`export const API_FILES_TASKS = `${FILES_ROUTE.BASE}/${FILES_ROUTE.TASKS}`export const API_FILES_TASKS_DOWNLOAD = `${FILES_ROUTE.BASE}/${FILES_ROUTE.TASKS}/${FILES_ROUTE.TASKS_DOWNLOAD}`-export const API_FILES_SETTINGS = `${FILES_ROUTE.BASE}/${FILES_ROUTE.SETTINGS}`export const API_FILES_RECENTS = `${FILES_ROUTE.BASE}/${FILES_ROUTE.RECENTS}`export const API_FILES_SEARCH = `${FILES_ROUTE.BASE}/${FILES_ROUTE.SEARCH}`diff --git a/backend/src/applications/files/files.controller.ts b/backend/src/applications/files/files.controller.tsindex 5b4c33d9..0c596e34 100644--- a/backend/src/applications/files/files.controller.ts+++ b/backend/src/applications/files/files.controller.ts@@ -43,7 +43,6 @@ import { FILE_OPERATION, FORCE_AS_FILE_OWNER } from './constants/operations'import { FILES_ROUTE } from './constants/routes'import { CompressFileDto, CopyMoveFileDto, DownloadFileDto, MakeFileDto, SearchFilesDto } from './dto/file-operations.dto'import { FileLockProps } from './interfaces/file-props.interface'-import { FileSettings } from './interfaces/file-settings.interface'import { FileTask } from './models/file-task'import { FileContent } from './schemas/file-content.interface'import { FileRecent } from './schemas/file-recent.interface'@@ -199,14 +198,6 @@ export class FilesController {return this.filesTasksManager.createTask(FILE_OPERATION.DELETE, user, space, null, this.filesMethods.delete.name)}- // SETTINGS-- @Get(FILES_ROUTE.SETTINGS)- @SkipSpaceGuard()- filesSettings(): FileSettings {- return this.filesMethods.fileSettings()- }-// RECENT FILES@Get(FILES_ROUTE.RECENTS)diff --git a/backend/src/applications/files/interfaces/file-settings.interface.ts b/backend/src/applications/files/interfaces/file-settings.interface.tsdeleted file mode 100644index d4cc2c23..00000000--- a/backend/src/applications/files/interfaces/file-settings.interface.ts+++ /dev/null@@ -1,9 +0,0 @@-/*- * Copyright (C) 2012-2025 Johan Legrand <[email protected]>- * This file is part of Sync-in | The open source file sync and share solution- * See the LICENSE file for licensing details- */--export interface FileSettings {- editor: { collaboraOnline: boolean; onlyOffice: boolean }-}diff --git a/backend/src/applications/files/services/files-methods.service.ts b/backend/src/applications/files/services/files-methods.service.tsindex 1185facd..9adc7b1c 100644--- a/backend/src/applications/files/services/files-methods.service.ts+++ b/backend/src/applications/files/services/files-methods.service.ts@@ -8,7 +8,6 @@ import { HttpException, HttpStatus, Injectable, Logger, StreamableFile } from '@import { FastifyReply } from 'fastify'import path from 'node:path'import { Readable } from 'node:stream'-import { configuration } from '../../../configuration/config.environment'import { FastifySpaceRequest } from '../../spaces/interfaces/space-request.interface'import { SpaceEnv } from '../../spaces/models/space-env.model'import { SpacesManager } from '../../spaces/services/spaces-manager.service'@@ -16,7 +15,6 @@ import { UserModel } from '../../users/models/user.model'import { FILE_OPERATION } from '../constants/operations'import { CompressFileDto, CopyMoveFileDto, DownloadFileDto, MakeFileDto } from '../dto/file-operations.dto'import { FileLockProps } from '../interfaces/file-props.interface'-import { FileSettings } from '../interfaces/file-settings.interface'import { FileError } from '../models/file-error'import { LockConflict } from '../models/file-lock-error'import { checkFileName, dirName, fileName, isPathExists, sanitizeName } from '../utils/files'@@ -207,15 +205,6 @@ export class FilesMethods {return { path: dirName(dstUrl), name: fileName(dstUrl) }}- fileSettings(): FileSettings {- return {- editor: {- collaboraOnline: configuration.applications.files.collabora.enabled,- onlyOffice: configuration.applications.files.onlyoffice.enabled- }- }- }-private handleError(space: SpaceEnv, action: string, e: any, dstSpace?: SpaceEnv) {this.logger.error(`unable to ${action} ${space.url}${dstSpace?.url ? ` -> ${dstSpace.url}` : ''} : ${e}`)// Remove the last part to avoid exposing the pathdiff --git a/backend/src/configuration/config.environment.ts b/backend/src/configuration/config.environment.tsindex 45d02551..f012c633 100755--- a/backend/src/configuration/config.environment.ts+++ b/backend/src/configuration/config.environment.ts@@ -14,7 +14,13 @@ import { configLoader } from './config.loader'import { GlobalConfig } from './config.validation'export const configuration: GlobalConfig = loadConfiguration()-export const serverConfig: ServerConfig = { twoFaEnabled: configuration.auth.mfa.totp.enabled, mailServerEnabled: !!configuration.mail?.host }+export const serverConfig: ServerConfig = {+ twoFaEnabled: configuration.auth.mfa.totp.enabled,+ mailServerEnabled: !!configuration.mail?.host,+ applications: {+ files: { collaboraOnline: configuration.applications.files.collabora.enabled, onlyOffice: configuration.applications.files.onlyoffice.enabled }+ }+}export const exportConfiguration: (reload?: boolean) => GlobalConfig = (reload = false) => (reload ? loadConfiguration() : configuration)function loadConfiguration(): GlobalConfig {diff --git a/backend/src/configuration/config.interfaces.ts b/backend/src/configuration/config.interfaces.tsindex f918d378..53d65bf4 100644--- a/backend/src/configuration/config.interfaces.ts+++ b/backend/src/configuration/config.interfaces.ts@@ -7,4 +7,5 @@export interface ServerConfig {twoFaEnabled: booleanmailServerEnabled: boolean+ applications: { files: { collaboraOnline: boolean; onlyOffice: boolean } }}diff --git a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.htmlindex 04895582..09c8b0cb 100644--- a/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html+++ b/frontend/src/app/applications/files/components/dialogs/files-viewer-dialog.component.html@@ -25,9 +25,9 @@<app-files-viewer-media [currentHeight]="currentHeight" [fileUrl]="currentFile.dataUrl"></app-files-viewer-media>}@case (SHORT_MIME.DOCUMENT) {- @if (store.fileSettings().editor.collaboraOnline) {+ @if (store.server().applications.files.collaboraOnline) {<app-files-viewer-collabora-online [currentHeight]="currentHeight" [file]="currentFile" [(isReadonly)]="isReadonly"></app-files-viewer-collabora-online>- } @else if (store.fileSettings().editor.onlyOffice) {+ } @else if (store.server().applications.files.onlyOffice) {<app-files-viewer-only-office [currentHeight]="currentHeight" [file]="currentFile" [(isReadonly)]="isReadonly"></app-files-viewer-only-office>} @else {<!--This case should never happen-->diff --git a/frontend/src/app/applications/files/services/files.service.ts b/frontend/src/app/applications/files/services/files.service.tsindex 00199e47..478690e5 100644--- a/frontend/src/app/applications/files/services/files.service.ts+++ b/frontend/src/app/applications/files/services/files.service.ts@@ -14,7 +14,6 @@ import {API_FILES_OPERATION_MAKE,API_FILES_RECENTS,API_FILES_SEARCH,- API_FILES_SETTINGS,API_FILES_TASK_OPERATION_COMPRESS,API_FILES_TASK_OPERATION_DECOMPRESS,API_FILES_TASK_OPERATION_DOWNLOAD,@@ -28,7 +27,6 @@ import type {SearchFilesDto} from '@sync-in-server/backend/src/applications/files/dto/file-operations.dto'import type { FileLockProps } from '@sync-in-server/backend/src/applications/files/interfaces/file-props.interface'-import type { FileSettings } from '@sync-in-server/backend/src/applications/files/interfaces/file-settings.interface'import type { FileTree } from '@sync-in-server/backend/src/applications/files/interfaces/file-tree.interface'import type { FileTask } from '@sync-in-server/backend/src/applications/files/models/file-task'import type { FileContent } from '@sync-in-server/backend/src/applications/files/schemas/file-content.interface'@@ -296,10 +294,8 @@ export class FilesService {}private async viewerHook(mode: FILE_MODE, file: FileModel): Promise<string> {- const fileSettings = await this.getFileSettings()- const onlyOfficeAvailable = fileSettings ? fileSettings.editor.onlyOffice : false- const collaboraAvailable = fileSettings ? fileSettings.editor.collaboraOnline : false- const hasEnabledOfficeEditor = onlyOfficeAvailable || collaboraAvailable || false+ const hasEnabledOfficeEditor =+ this.store.server().applications.files.collaboraOnline || this.store.server().applications.files.onlyOffice || falseif (file.shortMime === SHORT_MIME.DOCUMENT && !hasEnabledOfficeEditor) {if (file.mime.startsWith('text-')) {return SHORT_MIME.TEXT@@ -307,27 +303,13 @@ export class FilesService {throw new Error('No editor found')}if (file.shortMime === SHORT_MIME.PDF) {- if (mode === FILE_MODE.EDIT && onlyOfficeAvailable) {+ if (mode === FILE_MODE.EDIT && this.store.server().applications.files.onlyOffice) {return SHORT_MIME.DOCUMENT}}return file.shortMime}- private async getFileSettings(): Promise<FileSettings | false> {- if (this.store.fileSettings() !== null) {- return this.store.fileSettings()- }- try {- const settings = await firstValueFrom(this.http.get<FileSettings>(API_FILES_SETTINGS))- this.store.fileSettings.set(settings)- return settings- } catch {- this.store.fileSettings.set(null)- return false- }- }-private isValidName(fileName: string): boolean {try {isValidFileName(fileName)diff --git a/frontend/src/app/store/store.service.ts b/frontend/src/app/store/store.service.tsindex 90674944..c3695d21 100644--- a/frontend/src/app/store/store.service.ts+++ b/frontend/src/app/store/store.service.ts@@ -6,7 +6,6 @@import { computed, Injectable, Signal, signal, WritableSignal } from '@angular/core'import type { SearchFilesDto } from '@sync-in-server/backend/src/applications/files/dto/file-operations.dto'-import type { FileSettings } from '@sync-in-server/backend/src/applications/files/interfaces/file-settings.interface'import type { FileTask } from '@sync-in-server/backend/src/applications/files/models/file-task'import { AppStoreManifest } from '@sync-in-server/backend/src/applications/sync/interfaces/store-manifest.interface'import type { ServerConfig } from '@sync-in-server/backend/src/configuration/config.interfaces'@@ -33,7 +32,11 @@ import { myAvatarUrl } from '../applications/users/user.functions'providedIn: 'root'})export class StoreService {- public server: WritableSignal<ServerConfig> = signal<ServerConfig>({ twoFaEnabled: false, mailServerEnabled: false })+ public server: WritableSignal<ServerConfig> = signal<ServerConfig>({+ twoFaEnabled: false,+ mailServerEnabled: false,+ applications: { files: { collaboraOnline: false, onlyOffice: false } }+ })public user = new BehaviorSubject<UserType>(null)public userAvatarUrl = new BehaviorSubject<string>(myAvatarUrl())public userImpersonate: WritableSignal<boolean> = signal<boolean>(false)@@ -45,8 +48,6 @@ export class StoreService {public filesActiveTasks = new BehaviorSubject<FileTask[]>([])public filesEndedTasks = new BehaviorSubject<FileTask[]>([])public filesRecents: WritableSignal<FileRecentModel[]> = signal<FileRecentModel[]>([])- // File Settings- public fileSettings: WritableSignal<FileSettings> = signal(null)// Searchpublic currentSearch: WritableSignal<SearchFilesDto> = signal<SearchFilesDto>({ content: '', fullText: false })public filesSearch: WritableSignal<FileContentModel[]> = signal<FileContentModel[]>([])