Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Disable reset password for signed in users #2308

Merged
merged 2 commits into from
Jan 30, 2024
Merged

Disable reset password for signed in users #2308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c227d1e
Disable reset password for signed in users
malincrist Oct 12, 2023
ebf4316
code review fix
malincrist Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/users/confirm-password/ko/runtime/confirm-password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</div>

<div class="form-group">
<button type="submit" id="signup" class="button button-primary">
<button type="submit" id="signup" class="button button-primary" data-bind="attr: { disabled: isResetPasswordDisabled() }">
Reset
</button>
</div>
Expand Down
12 changes: 10 additions & 2 deletions src/components/users/confirm-password/ko/runtime/confirm-password.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ export class ConfirmPassword {
public readonly password: ko.Observable<string>;
public readonly passwordConfirmation: ko.Observable<string>;
public readonly isResetConfirmed: ko.Observable<boolean>;
public readonly working: ko.Observable<boolean>;
public readonly isResetPasswordDisabled: ko.Observable<boolean>;

constructor(
private readonly usersService: UsersService,
private readonly eventManager: EventManager) {
this.password = ko.observable();
this.passwordConfirmation = ko.observable();
this.isResetConfirmed = ko.observable(false);
this.working = ko.observable(false);
this.isResetPasswordDisabled = ko.observable(true);

validation.init({
insertMessages: false,
Expand All @@ -49,6 +49,7 @@ export class ConfirmPassword {
this.userId = await this.usersService.getCurrentUserId();

if (this.userId) {
dispatchErrors(this.eventManager, ErrorSources.confirmpassword, ["Cannot reset password for a signed in user."]);
return;
}

Expand All @@ -69,12 +70,19 @@ export class ConfirmPassword {
} catch (error) {
dispatchErrors(this.eventManager, ErrorSources.confirmpassword, ["Activate user error: " + error.message]);
}

this.isResetPasswordDisabled(false);
}

/**
* Sends user resetPswd request to Management API.
*/
public async resetPswd(): Promise<void> {
if (this.token == undefined || this.userId == undefined) {
dispatchErrors(this.eventManager, ErrorSources.confirmpassword, ["Required params not found"]);
return;
}

const result = validation.group({
password: this.password,
passwordConfirmation: this.passwordConfirmation
Expand Down
Loading