Skip to content

Merge spencer/eng-1807/change-password-phone #95

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

Merged
merged 2 commits into from
May 8, 2025
Merged

Merge spencer/eng-1807/change-password-phone #95

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
5c5ca4b
forgot password via sms
spwitt May 2, 2025
9c39e0c
domain changes
spwitt May 2, 2025
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
6 changes: 5 additions & 1 deletion src/main/java/io/fusionauth/domain/TenantPhoneConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
* @author Brady Wied
*/
public class TenantPhoneConfiguration implements Buildable<TenantPhoneConfiguration> {
public UUID forgotPasswordTemplateId;

public UUID messengerId;

public UUID passwordlessTemplateId;
Expand All @@ -46,6 +48,7 @@ public TenantPhoneConfiguration() {

public TenantPhoneConfiguration(TenantPhoneConfiguration other) {
messengerId = other.messengerId;
forgotPasswordTemplateId = other.forgotPasswordTemplateId;
passwordlessTemplateId = other.passwordlessTemplateId;
unverified = new PhoneUnverifiedOptions(other.unverified);
verificationCompleteTemplateId = other.verificationCompleteTemplateId;
Expand All @@ -64,6 +67,7 @@ public boolean equals(Object o) {
}
TenantPhoneConfiguration that = (TenantPhoneConfiguration) o;
return Objects.equals(messengerId, that.messengerId) &&
Objects.equals(forgotPasswordTemplateId, that.forgotPasswordTemplateId) &&
Objects.equals(passwordlessTemplateId, that.passwordlessTemplateId) &&
Objects.equals(unverified, that.unverified) &&
Objects.equals(verificationCompleteTemplateId, that.verificationCompleteTemplateId) &&
Expand All @@ -74,6 +78,6 @@ public boolean equals(Object o) {

@Override
public int hashCode() {
return Objects.hash(messengerId, passwordlessTemplateId, unverified, verificationCompleteTemplateId, verificationStrategy, verificationTemplateId, verifyPhoneNumber);
return Objects.hash(messengerId, forgotPasswordTemplateId, unverified, verificationCompleteTemplateId, verificationStrategy, verificationTemplateId, verifyPhoneNumber);
}
}
5 changes: 4 additions & 1 deletion src/main/java/io/fusionauth/domain/api/user/ChangePasswordRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, FusionAuth, All Rights Reserved
* Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,6 +15,7 @@
*/
package io.fusionauth.domain.api.user;

import java.util.List;
import java.util.UUID;

import com.inversoft.json.JacksonConstructor;
Expand All @@ -35,6 +36,8 @@ public class ChangePasswordRequest extends BaseEventRequest implements Buildable

public String loginId;

public List<String> loginIdTypes;

public String password;

public String refreshToken;
Expand Down
12 changes: 9 additions & 3 deletions src/main/java/io/fusionauth/domain/api/user/ForgotPasswordRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019, FusionAuth, All Rights Reserved
* Copyright (c) 2018-2025, FusionAuth, All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -15,6 +15,7 @@
*/
package io.fusionauth.domain.api.user;

import java.util.List;
import java.util.Map;
import java.util.UUID;

Expand All @@ -35,8 +36,13 @@ public class ForgotPasswordRequest extends BaseEventRequest {

public String loginId;

public List<String> loginIdTypes;

@Deprecated
public boolean sendForgotPasswordEmail = true;

public Boolean sendForgotPasswordMessage;

public Map<String, Object> state;

@JacksonConstructor
Expand All @@ -57,9 +63,9 @@ public ForgotPasswordRequest(UUID applicationId, String loginId) {
this.loginId = loginId;
}

public ForgotPasswordRequest(String loginId, boolean sendForgotPasswordEmail) {
public ForgotPasswordRequest(String loginId, boolean sendForgotPasswordMessage) {
this.loginId = loginId;
this.sendForgotPasswordEmail = sendForgotPasswordEmail;
this.sendForgotPasswordMessage = sendForgotPasswordMessage;
}

public ForgotPasswordRequest(EventInfo eventInfo, UUID applicationId, String loginId) {
Expand Down