Skip to content

Commit 9c505de

Browse files
committed
Fixed some plugin stuff and the UserModel example
1 parent 0487588 commit 9c505de

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

example/UserModel.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ import Iridium = require('../index');
55
import Concoction = require('concoction');
66
import Promise = require('bluebird');
77

8+
var settings: any = {};
9+
810
export interface UserDocument {
911
username: string;
1012
fullname: string;
@@ -101,7 +103,7 @@ export class User extends Iridium.Instance<UserDocument, User> implements UserDo
101103
var passwordTest = /(?=^.{8,}$)((?=.*\d)(?=.*[A-Z])(?=.*[a-z])|(?=.*\d)(?=.*[^A-Za-z0-9])(?=.*[a-z])|(?=.*[^A-Za-z0-9])(?=.*[A-Z])(?=.*[a-z])|(?=.*\d)(?=.*[A-Z])(?=.*[^A-Za-z0-9]))^.*/;
102104
if (!passwordTest.test(newPassword || '')) return callback(new Error('Password didn\'t meet the minimum safe password requirements. Passwords should be at least 8 characters long, and contain at least 3 of the following categories: lowercase letters, uppercase letters, numbers, characters'));
103105

104-
var hashed = require('crypto').createHash('sha512').update(core.settings.security.salt).update(newPassword).digest('hex');
106+
var hashed = require('crypto').createHash('sha512').update(settings.security.salt).update(newPassword).digest('hex');
105107
this.password = hashed;
106108
this.save(callback);
107109
}
@@ -110,7 +112,7 @@ export class User extends Iridium.Instance<UserDocument, User> implements UserDo
110112
/// <param name="password" type="String">The password to validate against the user's password hash.</param>
111113
/// <returns type="Boolean"/>
112114

113-
var hashed = require('crypto').createHash('sha512').update(core.settings.security.salt).update(password).digest('hex');
115+
var hashed = require('crypto').createHash('sha512').update(settings.security.salt).update(password).digest('hex');
114116
return hashed == this.password;
115117
}
116118
addFriend(friend: string, callback: (err?: Error, user?: User) => void) {
@@ -181,7 +183,7 @@ export function Users(core: Iridium.Core): Iridium.Model<UserDocument, User> {
181183

182184
if (!passwordTest.test(item.password || '')) return Promise.reject(new Error('Password didn\'t meet the minimum safe password requirements. Passwords should be at least 8 characters long, and contain at least 3 of the following categories: lowercase letters, uppercase letters, numbers, characters'));
183185

184-
item.password = require('crypto').createHash('sha512').update(core.settings.security.salt).update(item.password).digest('hex');
186+
item.password = require('crypto').createHash('sha512').update(settings.security.salt).update(item.password).digest('hex');
185187

186188
_.defaults(item, {
187189
type: "Player",

0 commit comments

Comments
 (0)