bug of login error is fixed

This commit is contained in:
richard-loafle 2020-02-06 14:16:36 +09:00
parent 773fa46c48
commit 95a22f0861
4 changed files with 20 additions and 4 deletions

View File

@ -146,7 +146,7 @@ export class LoginPageComponent implements OnInit, OnDestroy {
data: {
title: '',
html: this.translateService.instant(
'accounts.errors.loginFail'
'accounts.errors.loginFailedIdPw'
)
}
});

View File

@ -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<void> {
@ -89,6 +90,7 @@ export class AppMessengerResolver implements Resolve<void> {
private innerProtocolService: InnerProtocolService,
private appNativeService: AppNativeService,
private snackBarService: SnackBarService,
private translateService: TranslateService,
private logger: NGXLogger
) {}
@ -185,6 +187,7 @@ export class AppMessengerResolver implements Resolve<void> {
})
.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<void> {
resolve();
},
err => {
this.snackBarService.open(
this.translateService.instant('accounts.errors.loginFailed'),
'',
{
duration: 3000,
verticalPosition: 'bottom',
horizontalPosition: 'center'
}
);
this.store.dispatch(AuthenticationStore.loginRedirect());
reject(err);
}
);

View File

@ -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. <br/> Check your password <br/> Please try again later."
}
},

View File

@ -43,7 +43,8 @@
"notSatisfiedCombineForPassword": "문자, 숫자, 특수문자 중 2종류 이상 조합을 해야 합니다",
"minLengthCombineForPassword": "비밀번호는 {{countOfCombine}}가지가 조합된 경우 {{lengthOfPassword}}자를 넘어야 합니다",
"failToChangePassword": "비밀번호 변경에 실패하였습니다.",
"loginFail": "아이디 또는 패스워드가<br/>일치하지 않습니다.",
"loginFailed": "로그인에 실패하였습니다.",
"loginFailedIdPw": "아이디 또는 패스워드가<br/>일치하지 않습니다.",
"loginFailOverTry": "비밀번호 오류 횟수 초과입니다.<br/>비밀번호를 확인하신 후<br/>잠시 후 다시 시작해 주세요."
}
},