Migration UI complete.
This commit is contained in:
parent
eb48b92551
commit
6bab5b4723
9 changed files with 45 additions and 14 deletions
|
|
@ -56,24 +56,23 @@ module.exports.post = async function(req, res){
|
|||
//Look for the username in the migration DB
|
||||
const migrationDB = await migrationModel.findOne({user});
|
||||
|
||||
//If this isn't a migration
|
||||
if(migrationDB == null){
|
||||
//Get login attempts
|
||||
const attempts = sessionUtils.getLoginAttempts(user)
|
||||
|
||||
//if we've gone over max attempts
|
||||
if(attempts.count > sessionUtils.throttleAttempts){
|
||||
//tell client it needs a captcha
|
||||
return res.sendStatus(429);
|
||||
}
|
||||
//otherwise
|
||||
}else{
|
||||
//If we found a migration profile
|
||||
if(migrationDB != null){
|
||||
//If the user has a good password
|
||||
if(hashUtils.compareLegacyPassword(pass, migrationDB.pass)){
|
||||
//Redirect to migrate
|
||||
return res.sendStatus(301);
|
||||
}
|
||||
}
|
||||
|
||||
//Get login attempts
|
||||
const attempts = sessionUtils.getLoginAttempts(user)
|
||||
|
||||
//if we've gone over max attempts
|
||||
if(attempts.count > sessionUtils.throttleAttempts){
|
||||
//tell client it needs a captcha
|
||||
return res.sendStatus(429);
|
||||
}
|
||||
}else{
|
||||
res.status(400);
|
||||
return res.send({errors: validResult.array()})
|
||||
|
|
|
|||
|
|
@ -225,7 +225,7 @@ module.exports.welcomeWagon = function(count, date, tokes){
|
|||
\x1b[32m WEE EEE EED\x1b[0m C A A N NN O O P Y
|
||||
\x1b[32m WEEEEED\x1b[0m CCCC A A N NN OOO P Y
|
||||
\x1b[32m WEEE ! EEED\x1b[0m
|
||||
\x1b[32m !\x1b[0m \x1b[34mInitialization Complete!\x1b[0m This server has booted \x1b[4m${count}\x1b[0m time${count == 1 ? '' : 's'} and taken ${tokes} \x1b[4mtoke${tokes == 1 ? '' : 's'}\x1b[0m.
|
||||
\x1b[32m !\x1b[0m \x1b[34mInitialization Complete!\x1b[0m This server has booted \x1b[4m${count}\x1b[0m time${count == 1 ? '' : 's'} and taken \x1b[4m${tokes}\x1b[0m toke${tokes == 1 ? '' : 's'}.
|
||||
\x1b[32m !\x1b[0m This server was first booted on \x1b[4m${date}\x1b[0m.`
|
||||
|
||||
//Dump art to console
|
||||
|
|
|
|||
|
|
@ -25,6 +25,9 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. %>
|
|||
</head>
|
||||
<body>
|
||||
<%- include('partial/navbar', {user}); %>
|
||||
<h1>Welcome Back!</h1>
|
||||
<h2><%= instance%> has received an update, and your account needs one too!</h2>
|
||||
<h2 class="danger-text">Remember your new password, you will need it for your first login!</h2>
|
||||
<form action="javascript:">
|
||||
<label>Username:</label>
|
||||
<input class="migrate-prompt" id="migrate-username" placeholder="Required">
|
||||
|
|
|
|||
|
|
@ -25,6 +25,8 @@ along with this program. If not, see <https://www.gnu.org/licenses/>. %>
|
|||
</head>
|
||||
<body>
|
||||
<%- include('partial/navbar', {user}); %>
|
||||
<h1>Account Registration</h1>
|
||||
<h2 class="danger-text">Remember your password, you will need it for your first login!</h2>
|
||||
<form action="javascript:">
|
||||
<label>Username:</label>
|
||||
<input class="register-prompt" id="register-username" placeholder="Required">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue