sh-edraft.de/sh_discord_bot
4
1
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects 3 Releases 27 Wiki Activity

1.0.0 #253

Merged
edraft merged 262 commits from 1.0.0 into master 2023-03-27 09:30:50 +02:00
Conversation 0 Commits 262 Files Changed 419 +8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8efd0fc993 - Show all commits

6
kdb-bot/src/bot_api/service/auth_service.py
View File

@ -465,6 +465,9 @@ class AuthService(AuthServiceABC):
if db_user.password != user_dto.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)
refresh_token = self._create_and_save_refresh_token(db_user)
if db_user.forgot_password_id is not None:
@ -488,6 +491,9 @@ class AuthService(AuthServiceABC):
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)
refresh_token = self._create_and_save_refresh_token(db_user)
if db_user.forgot_password_id is not None:

2
kdb-web/src/app/modules/auth/components/login/login.component.ts
View File

@ -74,6 +74,8 @@ export class LoginComponent implements OnInit {
this.spinnerService.hideSpinner();
this.router.navigate(["auth", "login"]).then(() => {
});
this.state = "";
this.code = "";
return throwError(() => err);
})).subscribe(token => {
this.authService.saveToken(token);