mirrors/hedgedoc
1
0
Fork 0
mirror of https://github.com/hedgedoc/hedgedoc.git synced 2025-05-18 17:25:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bug with minio.ts

Browse source 
- the provider can't be meaningfully initialized if this UploadProvider is not configured

Signed-off-by: Philip Molares <philip.molares@udo.edu>
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
Philip Molares 2020-04-12 21:24:59 +02:00 • committed by David Mehren
parent 6cbd436454
commit a642cfd22a
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB
1 changed files with 37 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

66
lib/web/imageRouter/minio.ts
View file

@ -1,51 +1,59 @@
import path from 'path' import path from 'path'
import fs from 'fs' import fs from 'fs'
import Minio from 'minio' import { Client } from 'minio'
import { config } from '../../config' import { config } from '../../config'
import { getImageMimeType } from '../../utils' import { getImageMimeType } from '../../utils'
import { logger } from '../../logger' import { logger } from '../../logger'
import { UploadProvider } from './index' import { UploadProvider } from './index'
const minioClient = new Minio.Client({ let MinioUploadProvider: UploadProvider
endPoint: config.minio.endPoint,
port: config.minio.port,
useSSL: config.minio.secure,
accessKey: config.minio.accessKey,
secretKey: config.minio.secretKey
})
const MinioUploadProvider: UploadProvider = { if (config.minio.endPoint !== undefined) {
uploadImage: (imagePath, callback) => { const minioClient = new Client({
if (!imagePath) { endPoint: config.minio.endPoint,
callback(new Error('Image path is missing or wrong'), undefined) port: config.minio.port,
return useSSL: config.minio.secure,
} accessKey: config.minio.accessKey,
secretKey: config.minio.secretKey
})
if (!callback || typeof callback !== 'function') { MinioUploadProvider = {
logger.error('Callback has to be a function') uploadImage: (imagePath, callback): void => {
return if (!imagePath) {
} callback(new Error('Image path is missing or wrong'), undefined)
fs.readFile(imagePath, function (err, buffer) {
if (err) {
callback(new Error(err.message), undefined)
return return
} }
const key = path.join('uploads', path.basename(imagePath)) if (!callback || typeof callback !== 'function') {
const protocol = config.minio.secure ? 'https' : 'http' logger.error('Callback has to be a function')
return
}
minioClient.putObject(config.s3bucket, key, buffer, buffer.length, getImageMimeType(imagePath), function (err, _) { fs.readFile(imagePath, function (err, buffer) {
if (err) { if (err) {
callback(new Error(err.message), undefined) callback(new Error(err.message), undefined)
return return
} }
const hidePort = [80, 443].includes(config.minio.port)
const urlPort = hidePort ? '' : `:${config.minio.port}` const key = path.join('uploads', path.basename(imagePath))
callback(undefined, `${protocol}://${config.minio.endPoint}${urlPort}/${config.s3bucket}/${key}`) const protocol = config.minio.secure ? 'https' : 'http'
const metaData = {
ContentType: getImageMimeType(imagePath)
}
minioClient.putObject(config.s3bucket, key, buffer, buffer.length, metaData, function (err, _) {
if (err) {
callback(new Error(err.message), undefined)
return
}
const hidePort = [80, 443].includes(config.minio.port)
const urlPort = hidePort ? '' : `:${config.minio.port}`
callback(undefined, `${protocol}://${config.minio.endPoint}${urlPort}/${config.s3bucket}/${key}`)
})
}) })
}) }
} }
} }