Move all requests under the /share/ path
This commit is contained in:
+17
-12
@@ -158,18 +158,23 @@ class Immich {
|
||||
valid: true,
|
||||
passwordRequired: true
|
||||
}
|
||||
} else if (jsonBody?.message === 'Invalid share key') {
|
||||
log('Invalid share key ' + key)
|
||||
} else {
|
||||
console.log(JSON.stringify(jsonBody))
|
||||
}
|
||||
}
|
||||
}
|
||||
// Otherwise return failure
|
||||
log('Immich response ' + res.status + ' for key ' + key)
|
||||
try {
|
||||
console.log(res.headers.get('Content-Type'))
|
||||
console.log((await res.text()).slice(0, 500))
|
||||
log('Unexpected response from Immich API at ' + this.apiUrl())
|
||||
log('Please make sure the IPP container is able to reach this path.')
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
} else {
|
||||
// Otherwise return failure
|
||||
log('Immich response ' + res.status + ' for key ' + key)
|
||||
try {
|
||||
console.log(res.headers.get('Content-Type'))
|
||||
console.log((await res.text()).slice(0, 500))
|
||||
log('Unexpected response from Immich API at ' + this.apiUrl())
|
||||
log('Please make sure the IPP container is able to reach this path.')
|
||||
} catch (e) {
|
||||
console.log(e)
|
||||
}
|
||||
}
|
||||
return {
|
||||
valid: false
|
||||
@@ -210,7 +215,7 @@ class Immich {
|
||||
const path = ['photo', key, id]
|
||||
if (size) path.push(size)
|
||||
const params = password ? this.encryptPassword(password) : {}
|
||||
return this.buildUrl('/' + path.join('/'), params)
|
||||
return this.buildUrl('/share/' + path.join('/'), params)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -218,7 +223,7 @@ class Immich {
|
||||
*/
|
||||
videoUrl (key: string, id: string, password?: string) {
|
||||
const params = password ? this.encryptPassword(password) : {}
|
||||
return this.buildUrl(`/video/${key}/${id}`, params)
|
||||
return this.buildUrl(`/share/video/${key}/${id}`, params)
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+18
-15
@@ -13,9 +13,23 @@ const app = express()
|
||||
app.set('view engine', 'ejs')
|
||||
// For parsing the password unlock form
|
||||
app.use(express.json())
|
||||
// Serve static assets from the /public folder
|
||||
// Serve static assets from the 'public' folder as /share/static
|
||||
app.use('/share/static', express.static('public', { setHeaders: addResponseHeaders }))
|
||||
// Serve the same assets on /, to allow for /robots.txt and /favicon.ico
|
||||
app.use(express.static('public', { setHeaders: addResponseHeaders }))
|
||||
|
||||
/*
|
||||
* [ROUTE] Healthcheck
|
||||
* The path matches for /share/healthcheck, and also the legacy /healthcheck
|
||||
*/
|
||||
app.get(/^(|\/share)\/healthcheck$/, async (_req, res) => {
|
||||
if (await immich.accessible()) {
|
||||
res.send('ok')
|
||||
} else {
|
||||
res.status(503).send()
|
||||
}
|
||||
})
|
||||
|
||||
/*
|
||||
* [ROUTE] This is the main URL that someone would visit if they are opening a shared link
|
||||
*/
|
||||
@@ -29,7 +43,7 @@ app.get('/share/:key/:mode(download)?', async (req, res) => {
|
||||
/*
|
||||
* [ROUTE] Receive an unlock request from the password page
|
||||
*/
|
||||
app.post('/unlock', async (req, res) => {
|
||||
app.post('/share/unlock', async (req, res) => {
|
||||
await immich.handleShareRequest({
|
||||
key: toString(req.body.key),
|
||||
password: toString(req.body.password)
|
||||
@@ -39,7 +53,7 @@ app.post('/unlock', async (req, res) => {
|
||||
/*
|
||||
* [ROUTE] This is the direct link to a photo or video asset
|
||||
*/
|
||||
app.get('/:type(photo|video)/:key/:id/:size?', async (req, res) => {
|
||||
app.get('/share/:type(photo|video)/:key/:id/:size?', async (req, res) => {
|
||||
// Add the headers configured in config.json (most likely `cache-control`)
|
||||
addResponseHeaders(res)
|
||||
|
||||
@@ -96,17 +110,6 @@ app.get('/:type(photo|video)/:key/:id/:size?', async (req, res) => {
|
||||
}
|
||||
})
|
||||
|
||||
/*
|
||||
* [ROUTE] Healthcheck
|
||||
*/
|
||||
app.get('/healthcheck', async (_req, res) => {
|
||||
if (await immich.accessible()) {
|
||||
res.send('ok')
|
||||
} else {
|
||||
res.status(503).send()
|
||||
}
|
||||
})
|
||||
|
||||
/*
|
||||
* [ROUTE] Home page
|
||||
*
|
||||
@@ -116,7 +119,7 @@ app.get('/healthcheck', async (_req, res) => {
|
||||
* If you don't want to see this, you can redirect to a URL of your choice by changing your
|
||||
* reverse proxy config, or even redirect to 404 if you like.
|
||||
*/
|
||||
app.get('/', (_req, res) => {
|
||||
app.get(/^\/(|share)\/*$/, (_req, res) => {
|
||||
addResponseHeaders(res)
|
||||
res.render('home')
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user