Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

#475 - Rest Authentication #579

Merged
DayS merged 17 commits into from
Jul 12, 2013
Merged

#475 - Rest Authentication #579

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d23a232
Add new annotations
dhleong May 4, 2013
8122abf
Init some internal structures, add an annotation to tests
dhleong May 4, 2013
37ea732
Allow full urls in @Post, etc. to be specified and handled correctly
dhleong May 4, 2013
63d51ee
Give entity a var so we can pull cookies from it if needed
dhleong May 4, 2013
dd1397b
Implement SetsCookie, only using an Entity instance if needed
dhleong May 5, 2013
c377bb5
Implement RequiresCookieInUrl, and prepare for a few others
dhleong May 5, 2013
d73107e
Implement RequiresCookie and RequiresHeader
dhleong May 5, 2013
0cab243
Implement RequiresAuthorization
dhleong May 5, 2013
aae71df
Implement setters and getters for cookies and headers and validate them
dhleong May 5, 2013
aac6b43
Implement setAuthentication with validation
dhleong May 5, 2013
0afc92d
Implement setHttpBasicAuth method
dhleong May 5, 2013
0d2dabd
Fix some validation; ensure HttpHeaders for auth
dhleong May 5, 2013
b768498
Properly handle returned cookie values (extract only ACTUAL value)
dhleong May 5, 2013
a0986a2
Add license headers
dhleong May 5, 2013
8c517c1
Add some functional tests for new authenticated rest stuff
dhleong May 26, 2013
7bbac6c
Merge branch 'develop' of github.com:excilys/androidannotations into …
dhleong Jun 9, 2013
01dc8c8
Merge branch 'develop' into 475_Rest_Authentication
dhleong Jun 9, 2013
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
Prev Previous commit
Next Next commit
Implement RequiresAuthorization
  • Loading branch information
@dhleong
dhleong committed May 5, 2013
commit 0cab24349c617146a84b2bc905584f614f65b383
16 changes: 16 additions & 0 deletions ...roidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import javax.lang.model.element.VariableElement;

import org.androidannotations.annotations.rest.Accept;
import org.androidannotations.annotations.rest.RequiresAuthentication;
import org.androidannotations.annotations.rest.RequiresCookie;
import org.androidannotations.annotations.rest.RequiresCookieInUrl;
import org.androidannotations.annotations.rest.RequiresHeader;
Expand Down Expand Up @@ -342,6 +343,13 @@ protected JVar generateHttpHeadersVar(MethodProcessorHolder methodHolder, EBeanH

}

boolean requiresAuth = requiresAuth(executableElement);
if (requiresAuth) {
// attach auth
RestImplementationHolder restHolder = restImplementationsHolder.getEnclosingHolder(methodHolder.getElement());
body.add(httpHeadersVar.invoke("setAuthorization").arg(restHolder.authenticationField));
}

return httpHeadersVar;
}

Expand Down Expand Up @@ -405,6 +413,14 @@ private String[] retrieveSettingCookieNames(ExecutableElement executableElement)
}
}

private boolean requiresAuth(ExecutableElement executableElement) {
RequiresAuthentication basicAuthAnnotation = executableElement.getAnnotation(RequiresAuthentication.class);
if (basicAuthAnnotation == null) {
basicAuthAnnotation = executableElement.getEnclosingElement().getAnnotation(RequiresAuthentication.class);
}
return basicAuthAnnotation != null;
}

private TreeMap<String, JVar> extractMethodParamsVar(EBeanHolder eBeanHolder, JMethod method, ExecutableElement executableElement, RestImplementationHolder holder) {
List<? extends VariableElement> params = executableElement.getParameters();
TreeMap<String, JVar> methodParams = new TreeMap<String, JVar>();
Expand Down