auth 0.0.9 → 1.0.1

package/lib/models/account.js

@@ -1,281 +0,0 @@
-var access = require("../access"),
-crypto     = require("crypto"),
-_          = require("underscore"),
-access     = require("../access"),
-Token      = require("./token"),
-outcome    = require("outcome"),
-step       = require("step"),
-dsync      = require("dsync"),
-structr    = require("structr"),
-outcome = require("outcome"),
-comerr = require("comerr"),
-verify = require("verify")();
-
-exports.model = function(options) {
-
-	var database = options.connection;
-
-	Token.model(database);
-
-	var Schema = database.base.Schema,
-	ObjectId = Schema.Types.ObjectId;
-
-
-	verify.register("password", "Invalid password. Must be at least 6 chars.").len(6);
-
-	/**
-	 */
-
-	var Account = new Schema({
-
-		/**
-		 */
-
-		validated: { type: Boolean, default: false },
-
-		/**
-		 */
-
-		validatedAt: { type: Date, default: Date.now },
-
-		/**
-		 */
-
-		validationKey: { type: String, default: function() {
-			return Date.now() + "_" + Math.round(Math.random()*44332482393);
-		}},
-
-		/**
-		 */
-
-		password: { type: String, required: true, set: hashPass, select: false, default: randomPass },
-
-		/**
-		 */
-
-		createdAt: { type: Date, default: Date.now }
-	});
-
-	Account.publicMethods = ["getMainToken", "createToken"];
-
-	Account.plugin(dsync.schema);
-	Account.add(options.fields || {});
-
-	var authFields;
-
-	if(!(authFields = options.authFields)) {
-		Account.add({ email: { type: String, required: true, index: { unique: true }} });
-		authFields = ["email", "password"];
-	}
-
-
-	/**
-	 * makes this account the owner of the target item. NOT used
-	 * for querying since mongodb cannot do deep object searching 
-	 */
-
-	Account.methods.ownItem = function(item, acc) {
-		if(!item.owners) item.owners = [];
-		var self = this;
-
-		if(!acc) {
-			acc = access.all(false);
-		}
-
-		if(!(acc instanceof Array)) {
-			acc = [acc];
-		}
-
-
-		if(!item.owners.length) {
-			acc.push(access.SUPER); //owner
-		}
-
-		if(this.isItemOwner(item)) return;
-
-		item.owners.push({
-			account: self._id,
-			access: acc
-		});
-	}
-
-	/**
-	 */
-
-	Account.methods.shareItem = Account.methods.ownItem;
-
-	/**
-	 */
-
-	Account.methods.disownItem = function(item) {
-		console.log(item.owners.remove);
-	}
-
-	/**
-	 */
-
-	Account.methods.lockdownItem = function(item) {
-		item._account = this;
-	}
-
-	/**
-	 * returns true / false if authorized for the given action
-	 */
-
-	Account.methods.authorized = function(item, access) {
-
-		//MUST 
-		return this.isItemOwner(item, access) && (this.token ? this.token.authorized(item, access) : true);
-	}
-
-	/**
-	 * dead simple flow-control function. Use it like this:
-	 * if(!user.hasItemAccess(item)) return user.unauthorized(callback);
-	 */
-
-	Account.methods.unauthorized = function(callback) {
-
-		var err = new comerr.Unauthorized();
-
-		return arguments.length ? callback(err) : err;
-	}
-
- 
-	/**
-	 * returns true 
-	 */
-
-	Account.methods.isItemOwner = function(item, acc) {
-
-		if(!acc) acc = access.all(true);
-		if(!(acc instanceof Array)) acc = [acc];
-
-		var self = this;
-		//first check if the owner exists. If
-		return !!_.find(item.owners, function(owner) {
-			return String(owner.account) == String(self._id) && 
-			!!_.intersection(acc, owner.access).length;
-		});
-	}
-
-
-	/**
-	 * wraps owner tags around a query
-	 */
-
-	Account.methods.addToSearch = function(query, access) {
-
-		if(arguments.length === 1 && ((typeof query === "string") || (query instanceof Array))) {
-			access = query;
-			query  = {};
-		}
-
-		if(!query) query = {};
-
-		var oaccount,
-		oaccess,
-		search = {
-			"owners.account": this._id,
-		}
-
-		//do?
-		/*if(!access) {
-			access = "SUPER";
-		}*/
-
-		//TODO - make 
-		if(access) {
-			search["owners.access"] = access;
-		}
-
-		return _.extend(query, search);
-	}
-
-	/**
-	 * returns the main account token
-	 */
-
-	Account.methods.getMainToken = function(callback) {
-		this.model("tokens").getMainToken(this, callback);
-	}
-
-	/**
-	 */
-
-	Account.methods.createToken = function(options, callback) {
-		this.model("tokens").createToken(this, options, callback);
-	}
-
-	/**
-	 */
-
-	Account.statics.signup = function(acc, callback) {
-		var Account = this;
-
-		if(!verify.check(acc).onError(callback).has("email", "password").success) return;
-
-		var on = outcome.error(callback);
-
-		//email must be lower case - it generally is. What if they're signing up on an apple device?
-		acc.email = acc.email.toLowerCase();
-		
-		step(
-			function() {
-				Account.findOne({ email: acc.email }, this);
-			},
-			on.success(function(account) {
-				if(account) return callback(new comerr.AlreadyExists("That account name is already taken."));
-				new Account(acc).save(this);
-			}),
-			on.success(function(account) {
-				callback(null, account);
-				Account.emit("signup", account);
-			})
-		);
-	}
-
-	/**
-	 */
-
-	Account.statics.login = function(credentials, callback) {
-
-		var Token = this.model("tokens");
-
-		if(!callback) callback = function(){};
-		if(credentials.token) {
-			return Token.login(credentials, callback);
-		} else {
-
-			var q = {};
-
-
-			authFields.forEach(function(fieldName) {
-				q[fieldName] = fieldName == "password" ? hashPass(String(credentials.password)) : credentials[fieldName];
-				if(fieldName == "email") q[fieldName] = String(credentials[fieldName]).toLowerCase();
-			});
-
-
-			this.findOne(q, outcome.error(callback).success(function(account) {
-				if(!account) return callback(new comerr.IncorrectInput("Incorrect email / password"));
-				callback(null, account);
-			}));
-		}
-	}
-
-	/**
-	 */
-
-	function hashPass(pass) {
-		return crypto.createHash("sha1").update(pass).digest("hex");
-	}
-
-	/**
-	 */
-
-	function randomPass() {
-		return hashPass(Date.now() + "_" + Math.round(Math.random() * 99999))
-	}
-
-	return database.model("accounts", Account);
-}
-

package/lib/models/lostPassword.js

@@ -1,28 +0,0 @@
-exports.model = function(con) {
-	var Schema = con.base.Schema,
-	ObjectId = Schema.Types.ObjectId;
-
-
-	var LostPasswordSchema = new Schema({
-
-		/**
-		 */
-
-		"createdAt": { type: Date, default: Date.now },
-
-		/**
-		 * 10 minutes
-		 */
-
-		"expiresAt": { type: Date, default: Date.now() + 1000 * 60 * 60 },
-
-		/**
-		 * account this associated with
-		 */
-
-		"account": ObjectId
-	});	
-
-
-	return con.model("lostPassword", LostPasswordSchema);
-}

package/lib/models/token.js

@@ -1,298 +0,0 @@
-
-/**
- * tokens are especially useful when turning on / off features
- * of an account. They're used for items such as bookmarklets, and perhaps
- * public tokens which modifies the user's account. 
- */
-
-var step     = require("step"),
-outcome      = require("outcome"),
-access       = require("../access"),
-_            = require("underscore"),
-dsync        = require("dsync"),
-comerr       = require("comerr");
-
-exports.model = function(database) {
-
-	var Schema = database.base.Schema,
-	ObjectId   = Schema.Types.ObjectId;
-
-	var Scope = new Schema({
-
-		/**
-		 * the specific 
-		 */
-
-		item: ObjectId,
-
-		/**
-		 * col - collection is reserved
-		 */
-
-		collectionName: String,
-
-		/**
-		 * access level, read, write, read+write
-		 */
-
-		access: [String]
-	});
-
-	var Token = new Schema({
-
-		/**
-		 * granter of this token
-		 */
-
-		
-		account: { type: ObjectId, required: true },
-
-		/**
-		 */
-
-		createdAt: { type: Date, default: Date.now },
-
-		/**
-		 * public key used to login. This can be refreshed.
-		 */
-
-		key: { type: String, default: generateKey },
-
-		/**
-		 * when does the token expire?
-		 */
-
-		expiresAt: Date,
-
-		/**
-		 */
-
-		scopes: { type: [ Scope ], select: false },
-
-		/**
-		 * time in seconds to keep token alive for. -1 = forever
-		 */
-
-		ttl: { type: Number, default: -1, select: false },
-
-		/**
-		 */
-
-		main: { type: Boolean, select: false }
-
-	});
-
-	Token.publicKeys = ["account", "createdAt", "expiresAt", "key"];
-	Token.plugin(dsync.schema);
-
-	/**
-	 */
-
-	Token.statics.getMainToken = function(account, callback) {
-
-
-		var self = this, Token = this, on = outcome.error(callback);
-		step(
-
-			/**
-			 */
-			 
-			function() {
-				self.findOne({ account: account._id, main: true }, this);
-			},
-
-			/**
-			 */
-			 
-			on.success(function(token) {
-				var next = this;
-				if(!token) {
-					token = new Token({
-						main: true,
-						account: account._id,
-						scopes:[{
-							collectionName: null, //ALL
-							item: null, //ALL
-							access: access.all(true)
-						}]
-					});
-
-					return token.save(function() {
-						next(null, token);
-					});
-				}
-				account.token = token;
-				next(null, token);
-			}),
-			
-			/**
-			 */
-			 
-			callback
-		);
-	}
-
-	/**
-	 * login with a token
-	 */
-
-	Token.statics.login = function(options, callback) {
-		var token = options.token,
-		Account = this.model("accounts"),
-		Token = this,
-		on = outcome.error(callback);
-
-		var t, a;
-
-		step(
-
-			/**
-			 */
-
-			function() {
-				Token.findOne({ key: token }, this);
-			},
-
-			/**
-			 */
-			 
-			on.success(function(token) {
-
-				//404
-				if(!token) return callback(new comerr.NotFound("token does not exist", { type: "token" }));
-
-				//expired - TODO - add in query: {$or:[{expiresAt:null},{expiresAt:{$lt:new Date()}}]}
-				if(token.expiresAt && token.expiresAt.getTime() < Date.now().getTime()) {
-					token.remove();
-					return callback(new comerr.Expired("token has expired"));
-				}
-
-				//find the user
-				t = token;
-				Account.findOne({ _id: token.account }, this);
-			}),
-
-			/**
-			 */
-			 
-			on.success(function(account) {
-				
-				//this shouldn't happen
-				if(!account) return callback(new comerr.NotFound("account does not exist", { type: "account" }));
-
-				a = account;
-				//attach the token so the account can restrict some access to features
-				account.token = t;
-
-				this(null, account);
-			}),
-
-			/**
-			 */
-			 
-			callback
-		);
-	}
-
-	/**
-	 */
-
-	Token.statics.createToken = function(account, options, callback) {
-
-		if(arguments.length === 2) {
-			callback = options;
-			options  = {};
-		}
-
-		var item, collectionName, acc = options.access || access.all(false);
-
-		if(options.item) {
-			if(options.item._id) {
-				item = options.item._id;
-				collectionName = options.item.collection.name;
-			}
-		}
-
-		var self = this, Token = this, on = outcome.error(callback);
-		step(
-
-			/**
-			 */
-			 
-			function() {
-				token = new Token({
-					account: account._id,
-					ttl: options.ttl || -1,
-					scopes: [{
-						item: item,
-						collectionName: collectionName,
-						access: acc
-					}]
-				});
-				account.token = token;
-				token.save(this);
-			},
-
-			/**
-			 */
-			 
-			callback
-		)
-	}
-
-	/**
-	 */
-
-	Token.methods.authorized = function(item, acc) {
-
-		if(!acc) acc = [access.SUPER];
-
-		var collectionName = item.collection.name,
-		itemId             = String(item._id),
-		acc2               = acc instanceof Array ? acc : [acc];
-
-		return !!_.find(item.scopes, function(scope) {
-
-			//no collection (all), OR the collection matches
-			return (!!scope.collectionName || (scope.collectionName === collectionName)) &&
-
-			//AND no item, OR the item matches the scoped item
-			(!!scope.item || (String(scope.item) === itemId)) &&
-
-			//AND the scope access intersects. This must intersect. 
-			!!_intersection(scope.access, acc2).length;
-		})
-	}
-
-	/** 
-	 * regenerates the key used to login
-	 */
-
-	Token.methods.regenerateKey = function() {
-		this.key = generateKey();
-	}
-
-	/**
-	 * make sure the grantee is set
-	 */
-
-	Token.pre("save", function(next) {
-		if(~this.ttl && !this.expiresAt) {
-			this.expiresAt = Date.now() + this.ttl; 
-		}
-		next();
-	});
-
-	/**
-	 */
-
-	function generateKey() {
-		return Date.now() + "_" + Math.round(Math.random() * 999999999999999);
-	}
-
-	/**
-	 */
-
-	return database.model("tokens", Token);
-}
-

package/models.md

@@ -1,7 +0,0 @@
-```javascript
-
-var Model = require("Model");
-
-
-
-```