adding files

JavaInUse · JavaInUse · commit c3778778d86b · 2019-03-27T21:09:15.000+05:30
diff --git a/src/app/login/login.component.ts b/src/app/login/login.component.ts
@@ -20,12 +20,18 @@ export class LoginComponent implements OnInit {
   }
 
   checkLogin() {
-    if (this.loginservice.authenticate(this.username, this.password)
-    ) {
-      this.router.navigate([''])
-      this.invalidLogin = false
-    } else
-      this.invalidLogin = true
+    (this.loginservice.authenticate(this.username, this.password).subscribe(
+      data => {
+        this.router.navigate([''])
+        this.invalidLogin = false
+      },
+      error => {
+        this.invalidLogin = true
+
+      }
+    )
+    );
+
   }
 
 }
diff --git a/src/app/service/authentication.service.ts b/src/app/service/authentication.service.ts
@@ -1,20 +1,37 @@
 import { Injectable } from '@angular/core';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+import { map } from 'rxjs/operators';
+
+export class User{
+  constructor(
+    public status:string,
+     ) {}
+  
+}
 
 @Injectable({
   providedIn: 'root'
 })
 export class AuthenticationService {
 
-  constructor() { }
+  constructor(
+    private httpClient:HttpClient
+  ) { 
+     }
 
-  authenticate(username, password) {
-    if (username === "javainuse" && password === "password") {
-      sessionStorage.setItem('username', username)
-      return true;
-    } else {
-      return false;
+     authenticate(username, password) {
+      const headers = new HttpHeaders({ Authorization: 'Basic ' + btoa(username + ':' + password) });
+      return this.httpClient.get<User>('http://localhost:8080/employees/validateLogin',{headers}).pipe(
+       map(
+         userData => {
+          sessionStorage.setItem('username',username);
+          return userData;
+         }
+       )
+  
+      );
     }
-  }
+  
 
   isUserLoggedIn() {
     let user = sessionStorage.getItem('username')
diff --git a/src/app/service/httpclient.service.ts b/src/app/service/httpclient.service.ts
@@ -24,31 +24,27 @@ export class HttpClientService {
 
      getEmployees()
   {
-    let basicString=this.getHeaders();
-
-    let headers=new HttpHeaders(
-      {Authorization:basicString}
-    );
-    console.log("test call");
-    return this.httpClient.get<Employee[]>('http://localhost:8080/employees',{headers});
+    let username='javainuse'
+    let password='password'
+  
+    const headers = new HttpHeaders({ Authorization: 'Basic ' + btoa(username + ':' + password) });
+    
+       return this.httpClient.get<Employee[]>('http://localhost:8080/employees',{headers});
   }
 
   public deleteEmployee(employee) {
-    return this.httpClient.delete<Employee>("http://localhost:8080/employees" + "/"+ employee.empId);
+    let username='javainuse'
+    let password='password'
+  
+    const headers = new HttpHeaders({ Authorization: 'Basic ' + btoa(username + ':' + password) });
+    return this.httpClient.delete<Employee>("http://localhost:8080/employees" + "/"+ employee.empId,{headers});
   }
 
   public createEmployee(employee) {
-    return this.httpClient.post<Employee>("http://localhost:8080/employees", employee);
+    let username='javainuse'
+    let password='password'
+  
+    const headers = new HttpHeaders({ Authorization: 'Basic ' + btoa(username + ':' + password) });
+    return this.httpClient.post<Employee>("http://localhost:8080/employees", employee,{headers});
   }
-
-
-
-getHeaders(){
-  let username='admin'
-  let password='password'
-
-  let  basicString='Basic '+window.btoa(username + ':' + password)
-  return basicString;
-}
-
 }
