krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

add auth.local.passwordHashMethod field

Browse Source
This commit is contained in:
Matteo Pagliazzi
2017-01-23 10:38:41 +01:00
parent 2bbc4f4f4d
commit 070c4a8fbd
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/server/controllers/api-v3/auth.js
View File

@@ -125,6 +125,7 @@ api.registerLocal = {
email, email,
salt, salt,
hashed_password, // eslint-disable-line camelcase hashed_password, // eslint-disable-line camelcase
passwordHashMethod: 'sha1',
}, },
}, },
preferences: { preferences: {

2
website/server/models/user/hooks.js
View File

@@ -10,7 +10,7 @@ import schema from './schema';
schema.plugin(baseModel, { schema.plugin(baseModel, {
// noSet is not used as updating uses a whitelist and creating only accepts specific params (password, email, username, ...) // noSet is not used as updating uses a whitelist and creating only accepts specific params (password, email, username, ...)
noSet: [], noSet: [],
private: ['auth.local.hashed_password', 'auth.local.salt', '_cronSignature', '_ABtest', '_ABtests'], private: ['auth.local.hashed_password', 'auth.local.passwordHashMethod', 'auth.local.salt', '_cronSignature', '_ABtest', '_ABtests'],
toJSONTransform: function userToJSON (plainObj, originalDoc) { toJSONTransform: function userToJSON (plainObj, originalDoc) {
plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs plainObj._tmp = originalDoc._tmp; // be sure to send down drop notifs
delete plainObj.filters; delete plainObj.filters;

7
website/server/models/user/schema.js
View File

@@ -54,7 +54,12 @@ let schema = new Schema({
// Store a lowercase version of username to check for duplicates // Store a lowercase version of username to check for duplicates
lowerCaseUsername: String, lowerCaseUsername: String,
hashed_password: String, // eslint-disable-line camelcase hashed_password: String, // eslint-disable-line camelcase
salt: String, // Legacy password are hashed with SHA1, new ones with bcrypt
passwordHashMethod: {
type: String,
enum: ['bcrypt', 'sha1'],
},
salt: String, // Salt for SHA1 encrypted passwords, not stored for bcrypt
}, },
timestamps: { timestamps: {
created: {type: Date, default: Date.now}, created: {type: Date, default: Date.now},