Compare commits
No commits in common. "e2ef4f3bdea0037ffcaa23a2b38e439549778282" and "3456c5f021bc03da07cddd105064c7a404c973b8" have entirely different histories.
e2ef4f3bde
...
3456c5f021
@ -465,9 +465,6 @@ class AuthService(AuthServiceABC):
|
|||||||
if db_user.password != user_dto.password:
|
if db_user.password != user_dto.password:
|
||||||
raise ServiceException(ServiceErrorCode.InvalidUser, "Wrong password")
|
raise ServiceException(ServiceErrorCode.InvalidUser, "Wrong password")
|
||||||
|
|
||||||
if db_user.confirmation_id is not None:
|
|
||||||
raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")
|
|
||||||
|
|
||||||
token = self.generate_token(db_user)
|
token = self.generate_token(db_user)
|
||||||
refresh_token = self._create_and_save_refresh_token(db_user)
|
refresh_token = self._create_and_save_refresh_token(db_user)
|
||||||
if db_user.forgot_password_id is not None:
|
if db_user.forgot_password_id is not None:
|
||||||
@ -491,9 +488,6 @@ class AuthService(AuthServiceABC):
|
|||||||
lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x))
|
lambda x: self._auth_users.add_auth_user_user_rel(AuthUserUsersRelation(db_user, x))
|
||||||
)
|
)
|
||||||
|
|
||||||
if db_user.confirmation_id is not None:
|
|
||||||
raise ServiceException(ServiceErrorCode.Forbidden, "E-Mail not verified")
|
|
||||||
|
|
||||||
token = self.generate_token(db_user)
|
token = self.generate_token(db_user)
|
||||||
refresh_token = self._create_and_save_refresh_token(db_user)
|
refresh_token = self._create_and_save_refresh_token(db_user)
|
||||||
if db_user.forgot_password_id is not None:
|
if db_user.forgot_password_id is not None:
|
||||||
|
@ -74,8 +74,6 @@ export class LoginComponent implements OnInit {
|
|||||||
this.spinnerService.hideSpinner();
|
this.spinnerService.hideSpinner();
|
||||||
this.router.navigate(["auth", "login"]).then(() => {
|
this.router.navigate(["auth", "login"]).then(() => {
|
||||||
});
|
});
|
||||||
this.state = "";
|
|
||||||
this.code = "";
|
|
||||||
return throwError(() => err);
|
return throwError(() => err);
|
||||||
})).subscribe(token => {
|
})).subscribe(token => {
|
||||||
this.authService.saveToken(token);
|
this.authService.saveToken(token);
|
||||||
|
Loading…
Reference in New Issue
Block a user