diff --git a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts index 1f9d2f9c..592166f0 100644 --- a/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts +++ b/projects/ucap-webmessenger-app/src/app/pages/account/components/login.page.component.ts @@ -146,7 +146,7 @@ export class LoginPageComponent implements OnInit, OnDestroy { data: { title: '', html: this.translateService.instant( - 'accounts.errors.loginFail' + 'accounts.errors.loginFailedIdPw' ) } }); diff --git a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts index 81674ec1..a50999ec 100644 --- a/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts +++ b/projects/ucap-webmessenger-app/src/app/resolvers/messenger.resolver.ts @@ -41,7 +41,6 @@ import { LoginResponse } from '@ucap-webmessenger/protocol-authentication'; -import * as AuthenticationStore from '@app/store/account/authentication'; import { NGXLogger } from 'ngx-logger'; import { QueryProtocolService, @@ -52,6 +51,7 @@ import { OptionProtocolService } from '@ucap-webmessenger/protocol-option'; import { TranslateService as UCapTranslateService } from '@ucap-webmessenger/ui'; import * as AppStore from '@app/store'; +import * as AuthenticationStore from '@app/store/account/authentication'; import * as CompanyStore from '@app/store/setting/company'; import * as VersionInfoStore from '@app/store/setting/version-info'; import * as OptionStore from '@app/store/messenger/option'; @@ -72,6 +72,7 @@ import { import { StatusCode } from '@ucap-webmessenger/api'; import { UCAP_NATIVE_SERVICE, NativeService } from '@ucap-webmessenger/native'; import { AppUserInfo, KEY_APP_USER_INFO } from '@app/types/app-user-info.type'; +import { TranslateService } from '@ngx-translate/core'; @Injectable() export class AppMessengerResolver implements Resolve { @@ -89,6 +90,7 @@ export class AppMessengerResolver implements Resolve { private innerProtocolService: InnerProtocolService, private appNativeService: AppNativeService, private snackBarService: SnackBarService, + private translateService: TranslateService, private logger: NGXLogger ) {} @@ -185,6 +187,7 @@ export class AppMessengerResolver implements Resolve { }) .pipe( catchError(err => { + this.logger.error('ServerErrorCode', err); switch (err as ServerErrorCode) { case ServerErrorCode.ERRCD_IDPW: break; @@ -285,6 +288,17 @@ export class AppMessengerResolver implements Resolve { resolve(); }, err => { + this.snackBarService.open( + this.translateService.instant('accounts.errors.loginFailed'), + '', + { + duration: 3000, + verticalPosition: 'bottom', + horizontalPosition: 'center' + } + ); + + this.store.dispatch(AuthenticationStore.loginRedirect()); reject(err); } ); diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/en.json b/projects/ucap-webmessenger-app/src/assets/i18n/en.json index ab0fa729..fd89a055 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/en.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/en.json @@ -43,7 +43,8 @@ "notSatisfiedCombineForPassword": "Combination of two or more kinds of letters, numbers and special characters.", "minLengthCombineForPassword": "Password must be {{lengthOfPassword}} characters if {{countOfCombine}} combination.", "failToChangePassword": "Failed to change password.", - "loginFail": "Username or password do not match.", + "loginFailed": "Failed to login", + "loginFailedIdPw": "Username or password do not match.", "loginFailOverTry": "Password error count exceeded.
Check your password
Please try again later." } }, diff --git a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json index 6d2375c9..7a39ac99 100644 --- a/projects/ucap-webmessenger-app/src/assets/i18n/ko.json +++ b/projects/ucap-webmessenger-app/src/assets/i18n/ko.json @@ -43,7 +43,8 @@ "notSatisfiedCombineForPassword": "문자, 숫자, 특수문자 중 2종류 이상 조합을 해야 합니다", "minLengthCombineForPassword": "비밀번호는 {{countOfCombine}}가지가 조합된 경우 {{lengthOfPassword}}자를 넘어야 합니다", "failToChangePassword": "비밀번호 변경에 실패하였습니다.", - "loginFail": "아이디 또는 패스워드가
일치하지 않습니다.", + "loginFailed": "로그인에 실패하였습니다.", + "loginFailedIdPw": "아이디 또는 패스워드가
일치하지 않습니다.", "loginFailOverTry": "비밀번호 오류 횟수 초과입니다.
비밀번호를 확인하신 후
잠시 후 다시 시작해 주세요." } },