Merge branch 'main' of https://github.com/WaveringAna/embedder into main
This commit is contained in:
commit
872a4f9a4b
3 changed files with 1 additions and 37 deletions
|
@ -64,36 +64,4 @@ router.post('/logout', function(req, res, next) {
|
|||
});
|
||||
});
|
||||
|
||||
router.get('/signup', function(req, res, next) {
|
||||
res.render('signup');
|
||||
});
|
||||
|
||||
router.post('/signup', function(req, res, next) {
|
||||
var salt = crypto.randomBytes(16);
|
||||
crypto.pbkdf2(req.body.password, salt, 310000, 32, 'sha256', function(err, hashedPassword) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
}
|
||||
db.run('INSERT INTO users (username, hashed_password, salt) VALUES (?, ?, ?)', [
|
||||
req.body.username,
|
||||
hashedPassword,
|
||||
salt
|
||||
], function(err) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
}
|
||||
var user = {
|
||||
id: this.lastID,
|
||||
username: req.body.username
|
||||
};
|
||||
req.login(user, function(err) {
|
||||
if (err) {
|
||||
return next(err);
|
||||
}
|
||||
res.redirect('/');
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
|
|
|
@ -4,10 +4,6 @@ let multer = require('multer');
|
|||
let db = require('../db');
|
||||
let fs = require('fs');
|
||||
|
||||
function extension(string) {
|
||||
return string.slice((string.lastIndexOf(".") - 2 >>> 0) + 2);
|
||||
}
|
||||
|
||||
function extension(str){
|
||||
let file = str.split('/').pop();
|
||||
return [file.substr(0,file.lastIndexOf('.')),file.substr(file.lastIndexOf('.'),file.length)]
|
||||
|
|
|
@ -32,7 +32,7 @@ function extension(string) {
|
|||
<div id="dropArea">
|
||||
<p class="dragregion">Upload a file or drag n' drop into the dashed region</p>
|
||||
<div id="gallery"></div>
|
||||
<p class="dragregion"><input class="" type="file" id="fileupload" name="fileupload"><input type="submit"></p>
|
||||
<p class="dragregion"><input class="" type="file" id="fileupload" name="fileupload"><input type="submit" value="Upload"></p>
|
||||
<p class="dragregion">Click the file to copy the url</p>
|
||||
</div>
|
||||
</form>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue