garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

first try to login using api key

Browse Source
This commit is contained in:
Athou
2014-08-17 16:56:23 +02:00
parent 247a3d5ab3
commit bcaab694c8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/auth/SecurityCheckProvider.java
View File

@@ -45,12 +45,12 @@ public class SecurityCheckProvider implements InjectableProvider<SecurityCheck,
@Override @Override
public User getValue(HttpContext c) { public User getValue(HttpContext c) {
Optional<User> user = cookieSessionLogin(); Optional<User> user = apiKeyLogin(c);
if (!user.isPresent()) { if (!user.isPresent()) {
user = basicAuthenticationLogin(c); user = basicAuthenticationLogin(c);
} }
if (!user.isPresent()) { if (!user.isPresent()) {
user = apiKeyLogin(c); user = cookieSessionLogin();
} }
if (user.isPresent()) { if (user.isPresent()) {