Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

recover password (wip)

Browse Source
This commit is contained in:
Athou
2013-05-20 21:53:13 +02:00
parent 17ac0432b2
commit 515cc4c0dd
16 changed files with 409 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -226,12 +226,13 @@ public class FeedREST extends AbstractResourceREST {
FeedInfo info = (FeedInfo) fetchFeed(url).getEntity();
try {
feedSubscriptionService.subscribe(getUser(), info.getUrl(),
req.getTitle(), category);
req.getTitle(), category);
} catch (Exception e) {
log.info("Failed to subscribe to URL {}: {}", url, e.getMessage());
return Response.status(Status.SERVICE_UNAVAILABLE).entity(
"Failed to subscribe to URL " + url + ": " + e.getMessage()
).build();
return Response
.status(Status.SERVICE_UNAVAILABLE)
.entity("Failed to subscribe to URL " + url + ": "
+ e.getMessage()).build();
}
return Response.ok(Status.OK).build();
}

13
src/main/java/com/commafeed/frontend/rest/resources/UserREST.java
View File

@@ -1,14 +1,11 @@
package com.commafeed.frontend.rest.resources;
import java.util.UUID;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang.StringUtils;
import com.commafeed.backend.StartupBean;
@@ -120,10 +117,10 @@ public class UserREST extends AbstractResourceREST {
byte[] password = encryptionService.getEncryptedPassword(
request.getPassword(), user.getSalt());
user.setPassword(password);
user.setApiKey(generateKey(user));
user.setApiKey(userService.generateApiKey(user));
}
if (request.isNewApiKey()) {
user.setApiKey(generateKey(user));
user.setApiKey(userService.generateApiKey(user));
}
userDAO.update(user);
return Response.ok().build();
@@ -140,10 +137,4 @@ public class UserREST extends AbstractResourceREST {
userService.unregister(getUser());
return Response.ok().build();
}
private String generateKey(User user) {
byte[] key = encryptionService.getEncryptedPassword(UUID.randomUUID()
.toString(), user.getSalt());
return DigestUtils.sha1Hex(key);
}
}