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

Merge branch '#70' into #85

Browse Source
This commit is contained in:
Sven Heidemann 2022-10-25 21:24:11 +02:00
commit f7fd15b4bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -349,7 +349,7 @@ class AuthService(AuthServiceABC):
raise ServiceException(ServiceErrorCode.InvalidUser, 'Wrong password')
# update password
if self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt) != user.password:
if update_user_dto.new_auth_user.password is not None and self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt) != user.password:
user.password_salt = uuid.uuid4()
user.password = self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)
@ -396,7 +396,7 @@ class AuthService(AuthServiceABC):
user.email = update_user_dto.new_auth_user.email
# update password
if update_user_dto.change_password and user.password != self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt):
if update_user_dto.new_auth_user.password is not None and update_user_dto.change_password and user.password != self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt):
user.password_salt = uuid.uuid4()
user.password = self._hash_sha256(update_user_dto.new_auth_user.password, user.password_salt)

2
kdb-web/src/app/modules/view/change-password/components/change-password/change-password.component.html
View File

@ -20,7 +20,7 @@
<div class="input-field">
<input type="password" pInputText formControlName="passwordRepeat"
placeholder="{{'view.change-password.repeat_new_password' | translate}}"
[ngClass]="{ 'invalid-feedback-input': submitted && errors.repeatPassword}">
[ngClass]="{ 'invalid-feedback-input': submitted && errors.repeatPassword}" autocomplete="new-password">
<div *ngIf="submitted" class="invalid-feedback">
<div *ngIf="errors.repeatPassword">{{'view.change-password.passwords_do_not_match' | translate}}</div>
</div>