Skip to content

🐜 Reuse ldp #1293

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 2 commits into from
Sep 3, 2019
Merged

🐜 Reuse ldp #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1e2a1b
:ant: Reuse ldp
geistinme Aug 24, 2019
478589f
Reuse ldp more often
geistinme Aug 24, 2019
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
6 changes: 3 additions & 3 deletions lib/capability-discovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function serviceCapabilityDocument () {
const ldp = req.app.locals.ldp
res.json({
// Add the server root url
root: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, req.path),
root: ldp.resourceMapper.resolveUrl(req.hostname, req.path),
// Add the 'apps' urls section
apps: req.app.locals.appUrls,
api: {
Expand All @@ -44,8 +44,8 @@ function serviceCapabilityDocument () {
// Create new user (see IdentityProvider.post() in identity-provider.js)
new: new URL('/api/accounts/new', ldp.serverUri),
recover: new URL('/api/accounts/recover', ldp.serverUri),
signin: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, '/login'),
signout: req.app.locals.ldp.resourceMapper.resolveUrl(req.hostname, '/logout'),
signin: ldp.resourceMapper.resolveUrl(req.hostname, '/login'),
signout: ldp.resourceMapper.resolveUrl(req.hostname, '/logout'),
validateToken: new URL('/api/accounts/validateToken', ldp.serverUri)
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/handlers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ async function handler (req, res, next) {
const requestedType = negotiator.mediaType()

try {
const { path: filename } = await req.app.locals.ldp.resourceMapper.mapUrlToFile({ url: req })
const { path: filename } = await ldp.resourceMapper.mapUrlToFile({ url: req })

const stats = await ldp.stat(filename)
if (!stats.isDirectory()) {
Expand Down