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

make sure the user is logged in

Browse Source
This commit is contained in:
Athou
2013-05-21 13:24:43 +02:00
parent d906b21fa9
commit 3329c8cd50
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.commafeed.backend.dao.UserDAO; import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.feeds.OPMLImporter; import com.commafeed.backend.feeds.OPMLImporter;
import com.commafeed.backend.model.ApplicationSettings; import com.commafeed.backend.model.ApplicationSettings;
import com.commafeed.backend.model.User;
import com.commafeed.backend.services.ApplicationSettingsService; import com.commafeed.backend.services.ApplicationSettingsService;
import com.commafeed.frontend.CommaFeedSession; import com.commafeed.frontend.CommaFeedSession;
import com.commafeed.frontend.utils.WicketUtils; import com.commafeed.frontend.utils.WicketUtils;
@@ -92,7 +93,10 @@ public class GoogleImportCallbackPage extends WebPage {
BearerToken.authorizationHeaderAccessMethod().intercept( BearerToken.authorizationHeaderAccessMethod().intercept(
httpRequest, accessToken); httpRequest, accessToken);
String opml = httpRequest.execute().parseAsString(); String opml = httpRequest.execute().parseAsString();
importer.importOpml(CommaFeedSession.get().getUser(), opml); User user = CommaFeedSession.get().getUser();
if (user != null) {
importer.importOpml(CommaFeedSession.get().getUser(), opml);
}
} catch (Exception e) { } catch (Exception e) {
throw new DisplayException(e); throw new DisplayException(e);
} }