Skip to content

Slight fix to 'apps' config section #367

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
nicola merged 2 commits into from
May 17, 2016
Merged

Slight fix to 'apps' config section #367

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
572648c
Implement 'apps' section of server capability doc
dmitrizagidulin May 16, 2016
4a9b877
Remove appUrls default, fix related test
dmitrizagidulin May 16, 2016
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
7 changes: 1 addition & 6 deletions lib/capability-discovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ const serviceConfigDefaults = {
}
}

const appUrlDefaults = {
'signin': '/signin/',
'signup': '/signup/'
}

module.exports = capabilityDiscovery

/**
Expand Down Expand Up @@ -70,7 +65,7 @@ function serviceCapabilityDocument (serviceConfig) {
// Add the server root url
serviceConfig.root = util.uriBase(req) // TODO make sure we align with the rest
// Add the 'apps' urls section
serviceConfig.apps = req.app.locals.appUrls || appUrlDefaults
serviceConfig.apps = req.app.locals.appUrls
res.json(serviceConfig)
}
}
10 changes: 9 additions & 1 deletion test/capability-discovery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,15 @@ describe('Capability Discovery', function () {
return done(err)
})
})
it('includes an app urls section', function (done) {
it('includes an apps config section', function (done) {
const config = {
apps: {
'signin': '/signin/',
'signup': '/signup/'
}
}
const solid = ldnode(config)
let server = supertest(solid)
server.get('/.well-known/solid')
.end(function (err, req) {
expect(req.body.apps).to.exist
Expand Down