Revision 902e3ef4
| b/src/gr/grnet/pithos/web/client/Pithos.java | ||
|---|---|---|
| 660 | 660 |
private boolean parseUserCredentials() {
|
| 661 | 661 |
Configuration conf = (Configuration) GWT.create(Configuration.class); |
| 662 | 662 |
Dictionary otherProperties = Dictionary.getDictionary("otherProperties");
|
| 663 |
System.out.println("otherProperties = " + otherProperties);
|
|
| 664 | 663 |
String cookie = otherProperties.get("authCookie");
|
| 665 |
System.out.println("cookie = " + cookie);
|
|
| 666 |
Cookies.setCookie(cookie, "868fbb51-94a4-477d-8da3-dadad080c861|HlPjywM5FGAncsoNDzPZ2Q=="); |
|
| 667 |
// Cookies.setCookie(cookie, "868fbb51-94a4-477d-8da3-dadad080c861%7CHlPjywM5FGAncsoNDzPZ2Q%3D%3D"); |
|
| 668 |
for(String name: Cookies.getCookieNames()) {
|
|
| 669 |
System.out.println("cookie name: " + name);
|
|
| 670 |
} |
|
| 671 | 664 |
String auth = Cookies.getCookie(cookie); |
| 672 |
System.out.println("auth = " + auth);
|
|
| 673 | 665 |
if(auth == null) {
|
| 674 | 666 |
authenticateUser(); |
| 675 | 667 |
return false; |
| ... | ... | |
| 681 | 673 |
auth = auth.substring(0, auth.length() - 1); |
| 682 | 674 |
} |
| 683 | 675 |
String[] authSplit = auth.split("\\" + conf.cookieSeparator(), 2);
|
| 684 |
for(String authPart: authSplit) {
|
|
| 685 |
System.out.println("authPart: " + authPart);
|
|
| 686 |
} |
|
| 687 | 676 |
if(authSplit.length != 2) {
|
| 688 | 677 |
authenticateUser(); |
| 689 | 678 |
return false; |
| 690 | 679 |
} |
| 691 | 680 |
userID = authSplit[0]; |
| 692 | 681 |
userToken = authSplit[1]; |
| 693 |
System.out.println("userID = " + userID);
|
|
| 694 |
System.out.println("userToken = " + userToken);
|
|
| 695 | 682 |
|
| 696 | 683 |
String gotoUrl = Window.Location.getParameter("goto");
|
| 697 | 684 |
if(gotoUrl != null && gotoUrl.length() > 0) {
|
| 698 | 685 |
Window.Location.assign(gotoUrl); |
| 699 | 686 |
return false; |
| 700 | 687 |
} |
| 701 |
System.out.println("Returning true");
|
|
| 702 | 688 |
return true; |
| 703 | 689 |
} |
| 704 | 690 |
|
| ... | ... | |
| 711 | 697 |
} |
| 712 | 698 |
|
| 713 | 699 |
public void fetchAccount(final Command callback) {
|
| 714 |
System.out.println("fetchAccount(), userID = " + this.userID + ", userToken = " + this.userToken);
|
|
| 715 | 700 |
String path = "?format=json"; |
| 716 | 701 |
|
| 717 | 702 |
GetRequest<AccountResource> getAccount = new GetRequest<AccountResource>(AccountResource.class, getApiPath(), userID, path) {
|
| 718 | 703 |
@Override |
| 719 | 704 |
public void onSuccess(AccountResource _result) {
|
| 720 |
System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " onSuccess()");
|
|
| 721 | 705 |
account = _result; |
| 722 | 706 |
if(callback != null) {
|
| 723 | 707 |
callback.execute(); |
| ... | ... | |
| 728 | 712 |
|
| 729 | 713 |
@Override |
| 730 | 714 |
public void onError(Throwable t) {
|
| 731 |
System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " onError() " + t.getClass().getName() + ": " + t.getMessage());
|
|
| 732 | 715 |
GWT.log("Error getting account", t);
|
| 733 | 716 |
setError(t); |
| 734 | 717 |
if(t instanceof RestException) {
|
| 735 |
System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " Error getting account: " + ((RestException) t).getHttpStatusText());
|
|
| 736 | 718 |
displayError("Error getting account: " + ((RestException) t).getHttpStatusText());
|
| 737 | 719 |
} |
| 738 | 720 |
else {
|
| 739 |
System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + "System error fetching user data: " + t.getMessage());
|
|
| 740 | 721 |
displayError("System error fetching user data: " + t.getMessage());
|
| 741 | 722 |
} |
| 742 | 723 |
} |
| 743 | 724 |
|
| 744 | 725 |
@Override |
| 745 | 726 |
protected void onUnauthorized(Response response) {
|
| 746 |
System.out.println("fetchAccount(), userID = " + userID + ", userToken = " + userToken + " onUnauthorized()");
|
|
| 747 | 727 |
sessionExpired(); |
| 748 | 728 |
} |
| 749 | 729 |
}; |
| b/src/gr/grnet/pithos/web/client/catalog/GetUserCatalogs.java | ||
|---|---|---|
| 92 | 92 |
} |
| 93 | 93 |
|
| 94 | 94 |
public void onSuccess(Request request, Response response, JSONObject result, UserCatalogs userCatalogs) {
|
| 95 |
System.out.println("GetUserCatalogs: " + result);
|
|
| 96 | 95 |
} |
| 97 | 96 |
|
| 98 | 97 |
public void onBadStatusCode(Request request, Response response) {
|
| 99 |
|
|
| 100 | 98 |
} |
| 101 | 99 |
|
| 102 | 100 |
public void onError(Request request, Throwable t) {
|
| 103 | 101 |
GWT.log("GetUserCatalogs", t);
|
| 104 |
System.out.print("GetUserCatalogs: " + t.getClass().getName() + ": " + t.getMessage());
|
|
| 105 | 102 |
} |
| 106 | 103 |
|
| 107 | 104 |
@Override |
| ... | ... | |
| 111 | 108 |
final String requestData = makeRequestData().toString(); |
| 112 | 109 |
|
| 113 | 110 |
try {
|
| 114 |
System.out.println("==================================");
|
|
| 115 |
System.out.println("POST " + getURL());
|
|
| 116 |
System.out.println("==================================");
|
|
| 117 | 111 |
rb.sendRequest(requestData, new RequestCallback() {
|
| 118 | 112 |
@Override |
| 119 | 113 |
public void onResponseReceived(Request request, Response response) {
|
| b/src/gr/grnet/pithos/web/client/rest/DeleteRequest.java | ||
|---|---|---|
| 77 | 77 |
|
| 78 | 78 |
@Override |
| 79 | 79 |
public void execute() {
|
| 80 |
System.out.println("DELETE " + api + owner + path);
|
|
| 81 | 80 |
RequestBuilder builder = new RequestBuilder(RequestBuilder.DELETE, api + owner + path); |
| 82 | 81 |
for (String header : headers.keySet()) {
|
| 83 | 82 |
builder.setHeader(header, headers.get(header)); |
| b/src/gr/grnet/pithos/web/client/rest/GetRequest.java | ||
|---|---|---|
| 94 | 94 |
path += "&t=" + System.currentTimeMillis(); |
| 95 | 95 |
else |
| 96 | 96 |
path += "?t=" + System.currentTimeMillis(); |
| 97 |
System.out.println("GET " + api + owner + path);
|
|
| 98 | 97 |
RequestBuilder builder = new RequestBuilder(RequestBuilder.GET, api + owner + path); |
| 99 | 98 |
|
| 100 | 99 |
for (String header : headers.keySet()) {
|
| ... | ... | |
| 104 | 103 |
builder.sendRequest("", new RestRequestCallback<T>(api + owner + path, okCode) {
|
| 105 | 104 |
@Override |
| 106 | 105 |
public void onSuccess(T object) {
|
| 107 |
System.out.println("GET onSuccess() " + api + owner + path);
|
|
| 108 | 106 |
GetRequest.this.onSuccess(object); |
| 109 | 107 |
} |
| 110 | 108 |
|
| ... | ... | |
| 115 | 113 |
|
| 116 | 114 |
@Override |
| 117 | 115 |
public void onError(Request request, Throwable throwable) {
|
| 118 |
System.out.println("GET onError()" + api + owner + path);
|
|
| 119 | 116 |
if (throwable instanceof RestException) {
|
| 120 | 117 |
if (((RestException) throwable).getHttpStatusCode() == 304 && result != null){
|
| 121 | 118 |
GWT.log("Using cache: " + result.toString(), null);
|
| b/src/gr/grnet/pithos/web/client/rest/HeadRequest.java | ||
|---|---|---|
| 96 | 96 |
path += "&t=" + System.currentTimeMillis(); |
| 97 | 97 |
else |
| 98 | 98 |
path += "?t=" + System.currentTimeMillis(); |
| 99 |
System.out.println("HEAD " + api + owner + path);
|
|
| 100 | 99 |
RequestBuilder builder = new RequestBuilder(RequestBuilder.HEAD, api + owner + path); |
| 101 | 100 |
for (String header : headers.keySet()) {
|
| 102 | 101 |
builder.setHeader(header, headers.get(header)); |
| b/src/gr/grnet/pithos/web/client/rest/PostRequest.java | ||
|---|---|---|
| 78 | 78 |
|
| 79 | 79 |
@Override |
| 80 | 80 |
public void execute() {
|
| 81 |
System.out.println("POST " + api + owner + path);
|
|
| 82 | 81 |
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, api + owner + path); |
| 83 | 82 |
for (String header : headers.keySet()) {
|
| 84 | 83 |
builder.setHeader(header, headers.get(header)); |
| b/src/gr/grnet/pithos/web/client/rest/PutRequest.java | ||
|---|---|---|
| 103 | 103 |
|
| 104 | 104 |
@Override |
| 105 | 105 |
public void execute() {
|
| 106 |
System.out.println("PUT " + api + owner + path);
|
|
| 107 | 106 |
RequestBuilder builder = new RequestBuilder(RequestBuilder.PUT, api + owner + path); |
| 108 | 107 |
for (String header : headers.keySet()) {
|
| 109 | 108 |
builder.setHeader(header, headers.get(header)); |
| b/src/gr/grnet/pithos/web/client/rest/RestRequestCallback.java | ||
|---|---|---|
| 78 | 78 |
} |
| 79 | 79 |
catch (Exception e) {}
|
| 80 | 80 |
|
| 81 |
System.out.println("Response headers: " + response.getHeadersAsString());
|
|
| 82 |
|
|
| 83 | 81 |
onError(request, new RestException(path, response.getStatusCode(), statusText, text)); |
| 84 | 82 |
} |
| 85 | 83 |
} catch (Exception e) {
|
Also available in: Unified diff