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

store only 10 entries for new users

Browse Source
This commit is contained in:
Athou
2013-04-10 16:45:05 +02:00
parent edfafeb7b0
commit 581c7bc070
5 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/commafeed/frontend/pages/GoogleImportCallbackPage.java
View File

@@ -3,6 +3,7 @@ package com.commafeed.frontend.pages;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.UrlRenderer;
@@ -59,7 +60,8 @@ public class GoogleImportCallbackPage extends WebPage {
String code = responseUrl.getCode();
if (responseUrl.getError() != null) {
throw new DisplayException(responseUrl.getError());
// user declined
throw new RestartResponseException(getApplication().getHomePage());
} else if (code == null) {
throw new DisplayException("Missing authorization code");
} else {

2
src/main/java/com/commafeed/frontend/pages/GoogleImportRedirectPage.java
View File

@@ -38,7 +38,7 @@ public class GoogleImportRedirectPage extends WebPage {
builder.addParameter("redirect_uri", redirectUri);
builder.addParameter("response_type", "code");
builder.addParameter("scope", SCOPE);
builder.addParameter("approval_prompt", "auto");
builder.addParameter("approval_prompt", "force");
builder.addParameter("client_id", clientId);
builder.addParameter("state",
String.valueOf(CommaFeedSession.get().getUser().getId()));