Skip to content

비밀번호 변경 요청값 수정 #91

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
eun6 merged 1 commit into from
Nov 21, 2022
Merged

비밀번호 변경 요청값 수정 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ...ication/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void onClick(View view) {
joinUserState.setPassword(passwordEditText.getText().toString());
joinUserState.setRePassword(passwordEditTextCheck.getText().toString());
if (joinUserState.isValidData() && isEmailValidated) {
changePw(new PasswordChangeRequest(joinUserState.getPassword()));
changePw(new PasswordChangeRequest(joinUserState.getEmail(), joinUserState.getPassword()));
} else {
Toast.makeText(getApplicationContext(), "다시 입력해주세요", Toast.LENGTH_LONG).show();
}
Expand Down Expand Up @@ -188,9 +188,13 @@ public void onResponse(Call<JoinResponse> call, Response<JoinResponse> response)
AlertDialog.Builder builder = new AlertDialog.Builder(PasswordChangeActivity.this);
Intent intent = new Intent(getApplicationContext(), LoginActivity.class);
startActivity(intent);
} else if(response.code() == 400) {
Log.d("패스워드변경", String.valueOf(response.code()));
String faileResult = "존재하지 않은 아이디 입니다. 다시 시도해주세요.";
Toast.makeText(PasswordChangeActivity.this, faileResult, Toast.LENGTH_SHORT).show();
} else {
Log.d("패스워드변경", String.valueOf(response.code()));
String faileResult = "비밀번호 변경에 실패하였습니다. 다시 시도해주세요.";
String faileResult = "패스워드 변경 실패했습니다. 다시 시도해주세요.";
Toast.makeText(PasswordChangeActivity.this, faileResult, Toast.LENGTH_SHORT).show();
}
}
Expand Down
7 changes: 5 additions & 2 deletions application/app/src/main/java/com/mnchatbot/myapplication/ui/join/PasswordChangeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@

//비밀번호 변경 요청
public class PasswordChangeRequest {
@SerializedName("memberEmail")
public String inputID;

@SerializedName("memberNewPassword")
public String inputPw;

public PasswordChangeRequest(String inputPw) {
this.inputPw = inputPw;
public PasswordChangeRequest(String inputID, String inputPw) {
this.inputID = inputID; this.inputPw = inputPw;
}
}