From b98c2051e9fc0cd401b43b5527b5a658a8da2587 Mon Sep 17 00:00:00 2001
From: Supichai Pothong <supichai@thamming.com>
Date: Thu, 26 Oct 2023 11:49:48 +0700
Subject: [PATCH] [update]

---
 src/app/@common/base/base-list.component.ts   |  4 ----
 src/app/auth/login/login.component.ts         | 22 +++++++++++++------
 .../core/service/auth/cathay-auth.service.ts  | 22 +++++++++++++++++++
 src/environments/environment.development.ts   |  3 ++-
 src/environments/environment.ts               |  3 ++-
 5 files changed, 41 insertions(+), 13 deletions(-)
 create mode 100644 src/app/core/service/auth/cathay-auth.service.ts

diff --git a/src/app/@common/base/base-list.component.ts b/src/app/@common/base/base-list.component.ts
index 32e3c2a..6565454 100644
--- a/src/app/@common/base/base-list.component.ts
+++ b/src/app/@common/base/base-list.component.ts
@@ -1,13 +1,10 @@
 import {Component, ViewChild} from '@angular/core';
 import {MatPaginator} from '@angular/material/paginator';
 import {MatSort} from '@angular/material/sort';
-
 import generateParamsValue from '../utils/GenerateParamsValue';
-
 import {MatTableDataSource} from '@angular/material/table';
 import {IListPageDefault, IListResponse} from "../interface/ListResponse";
 import {CDialogConfig, IDialogConfig} from "../interface/Dialog";
-import { STORAGE } from "../../@config/app";
 
 @Component({template: ''})
 export abstract class BaseListComponent {
@@ -22,7 +19,6 @@ export abstract class BaseListComponent {
   totalItem: any = 0;
   totalOfElement: number = 10;
   isTab: string = '';
-  storage: any = STORAGE;
 
 
   dialogConfig: IDialogConfig = CDialogConfig;
diff --git a/src/app/auth/login/login.component.ts b/src/app/auth/login/login.component.ts
index d33815c..765b9e5 100644
--- a/src/app/auth/login/login.component.ts
+++ b/src/app/auth/login/login.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Router } from '@angular/router';
 import { AppService } from '../../app.service';
 import { environment } from "../../../environments/environment";
 import { AuthService } from 'src/app/core/service/auth/auth.service';
-import { catchError, lastValueFrom, tap, throwError } from 'rxjs';
+import { lastValueFrom } from 'rxjs';
 import { EAction, EText } from 'src/app/@config/app';
+import { CathayAuthService } from 'src/app/core/service/auth/cathay-auth.service';
 
 
 @Component({
@@ -13,15 +14,19 @@ import { EAction, EText } from 'src/app/@config/app';
     styles: []
 })
 export class LoginComponent implements OnInit {
-    //   apiUrl: string = API.login;
     dataForm: any = {};
+    cathayForm: any = {
+        mobileDeviceId : "1234",
+        userName: 'admin',
+        password: 'P@ssword1'
+    };
     isLoading = false;
 
     constructor(
         private router: Router,
         private appService: AppService,
-        private route: ActivatedRoute,
-        private authService: AuthService
+        private authService: AuthService,
+        private cathayAuthService: CathayAuthService
     ) {
     }
 
@@ -38,8 +43,11 @@ export class LoginComponent implements OnInit {
     async onSubmit(form: any) {
         if (!form.valid) return false;
         try {
-            const result = await lastValueFrom(this.authService.login(this.dataForm));
-            this.appService.setAuth(result);
+            // const result = await lastValueFrom(this.authService.login(this.dataForm));
+            const cathayResult = await lastValueFrom(this.cathayAuthService.login(this.cathayForm))
+            // this.cathayAuthService.login(this.cathayForm).subscribe(res => console.log(res))
+            console.log(cathayResult)
+            this.appService.setAuth(cathayResult);
             return this.router.navigate(['/pages']);
         } catch (err) {
             return this.appService.message(EAction.ERROR, EText.NO_DATA);
diff --git a/src/app/core/service/auth/cathay-auth.service.ts b/src/app/core/service/auth/cathay-auth.service.ts
new file mode 100644
index 0000000..8789032
--- /dev/null
+++ b/src/app/core/service/auth/cathay-auth.service.ts
@@ -0,0 +1,22 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { BaseService } from 'src/app/core/base/base-service';
+import { environment } from 'src/environments/environment';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CathayAuthService extends BaseService{
+    API_URL = environment.CATHAYAPIURL
+    constructor(
+        public http: HttpClient
+    ) {
+        super('', http)
+        super.fullUrl = `${this.API_URL}/v1/User`
+    }
+
+    login(payload : {'mobileDeviceId': string , 'userName': string , 'password' : string}){
+        return this.http.post(`${this.fullUrl}/login`, payload)
+    }
+
+}
diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts
index d50f7be..115afa9 100644
--- a/src/environments/environment.development.ts
+++ b/src/environments/environment.development.ts
@@ -1,5 +1,6 @@
 export const environment = {
     production: false,
     hideForm: false,
-    APIURL: 'https://cathaypay.71dev.com/cathaypay-api'
+    APIURL: 'https://cathaypay.71dev.com/cathaypay-api',
+    CATHAYAPIURL: 'https://sathorn.cathay-pay.com/api'
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index d50f7be..115afa9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -1,5 +1,6 @@
 export const environment = {
     production: false,
     hideForm: false,
-    APIURL: 'https://cathaypay.71dev.com/cathaypay-api'
+    APIURL: 'https://cathaypay.71dev.com/cathaypay-api',
+    CATHAYAPIURL: 'https://sathorn.cathay-pay.com/api'
 };