From 3ecee0fa557b7bb9e83b67e289b316f04efa9ce5 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 05 九月 2023 11:59:07 +0800
Subject: [PATCH] Merge branch '滲透' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into 滲透

---
 PAMapp/shared/services/login.service.ts |   91 ++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 76 insertions(+), 15 deletions(-)

diff --git a/PAMapp/shared/services/login.service.ts b/PAMapp/shared/services/login.service.ts
index 9797d52..eb61ccb 100644
--- a/PAMapp/shared/services/login.service.ts
+++ b/PAMapp/shared/services/login.service.ts
@@ -1,31 +1,75 @@
+import { http } from "./httpClient";
+import { AxiosResponse } from 'axios';
+import _ from "lodash";
+import CryptoJS from "crypto-js";
+import forge from "node-forge";
+// import CryptoJS from "asmcrypto-js";
+
 import { ConsultantLoginInfo } from "../models/ConsultantLoginInfo";
 import { LoginRequest } from "../models/loginRequest.model";
 import { LoginSuccessToken } from "../models/loginSuccessToken.model";
 import { LoginVerify } from "../models/loginVerify.model";
 import { OtpInfo } from "../models/otpInfo.model";
 import { RegisterInfo } from "../models/registerInfo";
-import { http } from "./httpClient";
-import { AxiosResponse } from 'axios';
-import _ from "lodash";
 
 class LoginService {
     /** 憿批恥��-��TP **/
-  sendOtp(loginInfo: LoginRequest):Promise<OtpInfo> {
-    return http.post('/otp/sendOtp', loginInfo).then( res => res.data );
-  }
+    async sendOtp(loginInfo: LoginRequest, verifyCode: string): Promise<OtpInfo> {
+      try {
+        const response = await http.post(`/otp/sendOtp/${verifyCode}`, loginInfo);
+        // 撘望�est1: �� if (response)
+        if (response) {
+          return response.data;
+        } else {
+          throw new Error('http.post returned null-like value.');
+        }
+      } catch (error) {
+        console.error('An error occurred while sending OTP:', error);
+        // �隞亙甇方���隤斗����身��
+        throw error;
+      }
+    }
 
-  /** 憿批恥��-撽�TP **/
-  loginVerify(loginVerify: LoginVerify):Promise<LoginSuccessToken>{
-    return http.post('/otp/verify', loginVerify).then(res => res.data);
+
+  /**
+   * 憿批恥��-撽�TP
+   * @param loginVerify ��撽������隞�
+   * @returns ��撽�����oken
+   */
+  async loginVerify(loginVerify: LoginVerify): Promise<LoginSuccessToken> {
+    try {
+      const response = await http.post('/otp/verify', loginVerify);
+      if (response !== null) {
+        return response.data;
+      } else {
+        throw new Error('http.post returned null-like value.');
+      }
+    } catch (error) {
+      // �隞亙甇方���隤斗����身��
+      console.error('An error occurred while verifying OTP:', error);
+      throw error;
+    }
   }
 
   /** 憿批恥閮餃�� **/
-  register(registerInfo: RegisterInfo):Promise<LoginSuccessToken>{
-    return http.post('/otp/register', registerInfo).then(res => res.data);
+  async register(registerInfo: RegisterInfo): Promise<LoginSuccessToken> {
+    try {
+      const response = await http.post('/otp/register', registerInfo);
+      if (response !== null) {
+        return response.data;
+      } else {
+        throw new Error('http.post returned null-like value.');
+      }
+    } catch (error) {
+      console.error('An error occurred while registering:', error);
+      // �隞亙甇方���隤斗����身��
+      throw error;
+    }
   }
 
+
   /** �����Ⅳ���� **/
-  getImgOfVerification():Promise<string>{
+  async getImgOfVerification():Promise<string>{
     return http.get('/login/validate/get_img_code',{ responseType : 'arraybuffer' })
       .then( response => {
         const toBase64 = window.btoa(
@@ -43,9 +87,26 @@
   }
 
   /** 憿批�� **/
-  logInToConsultant(consultantDto:ConsultantLoginInfo):Promise<AxiosResponse<LoginSuccessToken>>{
-    return http.post('/eService/authenticate',consultantDto);
+  logInToConsultant(consultantDto:ConsultantLoginInfo, verificationCode: string):Promise<AxiosResponse<LoginSuccessToken>>{
+
+  const iv = "0123456789abcdef";
+  const key = "PAMKEY1234567890";
+  const cipher = forge.cipher.createCipher('AES-GCM', key);
+  cipher.start({
+    iv:iv
+  });
+  cipher.update(forge.util.createBuffer(forge.util.encodeUtf8(consultantDto.password)));
+  cipher.finish();
+  const encry = cipher.output;
+  var tag = cipher.mode.tag;
+  const encryptedPassword = window.btoa(encry.data+tag.data);
+
+    return http.post(`/eService/authenticate/${verificationCode}`, { ...consultantDto, password: encryptedPassword});
+  }
+
+  async logout(): Promise<void> {
+    return http.post('/logout');
   }
 }
 
-export default new LoginService();
\ No newline at end of file
+export default new LoginService();

--
Gitblit v1.9.3