diff --git a/backend/middlewares/UserMWs.ts b/backend/middlewares/UserMWs.ts index 757b9283..5be0a81b 100644 --- a/backend/middlewares/UserMWs.ts +++ b/backend/middlewares/UserMWs.ts @@ -33,7 +33,6 @@ export class UserMWs { return next(new Error(ErrorCodes.USER_CREATION_ERROR)); } - return next(); }); diff --git a/backend/model/UserManager.ts b/backend/model/UserManager.ts index 0ef077bd..55ab59fd 100644 --- a/backend/model/UserManager.ts +++ b/backend/model/UserManager.ts @@ -12,6 +12,7 @@ export class UserManager { } public static createUser(user,cb:(error: any,result:User) => void){ + UserManager.users.push(user); return cb(null, user); } diff --git a/backend/routes/UserRouter.ts b/backend/routes/UserRouter.ts index 50daae41..7f52035a 100644 --- a/backend/routes/UserRouter.ts +++ b/backend/routes/UserRouter.ts @@ -4,7 +4,7 @@ import {UserMWs} from "../middlewares/UserMWs"; import {UserRoles} from "../../common/entities/User"; import {AuthenticationMWs} from "../middlewares/AuthenticationMWs"; import {UserRequestConstrainsMWs} from "../middlewares/UserRequestConstrainsMWs"; -import {RenderingMWs} from "../middlewares/RenderingMWs"; +import {RenderingMWs} from "../middlewares/RenderingMWs"; export class UserRouter{ constructor(private app){ diff --git a/backend/server.ts b/backend/server.ts index cf3afb8c..baa16453 100644 --- a/backend/server.ts +++ b/backend/server.ts @@ -52,19 +52,7 @@ export class Server { // for parsing application/json this.app.use(_bodyParser.json()); - this.app.use("/testDir/:img(*\.(jpg|bmp))",(req,res,next)=>{ - console.log(req.params); - res.send(req.params); - }); - this.app.use("/testDir/:dir(*)",(req,res,next)=>{ - console.log(req.params); - res.send(req.params); - }); - this.app.use("/testDir/*",(req,res,next)=>{ - console.log(req.params); - res.send(req.params); - }); new PublicRouter(this.app); diff --git a/package.json b/package.json index 2ef4bf62..e84e0ec4 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ "url": "https://github.com/bpatrik/PiGallery2/issues" }, "dependencies": { - "angular2": "^2.0.0-beta.12", + "angular2": "^2.0.0-beta.14", "body-parser": "^1.15.0", - "core-js": "^2.2.1", + "core-js": "^2.2.2", "debug": "^2.2.0", "express": "^4.13.4", "express-session": "^1.13.0", @@ -37,7 +37,7 @@ "typescript": "^1.8.9", "typings": "^0.7.9", "webpack": "^1.12.14", - "zone.js": "0.6.6" + "zone.js": "^0.6.10" }, "devDependencies": { "compression-webpack-plugin": "^0.3.0", diff --git a/typings.json b/typings.json index d7af9a50..51422574 100644 --- a/typings.json +++ b/typings.json @@ -5,7 +5,7 @@ "body-parser": "registry:dt/body-parser#0.0.0+20160317120654", "debug": "github:DefinitelyTyped/DefinitelyTyped/debug/debug.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", "express": "github:DefinitelyTyped/DefinitelyTyped/express/express.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", - "express-session": "registry:dt/express-session#0.0.0+20160317120654", + "express-session": "registry:dt/express-session#0.0.0+20160331200931", "jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d22516f9f089de107d7e7d5938566377370631f6", "mime": "github:DefinitelyTyped/DefinitelyTyped/mime/mime.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e", "node": "github:DefinitelyTyped/DefinitelyTyped/node/node.d.ts#0d622d857f97d44ea7dcad2b3edec1f23c48fe9e",