improving routing. injecting user information to client side to prevent false routing

backend/middlewares/AuthenticationMWs.ts

@@ -14,6 +14,7 @@ export class AuthenticationMWs {
      /*   if (typeof req.session.user === 'undefined') {
             return next(new Error(ErrorCodes.NOT_AUTHENTICATED));
         }*/
+        //TODO: uncomment
         return next();
     }
     

backend/middlewares/ExtendedRequest.d.ts

@@ -7,6 +7,10 @@ declare module Express {
         }
     }
     
+    export interface Response{
+        tpl?:any
+    }
+
     export interface Session  {
         user?;
     }

backend/routes/ErrorRouter.ts

@@ -5,15 +5,24 @@ import {RenderingMWs} from "../middlewares/RenderingMWs";
 export class ErrorRouter{
     constructor(private app) {
 
-        this.addError(); 
+        this.addApiErrorHandler();
     }
 
-    private addError() {
+    private addApiErrorHandler() {
         this.app.use("/api/*",
             RenderingMWs.renderError
         );
     };
 
+    private addGenericHandler() {
+        this.app.use((err, req, res, next) =>   {
+            res.status(500).send('Houston, we have a problem!');
+
+            //Flush out the stack to the console
+            console.error(err.stack);
+        });
+        
+    }
 
 
 

backend/routes/PublicRouter.ts

@@ -4,15 +4,34 @@
 import * as _express from 'express';
 import * as _path from 'path';
 
+
+import {Utils} from "../../common/Utils";
+
+import {NextFunction, Request, Response} from "express";
+
 export class PublicRouter{
     constructor(private app){
+        this.app.use((req:Request, res:Response, next:NextFunction) => {
+            res.tpl = {};
+
+            res.tpl.user = null;
+            if(req.session.user) {
+                let user = Utils.clone(req.session.user);
+                delete user.password;
+                res.tpl.user = user;
+            }
+
+            return next();
+        });
+        
         this.app.use(_express.static(_path.resolve(__dirname, './../../frontend')));
         this.app.use('/node_modules',_express.static(_path.resolve(__dirname, './../../node_modules')));
 
-        var renderIndex = (req: _express.Request, res: _express.Response) => {
-            res.sendFile(_path.resolve(__dirname, './../../frontend/index.html'));
+        var renderIndex = (req: Request, res: Response) => {
+            res.render(_path.resolve(__dirname, './../../frontend/index.ejs'),res.tpl);
         };
-        this.app.get(['/login',"/gallery*"], renderIndex);
+        
+        this.app.get(['/','/login',"/gallery*"], renderIndex);
 
 
     }

backend/server.ts

@@ -27,6 +27,8 @@ export class Server {
         this.debug = _debug("PiGallery2:server");
         this.app = _express();
 
+        this.app.set('view engine', 'ejs');
+
         if(process.env.DEBUG) {
             var _morgan = require('morgan');
             this.app.use(_morgan('dev'));
@@ -54,6 +56,8 @@ export class Server {
         
   
 
+
+
         new PublicRouter(this.app);
         
         new UserRouter(this.app);

frontend/app/app.component.ts

@@ -28,6 +28,10 @@ import {GeneratedUrl} from "angular2/src/router/rules/route_paths/route_path";
     ]
 })
 @RouteConfig([
+    {
+        path: '/',
+        redirectTo: ["Login"]
+    },
     {
         path: '/login',
         name: 'Login',
@@ -36,17 +40,13 @@ import {GeneratedUrl} from "angular2/src/router/rules/route_paths/route_path";
     },
     {
         path: '/gallery',
-        name: 'GalleryBase',
-        component: GalleryComponent
+        redirectTo: ["Gallery",{directory:""}]
     }, 
    {
-        regex: 'gallery/([\w]*)',
+        path: '/gallery/:directory',
         name: 'Gallery',
-        serializer: (params): GeneratedUrl => {
-            return new GeneratedUrl(`gallery/${params['directory']}`, {})
-        },
         component: GalleryComponent
-    }
+    },
 ])
 export class AppComponent  implements OnInit{
 
@@ -55,10 +55,11 @@ export class AppComponent  implements OnInit{
     }
 
     ngOnInit() {
-        this._authenticationService.OnAuthenticated.on((user:User) =>
-        {
-         //   this._location.replaceState('/'); // clears browser history so they can't navigate with back button
-            this._router.navigate(["GalleryBase"]);
+        this._authenticationService.OnAuthenticated.on((user:User) => {
+            if (this._router.isRouteActive(this._router.generate(['Login']))) {
+                console.log("routing");
+                this._router.navigate(["Gallery",{directory:""}]);
+            }
         });
 
     }

frontend/app/gallery/directory/directory.gallery.component.html

@@ -1 +1 @@
-<a [routerLink]="['/Gallery',{directory: getDirectoryPath()}]">{{directory.name}}</a>
+<a [routerLink]="['Gallery',{directory: getDirectoryPath()}]">{{directory.name}}</a>

frontend/app/gallery/gallery.component.ts

@@ -35,6 +35,8 @@ export class GalleryComponent implements OnInit{
         }
  
         let directoryName = this._params.get('directory');
+        console.log(this._params);
+        console.log(directoryName);
         directoryName = directoryName ? directoryName : "";
         this._galleryService.getDirectory(directoryName).then(( message:Message<Directory>) => {
             if(message.error){

frontend/app/model/authentication.service.ts

@@ -8,6 +8,10 @@ import {LoginCredential} from "../../../common/entities/LoginCredential";
 import {Message} from "../../../common/entities/Message";
 import { Cookie } from 'ng2-cookies/ng2-cookies';
 
+declare module ServerInject{
+   export var user;
+}
+
 @Injectable()
 export class AuthenticationService{
 
@@ -19,6 +23,10 @@ export class AuthenticationService{
 
         //picking up session..
         if(this.isAuthenticated() == false && Cookie.getCookie('pigallery2-session') != null){
+            if(typeof ServerInject !== "undefined" && typeof ServerInject.user !== "undefined"){
+                console.log("user found");
+                this.setUser(ServerInject.user);
+            }
             this.getSessionUser();   
         }
         
@@ -26,7 +34,6 @@ export class AuthenticationService{
     
     private getSessionUser(){
         this._userService.getSessionUser().then( (message:Message<User>) =>{ 
-            console.log(message);
             if(message.error){
                 console.log(message.error);
             }else{
@@ -38,16 +45,19 @@ export class AuthenticationService{
 
     public login(credential:LoginCredential){
         this._userService.login(credential).then( (message:Message<User>) =>{
-            console.log(message);
             if(message.error){
                 console.log(message.error);
             }else{
-                this._user = message.result;
-                this.OnAuthenticated.trigger(this._user);
+                this.setUser(message.result);
             }
         });
     }
     
+    private setUser(user:User){
+        this._user = user;
+        this.OnAuthenticated.trigger(this._user);
+    }
+
     public isAuthenticated():boolean{
         return (this._user && this._user != null) ? true : false;
     }

frontend/index.ejs

@@ -8,6 +8,9 @@
 <body>
 <pi-gallery2-app>Loading...</pi-gallery2-app>
 </body>
+<script>
+    var ServerInject = {user: <%- JSON.stringify(user)%>}
+</script>
 <script src="https://code.angularjs.org/2.0.0-beta.12/angular2-polyfills.js"></script>
 <script src="dist/app-bundle.js"></script>
 </html>

package.json

@@ -25,6 +25,7 @@
     "body-parser": "^1.15.0",
     "core-js": "^2.2.2",
     "debug": "^2.2.0",
+    "ejs": "^2.4.1",
     "express": "^4.13.4",
     "express-session": "^1.13.0",
     "image-size": "^0.5.0",

test/webpack.test.config.js

@@ -42,9 +42,9 @@ module.exports = {
                 },
                 exclude: [ /\.e2e\.ts$/ ]
             },
-            { test: /\.json$/, loader: 'json-loader', exclude: [ root('frontend/index.html') ] },
-            { test: /\.html$/, loader: 'raw-loader', exclude: [ root('frontend/index.html') ] },
-            { test: /\.css$/,  loader: 'raw-loader', exclude: [ root('frontend/index.html') ] }
+            { test: /\.json$/, loader: 'json-loader', exclude: [ root('frontend/index.ejs') ] },
+            { test: /\.html$/, loader: 'raw-loader', exclude: [ root('frontend/index.ejs') ] },
+            { test: /\.css$/,  loader: 'raw-loader', exclude: [ root('frontend/index.ejs') ] }
         ],
         postLoaders: [
             // instrument only testing sources with Istanbul