jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Render the cloudronName in oauth views

Browse Source
This commit is contained in:
Johannes Zellner
2016-10-13 17:24:26 +02:00
parent 7513817d41
commit 68d37b7260
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/oauth2views/header.ejs
View File

@@ -33,7 +33,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<span class="navbar-brand navbar-brand-icon"><img src="/api/v1/cloudron/avatar" width="40" height="40"/></span> <span class="navbar-brand navbar-brand-icon"><img src="/api/v1/cloudron/avatar" width="40" height="40"/></span>
<span class="navbar-brand">Cloudron</span> <span class="navbar-brand"><%= cloudronName %></span>
</div> </div>
</div> </div>
</nav> </nav>

36
src/routes/oauth2.js
View File

@@ -156,7 +156,8 @@ function sendErrorPageOrRedirect(req, res, message) {
renderTemplate(res, 'error', { renderTemplate(res, 'error', {
adminOrigin: config.adminOrigin(), adminOrigin: config.adminOrigin(),
message: message, message: message,
title: 'Cloudron Error' title: 'Cloudron Error',
cloudronName: 'Cloudron'
}); });
} else { } else {
var u = url.parse(req.query.returnTo); var u = url.parse(req.query.returnTo);
@@ -164,7 +165,8 @@ function sendErrorPageOrRedirect(req, res, message) {
return renderTemplate(res, 'error', { return renderTemplate(res, 'error', {
adminOrigin: config.adminOrigin(), adminOrigin: config.adminOrigin(),
message: 'Invalid request. returnTo query is not a valid URI. ' + message, message: 'Invalid request. returnTo query is not a valid URI. ' + message,
title: 'Cloudron Error' title: 'Cloudron Error',
cloudronName: 'Cloudron'
}); });
} }
@@ -182,7 +184,8 @@ function sendError(req, res, message) {
renderTemplate(res, 'error', { renderTemplate(res, 'error', {
adminOrigin: config.adminOrigin(), adminOrigin: config.adminOrigin(),
message: message, message: message,
title: 'Cloudron Error' title: 'Cloudron Error',
cloudronName: 'Cloudron'
}); });
} }
@@ -204,7 +207,8 @@ function loginForm(req, res) {
error: error, error: error,
username: config.isDemo() ? constants.DEMO_USERNAME : '', username: config.isDemo() ? constants.DEMO_USERNAME : '',
password: config.isDemo() ? 'cloudron' : '', password: config.isDemo() ? 'cloudron' : '',
title: applicationName + ' Login' title: applicationName + ' Login',
cloudronName: 'Cloudron'
}); });
} }
@@ -261,7 +265,21 @@ function logout(req, res) {
// Form to enter email address to send a password reset request mail // Form to enter email address to send a password reset request mail
// -> GET /api/v1/session/password/resetRequest.html // -> GET /api/v1/session/password/resetRequest.html
function passwordResetRequestSite(req, res) { function passwordResetRequestSite(req, res) {
renderTemplate(res, 'password_reset_request', { adminOrigin: config.adminOrigin(), csrf: req.csrfToken(), title: 'Cloudron Password Reset' }); settings.getCloudronName(function (error, cloudronName) {
if (error) {
console.error(error);
cloudronName = 'Cloudron';
}
var data = {
adminOrigin: config.adminOrigin(),
csrf: req.csrfToken(),
title: cloudronName + ' Password Reset',
cloudronName: cloudronName
};
renderTemplate(res, 'password_reset_request', data);
});
} }
// This route is used for above form submission // This route is used for above form submission
@@ -285,7 +303,7 @@ function passwordResetRequest(req, res, next) {
// -> GET /api/v1/session/password/sent.html // -> GET /api/v1/session/password/sent.html
function passwordSentSite(req, res) { function passwordSentSite(req, res) {
renderTemplate(res, 'password_reset_sent', { adminOrigin: config.adminOrigin(), title: 'Cloudron Password Reset' }); renderTemplate(res, 'password_reset_sent', { adminOrigin: config.adminOrigin(), title: 'Cloudron Password Reset', cloudronName: 'Cloudron' });
} }
function renderAccountSetupSite(res, req, userObject, error) { function renderAccountSetupSite(res, req, userObject, error) {
@@ -295,7 +313,8 @@ function renderAccountSetupSite(res, req, userObject, error) {
error: error, error: error,
csrf: req.csrfToken(), csrf: req.csrfToken(),
resetToken: req.query.reset_token || req.body.resetToken, resetToken: req.query.reset_token || req.body.resetToken,
title: 'Cloudron Password Setup' title: 'Cloudron Password Setup',
cloudronName: 'Cloudron'
}); });
} }
@@ -358,7 +377,8 @@ function passwordResetSite(req, res, next) {
user: user, user: user,
csrf: req.csrfToken(), csrf: req.csrfToken(),
resetToken: req.query.reset_token, resetToken: req.query.reset_token,
title: 'Cloudron Password Reset' title: 'Cloudron Password Reset',
cloudronName: 'Cloudron'
}); });
}); });
} }