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 SetsCookie, only using an Entity instance if needed
  • Loading branch information
@dhleong
dhleong committed May 5, 2013
commit dd1397b211199378f28cf1a61a5d4e909aa34d0e
61 changes: 52 additions & 9 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 @@ -34,11 +34,13 @@
import org.androidannotations.processing.DecoratingElementProcessor;
import org.androidannotations.processing.EBeanHolder;

import com.sun.codemodel.JArray;
import com.sun.codemodel.JBlock;
import com.sun.codemodel.JClass;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JForEach;
import com.sun.codemodel.JInvocation;
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
Expand Down Expand Up @@ -115,12 +117,53 @@ protected void generateRestTemplateCallBlock(MethodProcessorHolder methodHolder)
restCall.arg(hashMapVar);
}

JClass voidClass = eBeanHolder.refClass(Void.class);
JClass responseEntityClass = eBeanHolder.refClass(CanonicalNameConstants.RESPONSE_ENTITY).narrow(methodReturnVoid ? voidClass : expectedClass);
JVar responseEntity = body.decl(responseEntityClass, "response", restCall);
final JExpression result;
final boolean usesInstance; // do we have an instance of the entity?

// attempt to retrieve cookies from the response
String[] settingCookies = retrieveSettingCookieNames(executableElement);
boolean setsCookies = settingCookies != null;
if (setsCookies) {

JClass voidClass = eBeanHolder.refClass(Void.class);
JClass responseEntityClass = eBeanHolder.refClass(CanonicalNameConstants.RESPONSE_ENTITY).narrow(methodReturnVoid ? voidClass : expectedClass);
JVar responseEntity = body.decl(responseEntityClass, "response", restCall);

// set cookies
JClass listClass = eBeanHolder.refClass(List.class).narrow(String.class);
JClass stringClass = eBeanHolder.refClass(CanonicalNameConstants.STRING);
JClass stringArrayClass = stringClass.array();
JArray cookiesArray = JExpr.newArray(stringClass);
for (String cookie : settingCookies) {
cookiesArray.add(JExpr.lit(cookie));
}
JVar requestedCookiesVar = body.decl(stringArrayClass, "requestedCookies", cookiesArray);

JInvocation setCookiesList = JExpr.invoke(responseEntity, "getHeaders").invoke("get").arg("Set-Cookie");
JVar allCookiesList = body.decl(listClass, "allCookies", setCookiesList);

// for loop over list... add if in string array
JForEach forEach = body.forEach(stringClass, "rawCookie", allCookiesList);
JVar rawCookieVar = forEach.var();

JBlock forLoopBody = forEach.body();

JForEach innerForEach = forLoopBody.forEach(stringClass, "thisCookieName", requestedCookiesVar);
JBlock innerBody = innerForEach.body();
JBlock thenBlock = innerBody._if(JExpr.invoke(rawCookieVar, "startsWith").arg(innerForEach.var()))._then();
JExpression indexOfValue = rawCookieVar.invoke("indexOf").arg("=").plus(JExpr.lit(1));
JInvocation cookieValue = rawCookieVar.invoke("substring").arg(indexOfValue);
thenBlock.invoke(holder.availableCookiesField, "put").arg(innerForEach.var()).arg(cookieValue);
thenBlock._break();

JExpression result = JExpr.ref(responseEntity.name());
insertRestCallInBody(body, result, methodHolder, methodReturnVoid);
result = JExpr.ref(responseEntity.name());
usesInstance = true;
} else {
result = restCall;
usesInstance = false;
}

insertRestCallInBody(body, result, methodHolder, methodReturnVoid, usesInstance);
}

/**
Expand Down Expand Up @@ -148,10 +191,10 @@ protected JExpression addResultCallMethod(JExpression i, MethodProcessorHolder m
return i;
}

private void insertRestCallInBody(JBlock body, JExpression restCall, MethodProcessorHolder methodHolder, boolean methodReturnVoid) {
if (methodReturnVoid) {
// body.add(restCall);
} else {
private void insertRestCallInBody(JBlock body, JExpression restCall, MethodProcessorHolder methodHolder, boolean methodReturnVoid, boolean usesInstance) {
if (methodReturnVoid && !usesInstance && restCall instanceof JInvocation) {
body.add((JInvocation) restCall);
} else if (!methodReturnVoid) {
restCall = addResultCallMethod(restCall, methodHolder);
body._return(restCall);
}
Expand Down