user auth module

Author: deep9c

src/App.vue

@@ -29,7 +29,10 @@
 
     methods: {
       logout() {
-        api.logout(this,'/login');
+        api.logout()
+          .then((response)=>{
+            this.$router.push('/login');
+          });
       }
     }
   }

src/components/Dashboard.vue

@@ -12,6 +12,7 @@
 
 import TodoList from './TodoList'
 import CreateTodo from './CreateTodo'
+import api from '../utils/api'
 
 export default {
   name: 'Dashboard',
@@ -47,7 +48,7 @@ export default {
     };
   },
   beforeMount(){
-    //this.username = api.user.username;
+    this.username = api.user.username;
 
     
   },

src/components/Login.vue

@@ -60,11 +60,15 @@ export default {
         var credentials = {
           username: this.credentials.username,
           password: this.credentials.password
-        }
-        // We need to pass the component's this context
-        // to properly make use of http in the auth service
+        }      
 
-        api.login(this, credentials, '/dashboard');  
+        api.login(credentials)
+          .then((resp)=>{
+            this.$router.push('/dashboard');   //redirect to dashboard
+          })
+          .catch((error)=>{
+            this.error = error.response.data;
+          });  
         }      
       }
   },

src/components/Register.vue

@@ -1,5 +1,8 @@
 <template>
 <form id="register-form" role="form" style="display: none;">
+                  <div class="alert alert-danger" v-if="error">
+    				<p>{{ error }}</p>
+  				  </div>
                   <div class="form-group">
                     <input type="text"required name="username" id="username" tabindex="1" class="form-control" placeholder="Username" value="" v-model="user.username">
                   </div>
@@ -38,7 +41,8 @@
 					name: '',					
 					email: '',
 					password: '',					
-				}
+				},
+				error: ''
 			}
 		},
 
@@ -57,14 +61,24 @@
 					e.preventDefault();	
 					api.register(this,this.user,'/dashboard')
 						.then((response)=>{
-							var credentials = { 
-												credentials : {
-													username: this.user.username,
-													password: this.user.password
-												}
+							console.log('register response-> '+ JSON.stringify(response));
+							var credentials = { 												
+												username: this.user.username,
+												password: this.user.password												
 											};
+							console.log('register credentials:: ' + JSON.stringify(credentials));
 
-							api.login(this,credentials,'/dashboard');
+							//api.login(this,credentials,'/dashboard');
+							api.login(credentials)
+          						.then((resp)=>{
+            						this.$router.push('/dashboard');   //redirect to dashboard
+          						})
+          						.catch((error)=>{
+            						this.error = error.response.data;
+          						});  
+						})
+						.catch((error)=>{
+							this.error = error.response.data;
 						});
 				}
 				

src/utils/api.js

@@ -11,21 +11,16 @@ export default {
     	username:''
 	},
 
-	login(context, creds, redirect) {
-		axios.post(nodeurl + '/auth/login', creds)	//{ username: credentials.username, password: credentials.password }
+	login(creds) {
+		return axios.post(nodeurl + '/auth/login', creds)	//{ username: credentials.username, password: credentials.password }
           .then((response)=>{
             console.log('loggedin response '+ JSON.stringify(response));            
             //login success
             this.user.authenticated = true;
             this.user.username = response.data.user.username;
-            context.$router.push(redirect);		//redirect to dashboard
+            //return response;
+            //context.$router.push(redirect);		//redirect to dashboard
 
-          })
-          .catch((error)=>{
-            console.log('loggedin error response '+ JSON.stringify(error));  
-            if(error.response.status === 401){  //login failed
-              context.error = 'Login Failed!';
-            }
           });
   	},
 
@@ -34,7 +29,7 @@ export default {
   			.then((response)=>{
   				if(response.data.user){	//already loggedin
   					this.user.authenticated = true;
-  					this.user.username = response.data.user.username;
+  					this.user.username = response.data.user._id;
   				}
   				else{
   					this.user.authenticated = false;
@@ -44,13 +39,14 @@ export default {
 
   	},
 
-  	logout(context,redirect){
-  		axios.get(nodeurl + '/auth/logout')
+  	logout(){
+  		return axios.get(nodeurl + '/auth/logout')
   			.then(function(response){
   				//if(response.data.message='loggedout'){
             console.log(response);
   					this.user.authenticated = false;
-  					context.$router.push(redirect);
+  					//return response;
+            //context.$router.push(redirect);
   				//}  				
   			}.bind(this));
   	},
@@ -85,7 +81,7 @@ export default {
   	},
 
     register(context, userdetails, redirect){
-      return axios.post(nodeurl + 'auth/register', userdetails);       
+      return axios.post(nodeurl + '/auth/register', userdetails);       
     },
 
 }