Prompt login if auth enabled

This commit is contained in:
Nick O'Leary
2014-11-11 10:15:02 +00:00
parent 2128b57ab2
commit 28823802ea
13 changed files with 249 additions and 136 deletions

View File

@@ -53,11 +53,20 @@ function getToken(req,res,next) {
return server.token()(req,res,next);
}
function login(req,res) {
var response = {
"type":"credentials",
"prompts":[{id:"username",type:"text",label:"Username"},{id:"password",type:"password",label:"Password"}]
}
res.json(response);
}
module.exports = {
authenticate: authenticate,
ensureClientSecret: ensureClientSecret,
authenticateClient: authenticateClient,
getToken: getToken,
errorHandler: server.errorHandler()
errorHandler: server.errorHandler(),
login: login
}

View File

@@ -29,7 +29,7 @@ var bearerStrategy = function (accessToken, done) {
if (token) {
users.get(token.user).then(function(user) {
if (user) {
done(null,user,{scope:token.scope});
done(null,{username:user.username},{scope:token.scope});
} else {
done(null,false);
}

View File

@@ -50,6 +50,7 @@ function init(adminApp) {
auth.getToken,
auth.errorHandler
);
apiApp.get("/auth/login",auth.login);
// Flows
apiApp.get("/flows",flows.get);

View File

@@ -19,7 +19,8 @@ module.exports = {
settings: function(req,res) {
var safeSettings = {
httpNodeRoot: settings.httpNodeRoot,
version: settings.version
version: settings.version,
user: req.user
};
res.json(safeSettings);
}