Merge branch 'master' of github.com:TheCodeCamp/CodeCamp

Author: shivkumar5

codecamp-front/src/app/components/login/login.component.ts

@@ -38,7 +38,6 @@ export class LoginComponent implements OnInit {
       username: this.form.get('username').value, // Username input field
       password: this.form.get('password').value // Password input field
     };
-    console.log(user);
     this.authService.loginUser(user).subscribe(data => {
       this.authService.storeUserData(data.token, data.user, data.isAdmin);
         // After 2 seconds, redirect to dashboard page

codecamp-front/src/app/components/profile/profile.component.html

@@ -3,6 +3,11 @@ <h2 class="page-header">{{user.name}}</h2>
   <ul class="list-group">
     <li class="list-group-item">Username: {{user.username}}</li>
     <li class="list-group-item">Email: {{user.email_id}}</li>
-    <li class="list-group-item">Name: {{user.name}}</li>
+    <li class="list-group-item">Name: {{ user.name }}</li>
+    <li class="list-group-item">College: {{ user.college }}</li>
+    <li class="list-group-item">Date Of Birth: {{ user.dob }}</li>
+    <li class="list-group-item">City: {{ user.city }}</li>
+    <li class="list-group-item">Gender: {{ user.gender }}</li>
+    <li class="list-group-item">JoinedOn: {{ user.joinedOn }}</li>
   </ul>
-</div>
+</div>

codecamp-front/src/app/components/profile/profile.component.ts

@@ -9,13 +9,20 @@ import { Router } from '@angular/router';
 })
 export class ProfileComponent implements OnInit {
 
-  user: Object;
+  user;
   constructor(
     private authService: AuthService,
     private router: Router
-  ) { }
+  ) {
+     this.user = authService.getprofile().subscribe(profile => {
+       this.user = profile.msg;
+        console.log(JSON.stringify(this.user));
+     });
+      console.log(this.user);
+  }
 
   ngOnInit() {
-  }
+
+    }
 
 }

codecamp-front/src/app/services/auth.service.ts

@@ -29,7 +29,8 @@ export class AuthService {
   }
 
   loadToken() {
-    this.authToken = localStorage.getItem('token'); // Get token and asssign to variable to be used elsewhere
+    this.authToken = localStorage.getItem('token');
+    console.log(this.authToken); // Get token and asssign to variable to be used elsewhere
   }
   registerUser(user) {
     return this.http.post(this.domain + '/users/signup', user)
@@ -67,4 +68,8 @@ export class AuthService {
     this.user = null; // Set user to null
     localStorage.clear(); // Clear local storage
   }
+  getprofile() {
+    this.createAuthenticationHeaders();
+    return this.http.get(this.domain + '/users/profile', this.options).map(res => res.json());
+  }
 }

package-lock.json

@@ -1,6 +1,7 @@
 var jwt = require('jsonwebtoken');
 function verifyToken(req, res, next) {
-  var token = req.headers['x-access-token'];
+  
+  var token = req.headers['authorization'];
   if (!token)
     return res.status(403).send({ auth: false, message: 'Login Required ' });
   jwt.verify(token,'secret', function(err, decoded) {