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.

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

add route for changing the password #342

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions src/main/java/me/kavin/piped/ServerLauncher.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import io.activej.launchers.http.MultithreadedHttpServerLauncher;
import me.kavin.piped.consts.Constants;
import me.kavin.piped.utils.*;
import me.kavin.piped.utils.resp.ChangePasswordRequest;
import me.kavin.piped.utils.resp.DeleteUserRequest;
import me.kavin.piped.utils.resp.ErrorResponse;
import me.kavin.piped.utils.resp.LoginRequest;
Expand Down Expand Up @@ -369,6 +370,17 @@ AsyncServlet mainServlet(Executor executor) {
} catch (Exception e) {
return getErrorResponse(e, request.getPath());
}
})).map(POST, "/user/password", AsyncServlet.ofBlocking(executor, request -> {
try {
ChangePasswordRequest body = Constants.mapper.readValue(request.loadBody().getResult().asArray(),
ChangePasswordRequest.class);
return getJsonResponse(
ResponseHelper.changePasswordResponse(
request.getHeader(AUTHORIZATION), body.oldPassword, body.newPassword),
"private");
} catch (Exception e) {
return getErrorResponse(e, request.getPath());
}
})).map(POST, "/logout", AsyncServlet.ofBlocking(executor, request -> {
try {
return getJsonResponse(ResponseHelper.logoutResponse(request.getHeader(AUTHORIZATION)), "private");
Expand Down
29 changes: 29 additions & 0 deletions src/main/java/me/kavin/piped/utils/ResponseHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,35 @@ public static byte[] deleteUserResponse(String session, String pass) throws IOEx
}
}

public static byte[] changePasswordResponse(String session, String oldPass, String newPass) throws IOException {

if (StringUtils.isBlank(oldPass) || StringUtils.isBlank(newPass))
return mapper.writeValueAsBytes(new InvalidRequestResponse());

try (Session s = DatabaseSessionFactory.createSession()) {
User user = DatabaseHelper.getUserFromSession(session);

if (user == null)
return mapper.writeValueAsBytes(new AuthenticationFailureResponse());

String hash = user.getPassword();

if (!hashMatch(hash, oldPass))
return mapper.writeValueAsBytes(new IncorrectCredentialsResponse());

try {
var tr = s.beginTransaction();
user.setPassword(newPass);
s.merge(user);
tr.commit();
} catch (Exception e) {
return mapper.writeValueAsBytes(new ErrorResponse(ExceptionUtils.getStackTrace(e), e.getMessage()));
}

return mapper.writeValueAsBytes(new ChangePasswordResponse(user.getUsername()));
}
}

public static byte[] subscribeResponse(String session, String channelId)
throws IOException {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package me.kavin.piped.utils.resp;

public class ChangePasswordRequest {

public String oldPassword;
public String newPassword;

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package me.kavin.piped.utils.resp;

public class ChangePasswordResponse {

public String username;

public ChangePasswordResponse(String username) {
this.username = username;
}
}