login myhr

src/app/authentication/login/login.component.ts

@@ -113,21 +113,42 @@ export class LoginComponent {
     }
   }
 
+  // login() {
+  //   this.showLoader = true;
+  //   let body: LoginModel = new LoginModel();
+  //   body.username = this.username;
+  //   body.password = this.password;
+  //   this.authService.login(this.loginForm.controls['username'].value, this.loginForm.controls['password'].value).subscribe(result => {
+  //     console.log(result)
+  //     this.tokenService.saveToken(result.accessToken);
+  //     this.tokenService.saveUser(result);
+  //     this.routes.navigate(['/admin/pdpa-manage'])
+  //   }, (error) => {
+  //     this.showLoader = false;
+  //     this.error = 'Username หรือ Password ไม่ถูกต้อง';
+  //   })
+
+  // }
+
   login() {
     this.showLoader = true;
-    let body: LoginModel = new LoginModel();
-    body.username = this.username;
-    body.password = this.password;
-    this.authService.login(this.loginForm.controls['username'].value, this.loginForm.controls['password'].value).subscribe(result => {
-      console.log(result)
-      this.tokenService.saveToken(result.accessToken);
-      this.tokenService.saveUser(result);
-      this.routes.navigate(['/admin/pdpa-manage'])
-    }, (error) => {
-      this.showLoader = false;
-      this.error = 'Username หรือ Password ไม่ถูกต้อง';
-    })
-
+    let loginCredentials: LoginModel = new LoginModel();
+    loginCredentials.username = this.loginForm.controls['username'].value;
+    loginCredentials.password = this.loginForm.controls['password'].value;
+    this.authService.login(loginCredentials).subscribe({
+      next: (response) => {
+        console.log('Login successful', response);
+        // Assuming your API returns a token, store it
+        if (response.accessToken) {
+          this.tokenService.saveToken(response.accessToken);
+        }
+        this.routes.navigate(['/myjob/pdpa-manage']);
+      },
+      error: (error) => {
+        console.error('Login failed', error);
+        // Handle login error, e.g., display an error message to the user
+      }
+    });
   }
 
   // adminCompanyList(memberId: string) {

src/app/shared/services/auth.service.ts

 import { Injectable, NgZone } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { ProfileModel, UserModel } from '../user-auth.model';
+import { LoginModel, ProfileModel, UserModel } from '../user-auth.model';
+import { environment } from '../../../environments/environment';
+import { Observable } from 'rxjs';
 @Injectable({
   providedIn: 'root',
 })
 export class AuthService {
   apiBaseUrl = "/auth/company";
+  private apiUrl = environment.jbossUrl + '/usapi'; //add
   constructor(
     private http: HttpClient,
   ) {
   }
 
-  login(username: string, password: string) {
-    const body = {
-      username: username,
-      password: password,
-    };
-    return this.http.post<UserModel>(this.apiBaseUrl + '/login', body)
+  // login(username: string, password: string) {
+  //   const body = {
+  //     username: username,
+  //     password: password,
+  //   };
+  //   return this.http.post<UserModel>(this.apiBaseUrl + '/login', body)
+  // }
+
+  login(credentials: LoginModel): Observable<UserModel> {
+    credentials.dbName = credentials.dbName || 'DB'; 
+    credentials.dbcomp = credentials.dbcomp || '100'; 
+    credentials.lang = credentials.lang || 'tha'; 
+
+    return this.http.post<UserModel>(`${this.apiUrl}/authen`, credentials);
   }
 
   refreshToken(token: string) {

src/app/shared/user-auth.model.ts

@@ -2,8 +2,13 @@ import { EmployeeModel } from "../DPU/models/employee.model";
 import { UserProfileModel } from "../DPU/models/user.model";
 
 export class LoginModel {
-  public username: string = "";
-  public password: string = "";
+  // public username: string = "";
+  // public password: string = "";
+  username?: string; //add
+  password?: string; //add
+  dbName?: string; //add
+  dbcomp?: string; //add
+  lang?: string; //add
 }
 
 

src/environments/environment.ts

@@ -5,6 +5,7 @@ export const environment = {
   production: false,
   baseUrl: 'https://myjob-uat.myhr.co.th/api',
   url: 'https://portal.myhr.co.th/api/',
+  jbossUrl: 'https://hrplus.myhr.co.th/hr', //add
   portalFixedToken: 'eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJBdXRoIiwidWlkIjoiOGFhNDUzMzAtMzE0Yy0xMWU3LWJhZjMtMmQ3ZDA5ODc3NzQ0Iiwicm9sZSI6InVzZXIiLCJpc3MiOiJDb21wdXRlciBTY2llbmNlIENvcnBvcmF0aW9uIExpbWl0ZWQiLCJmdWxsTmFtZSI6InRlZXJhZGFjaCBrdWhhdGFuYXNhdGllbiIsIm1lbWJlcklkIjoiOGFhNDUzMzAtMzE0Yy0xMWU3LWJhZjMtMmQ3ZDA5ODc3NzQ0In0.FO7u8g7KfzkmZFTuuniBCEQxduPjcvzMbH7iug3DT90',
   firebase: {
     apiKey: "***************************************",