Skip to content

Commit

Permalink
Updated the UserModel example to adopt the new API
Browse files Browse the repository at this point in the history
  • Loading branch information
@notheotherben
notheotherben committed Apr 21, 2015
1 parent ea2ef66 commit 0487588
Showing 1 changed file with 100 additions and 106 deletions.
206 changes: 100 additions & 106 deletions example/UserModel.ts
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
/// <reference path="../typings/concoction/concoction.d.ts" />
/// <reference path="../typings/lodash/lodash.d.ts" />
/// <reference path="../typings/bluebird/bluebird.d.ts" />

import _ = require('lodash');
import Database = require('../index');
import Instance = require('../lib/Instance');
import Iridium = require('../index');
import Concoction = require('concoction');
import Promise = require('bluebird');

import Model = require('../lib/Model');
import ISchema = require('../lib/Schema');

export interface IUser {
_id: string;
export interface UserDocument {
username: string;
fullname: string;
email: string;
password: string;
Expand Down Expand Up @@ -46,42 +40,105 @@ export interface IUser {
last_seen: Date;
}

export interface IUserInstance extends IUser, Instance.IInstance<IUser, IUserInstance> {
API: {
username: string;
fullname: string;
email: string;
banned: boolean;
statistics: {
won: number;
drawn: number;
lost: number;
incomplete: number;
};
skill: {
level: number;
xp: number;
};
friends: string[];
pending_messages: {
from: string;
time: Date;
message: string;
group?: string;
game?: string;
}[];
last_seen: Date;
export class User extends Iridium.Instance<UserDocument, User> implements UserDocument {
username: string;
fullname: string;
email: string;
password: string;
type: string;
banned: boolean;
statistics: {
won: number;
drawn: number;
lost: number;
incomplete: number;
};
skill: {
matchmaking: number;
trend: number;
level: number;
xp: number;
current_level: number;
next_level: number;
};
friends: string[];

pending_messages: {
from: string;
time: Date;
message: string;
group?: string;
game?: string;
}[];
sessions: string[];
friend_requests: string[];
last_seen: Date;

setPassword(newPassword: string, callback: (err?: Error, user?: IUserInstance) => void);
checkPassword(password: string): boolean;
addFriend(friend: string, callback: (err?: Error, user?: IUserInstance) => void);
updateLevel();
get API() {
var $ = this;

return {
username: $.username,
fullname: $.fullname,
email: $.email,
banned: $.banned,
statistics: $.statistics,
skill: {
level: $.skill.level,
xp: $.skill.xp
},
friends: $.friends,
pending_messages: $.pending_messages,
last_seen: $.last_seen
};
}

setPassword(newPassword: string, callback: (err?: Error, user?: User) => void) {
/// <summary>Updates the user's stored password hash</summary>
/// <param name="newPassword" type="String">The new password to use for the user</param>
/// <param name="callback" type="Function">A function to be called once the user's password has been updated</param>

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]))^.*/;
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'));

var hashed = require('crypto').createHash('sha512').update(core.settings.security.salt).update(newPassword).digest('hex');
this.password = hashed;
this.save(callback);
}
checkPassword(password: string): boolean {
/// <summary>Checks whether a given password is correct for a user's account</summary>
/// <param name="password" type="String">The password to validate against the user's password hash.</param>
/// <returns type="Boolean"/>

var hashed = require('crypto').createHash('sha512').update(core.settings.security.salt).update(password).digest('hex');
return hashed == this.password;
}
addFriend(friend: string, callback: (err?: Error, user?: User) => void) {
this.save({ $push: { friends: friend } }, callback);
}
updateLevel() {
/// <summary>Update's the user's current level based on the amount of XP they have. Doesn't save the user instance.</summary>

// Amount of XP required per level starts at 1200, doubles for each consecutive level
// tf. XP_n = XP_nm1 + 1200 * 2^n

var remainingXP = this.skill.xp;

var previousLevelXP = 0;
var levelXP = 1200;
var level = 0;

for (; remainingXP >= levelXP; level++ , previousLevelXP = levelXP, remainingXP -= levelXP, levelXP += 1200 * Math.pow(2, level));

this.skill.level = level;
this.skill.current_level = previousLevelXP;
this.skill.next_level = levelXP;
}
}

export function Users(core: Database): Model.IModel<IUser, IUserInstance> {
var schema: ISchema = {
_id: /[a-z0-9]+(_[a-z0-9]+)*/,
export function Users(core: Iridium.Core): Iridium.Model<UserDocument, User> {
var schema: Iridium.Schema = {
username: /[a-z0-9]+(_[a-z0-9]+)*/,
fullname: String,
email: String,
password: String,
Expand Down Expand Up @@ -114,70 +171,7 @@ export function Users(core: Database): Model.IModel<IUser, IUserInstance> {
last_seen: Date
};

var options: Model.IModelOptions<IUser> = {
virtuals: {
API: function () {
var $ = this;

return {
username: $.username,
fullname: $.fullname,
email: $.email,
banned: $.banned,
statistics: $.statistics,
skill: {
level: $.skill.level,
xp: $.skill.xp
},
friends: $.friends,
pending_messages: $.pending_messages,
last_seen: $.last_seen
};
}
},
methods: {
setPassword: function (newPassword, callback) {
/// <summary>Updates the user's stored password hash</summary>
/// <param name="newPassword" type="String">The new password to use for the user</param>
/// <param name="callback" type="Function">A function to be called once the user's password has been updated</param>

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]))^.*/;
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'));

var hashed = require('crypto').createHash('sha512').update(core.settings.security.salt).update(newPassword).digest('hex');
this.password = hashed;
this.save(callback);
},
checkPassword: function (password) {
/// <summary>Checks whether a given password is correct for a user's account</summary>
/// <param name="password" type="String">The password to validate against the user's password hash.</param>
/// <returns type="Boolean"/>

var hashed = require('crypto').createHash('sha512').update(core.settings.security.salt).update(password).digest('hex');
return hashed == this.password;
},
addFriend: function (friend, callback) {
this.save({ $push: { friends: friend } }, callback);
},
updateLevel: function () {
/// <summary>Update's the user's current level based on the amount of XP they have. Doesn't save the user instance.</summary>

// Amount of XP required per level starts at 1200, doubles for each consecutive level
// tf. XP_n = XP_nm1 + 1200 * 2^n

var remainingXP = this.skill.xp;

var previousLevelXP = 0;
var levelXP = 1200;
var level = 0;

for (; remainingXP >= levelXP; level++ , previousLevelXP = levelXP, remainingXP -= levelXP, levelXP += 1200 * Math.pow(2, level));

this.skill.level = level;
this.skill.current_level = previousLevelXP;
this.skill.next_level = levelXP;
}
},
var options = {
hooks: {
creating: function (item) {
item._id = item.username;
Expand Down Expand Up @@ -229,7 +223,7 @@ export function Users(core: Database): Model.IModel<IUser, IUserInstance> {
]
};

return new Database.Model<IUser, IUserInstance>(core, "users", schema, options);
return new Iridium.Model<UserDocument, User>(core, User, "users", schema, options);
}

var usrModel = Users(null);
Expand Down

0 comments on commit 0487588

Please sign in to comment.