add api prefix

Author: basemkhirat

app/kernel.js

@@ -77,11 +77,11 @@ require("./passport");
 
 /* Serving api routes */
 
-require("./routes/api");
+app.use("/" + _config.app.api_prefix, require("./routes/api"));
 
 /* Serving web routes */
 
-require("./routes/web");
+app.use("/", require("./routes/web"));
 
 /* 404 error handler */
 

app/models/User.js

@@ -1,94 +1,93 @@
+var mongoose = require("mongoose");
 var bcrypt = require("bcrypt");
 
-module.exports = function (mongoose) {
-
- var schema = mongoose.Schema({
- username: {
- type: String,
- unique: true
- },
- email: {
- type: String,
- required: true,
- unique: true
- },
- password: {
- type: String,
- required: true
- },
- first_name: {
- type: String,
- required: true
- },
- score: {
- type: Number,
- default: 0
- },
- lang: {
- type: String,
- default: 'en'
- },
- created_at: {
- type: Date,
- default: Date.now
- },
- updated_at: {
- type: Date,
- default: Date.now
- }
-
- }, {
- versionKey: false,
- timestamps: true
+var schema = mongoose.Schema({
+ username: {
+ type: String,
+ unique: true
+ },
+ email: {
+ type: String,
+ required: true,
+ unique: true
+ },
+ password: {
+ type: String,
+ required: true
+ },
+ first_name: {
+ type: String,
+ required: true
+ },
+ score: {
+ type: Number,
+ default: 0
+ },
+ lang: {
+ type: String,
+ default: 'en'
+ },
+ created_at: {
+ type: Date,
+ default: Date.now
+ },
+ updated_at: {
+ type: Date,
+ default: Date.now
  }
- );
 
- schema.pre('save', function (next) {
+ }, {
+ versionKey: false,
+ timestamps: true
+ }
+);
 
- var user = this;
+schema.pre('save', function (next) {
 
-  // generate a salt
+ var user = this;
 
-  if(user.isModified("password") || user.isNew) {
+ // generate a salt
 
-  bcrypt.genSalt(10, function (error, salt) {
+ if (user.isModified("password") || user.isNew) {
 
-  if (error) return next(error);
+ bcrypt.genSalt(10, function (error, salt) {
 
-  // hash the password along with our new salt
+ if (error) return next(error);
 
-  bcrypt.hash(user.password, salt, function (error, hash) {
+ // hash the password along with our new salt
 
- if (error) return next(error);
+ bcrypt.hash(user.password, salt, function (error, hash) {
+
+ if (error) return next(error);
 
-  // override the cleartext password with the hashed one
+ // override the cleartext password with the hashed one
 
-  user.password = hash;
+ user.password = hash;
 
- next(null, user);
- });
+ next(null, user);
  });
+ });
 
- }else{
- next(null, user);
+ } else {
+ next(null, user);
+ }
+});
+
+/**
+ * Compare raw and encrypted password
+ * @param password
+ * @param callback
+ */
+schema.methods.comparePassword = function (password, callback) {
+ bcrypt.compare(password, this.password, function (error, match) {
+ if (error) callback(error);
+ if (match) {
+ callback(null, true);
+ } else {
+ callback(error, false);
  }
  });
+}
 
- /**
- * Compare raw and encrypted password
- * @param password
- * @param callback
- */
- schema.methods.comparePassword = function (password, callback) {
- bcrypt.compare(password, this.password, function (error, match) {
- if (error) callback(error);
- if (match) {
- callback(null, true);
- } else {
- callback(error, false);
- }
- });
- }
+module.exports = mongoose.model("user", schema, "user");
 
- return mongoose.model("user", schema, "user");
-};

app/routes/api.js

@@ -1,7 +1,11 @@
-app.post("/api/token", app.controllers.AuthController.token);
-app.get("/user", app.controllers.UserController.find);
-app.get("/user/:id", app.controllers.UserController.findOne);
-app.post("/user", app.controllers.UserController.create);
-app.put("/user/:id", app.controllers.UserController.update);
-app.delete("/user/:id", app.controllers.UserController.destroy);
+var router = require("express").Router();
 
+router.post("/token", app.controllers.AuthController.token);
+
+router.get("/user", app.controllers.UserController.find);
+router.get("/user/:id", app.controllers.UserController.findOne);
+router.post("/user", app.controllers.UserController.create);
+router.put("/user/:id", app.controllers.UserController.update);
+router.delete("/user/:id", app.controllers.UserController.destroy);
+
+module.exports = router;

app/routes/web.js

@@ -1,15 +1,19 @@
-app.get(
+var router = require("express").Router();
+
+router.get(
  "/",
  HomeController.index
 );
 
-app.get(
+router.get(
  "/logout",
  AuthController.logout
 );
 
-app.get(
+router.get(
  "/profile",
  SessionAuth,
  HomeController.profile
 );
+
+module.exports = router;

config/app.js

@@ -35,6 +35,13 @@ module.exports = {
  * The views directory path
  */
 
- views: require('path').join(__basepath, 'app/views')
+ views: require('path').join(__basepath, 'app/views'),
+
+
+ /**
+ * The api url prefix
+ */
+
+ api_prefix: "api"
 };
 

libs/helpers.js

@@ -2,7 +2,6 @@ var path = require("path");
 var fs = require("fs");
 var walkSync = require("./walkSync");
 var merge = require("./merge");
-var mongoose = require("mongoose");
 
 app.loadConfig = function () {
 
@@ -58,7 +57,7 @@ app.loadModels = function () {
  var models = {};
 
  files.forEach(function (file) {
- models[file] = require(path.join(directory, file))(mongoose);
+ models[file] = require(path.join(directory, file));
  });
 
  if (_config.globals.models) {