Skip to content

fix: do not resolve storage provider in getUrl #6361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 21, 2024
Merged

fix: do not resolve storage provider in getUrl #6361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions server/core/src/server/aggregator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import core, {
type WorkspaceId
} from '@hcengineering/core'
import { type Readable } from 'stream'
import { type RawDBAdapter } from '../adapter'

import { getMetadata } from '@hcengineering/platform'
import {
type BlobStorageIterator,
type BucketInfo,
Expand All @@ -20,6 +20,9 @@ import {
type StorageAdapterEx,
type UploadedObjectInfo
} from '@hcengineering/storage'

import { type RawDBAdapter } from '../adapter'
import serverCore from '../plugin'
import { type StorageConfig, type StorageConfiguration } from '../types'

class NoSuchKeyError extends Error {
Expand Down Expand Up @@ -367,8 +370,10 @@ export class AggregatorStorageAdapter implements StorageAdapter, StorageAdapterE

@withContext('aggregator-getUrl', {})
async getUrl (ctx: MeasureContext, workspaceId: WorkspaceId, name: string): Promise<string> {
const { provider, stat } = await this.findProvider(ctx, workspaceId, name)
return await provider.getUrl(ctx, workspaceId, stat.storageId)
// const { provider, stat } = await this.findProvider(ctx, workspaceId, name)
// return await provider.getUrl(ctx, workspaceId, stat.storageId)
const filesUrl = getMetadata(serverCore.metadata.FilesUrl) ?? ''
return filesUrl.replaceAll(':workspace', workspaceId.name).replaceAll(':blobId', name)
}
}

Expand Down