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
fix(backend:spaces): update query parameters to prevent runtime errors and add missing comments for clarity
johavend20604a9c718
diff --git a/backend/src/applications/shares/services/shares-queries.service.ts b/backend/src/applications/shares/services/shares-queries.service.tsindex a09aaed3..4dd51564 100644--- a/backend/src/applications/shares/services/shares-queries.service.ts+++ b/backend/src/applications/shares/services/shares-queries.service.ts@@ -857,6 +857,8 @@ export class SharesQueries {}this.sharePermissionsQuery = this.db.select(select).from(unionAlias).groupBy(unionAlias.id).limit(1).prepare()}+ // `userId` is used in `fromUserQuery` and `fromGroupsQuery` function+ // `isAdmin` is used in `fromAdminSharesQuery` functionconst [r]: Partial<SpaceEnv>[] = await this.sharePermissionsQuery.execute({ userId, shareAlias, isAdmin })if (r) {r.permissions = uniquePermissions(r.permissions)diff --git a/backend/src/applications/spaces/services/spaces-queries.service.ts b/backend/src/applications/spaces/services/spaces-queries.service.tsindex 654102b0..3a4f84e3 100644--- a/backend/src/applications/spaces/services/spaces-queries.service.ts+++ b/backend/src/applications/spaces/services/spaces-queries.service.ts@@ -482,6 +482,7 @@ export class SpacesQueries {const unionAlias = this.fromUserAndGroups({ id: spaces.id })this.spaceIdsQuery = this.db.select({ id: unionAlias.id }).from(unionAlias).groupBy(unionAlias.id).prepare()}+ // `userId` is used in `fromUserAndGroups` functionreturn (await this.spaceIdsQuery.execute({ userId })).map((r: { id: number }) => r.id)}@@ -521,7 +522,12 @@ export class SpacesQueries {})}if (fromId) {- pQuery = this.db.select(select).from(unionAlias).where(eq(unionAlias.id, fromId)).limit(1).prepare()+ pQuery = this.db+ .select(select)+ .from(unionAlias)+ .where(eq(unionAlias.id, sql.placeholder('fromId')))+ .limit(1)+ .prepare()this.spaceFromIdWithPermissionsQuery = pQuery} else {pQuery = this.db.select(select).from(unionAlias).groupBy(unionAlias.id).prepare()@@ -533,7 +539,8 @@ export class SpacesQueries {}}// SpaceProps instance is required, if the user is a space manager, he must have all permissions- return (await pQuery.execute({ userId })).map((s: Partial<SpaceProps>) => new SpaceProps(s))+ // `userId` is used in `fromUserAndGroups` function+ return (await pQuery.execute({ userId, fromId })).map((s: Partial<SpaceProps>) => new SpaceProps(s))}async spacesWithDetails(userId: number): Promise<SpaceProps[]> {@@ -707,6 +714,7 @@ export class SpacesQueries {}this.spacePermissionsQuery = this.db.select(select).from(unionAlias).groupBy(unionAlias.id).limit(1).prepare()}+ // `userId` is used in `fromUserAndGroups` functionconst r: MySqlQueryResult = await this.spacePermissionsQuery.execute({ userId, spaceAlias })return r.length ? r.at(0) : null}@@ -759,6 +767,7 @@ export class SpacesQueries {}this.spaceAndRootPermissionsQuery = this.db.select(select).from(unionAlias).groupBy(unionAlias.id).limit(1).prepare()}+ // `userId` is used in `fromUserQuery` and `fromGroupsQuery` functionconst r: MySqlQueryResult = await this.spaceAndRootPermissionsQuery.execute({ userId, spaceAlias, rootAlias })return r.length ? r.at(0) : null}