From 01edfc155a0dcf9d84a78139be6b86b76232f2b4 Mon Sep 17 00:00:00 2001 From: Tomas <tomasysh@gmail.com> Date: 星期六, 05 八月 2023 17:52:23 +0800 Subject: [PATCH] Fixed: [弱掃] p14.2 Bad use of null-like value --- PAMapp/shared/services/login.service.ts | 43 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 35 insertions(+), 8 deletions(-) diff --git a/PAMapp/shared/services/login.service.ts b/PAMapp/shared/services/login.service.ts index 26bf0f2..500ae8e 100644 --- a/PAMapp/shared/services/login.service.ts +++ b/PAMapp/shared/services/login.service.ts @@ -11,13 +11,40 @@ class LoginService { /** 憿批恥��-��TP **/ - async 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); + if (response !== null) { + 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 **/ - async 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; + } } /** 憿批恥閮餃�� **/ @@ -44,8 +71,8 @@ } /** 憿批�� **/ - logInToConsultant(consultantDto:ConsultantLoginInfo):Promise<AxiosResponse<LoginSuccessToken>>{ - return http.post('/eService/authenticate',consultantDto); + logInToConsultant(consultantDto:ConsultantLoginInfo, verificationCode: string):Promise<AxiosResponse<LoginSuccessToken>>{ + return http.post(`/eService/authenticate/${verificationCode}`,consultantDto); } } -- Gitblit v1.8.0