From c2feb363e513c0dea83d507eb9ba1918748d4e8e Mon Sep 17 00:00:00 2001
From: Jesse Morgan <jesse@jesterpm.net>
Date: Tue, 9 Sep 2014 07:44:01 -0700
Subject: Moving F1OAuthHelper to F1Access.

F1Access will provide a collection of F1 API methods, rather than
placing all of those methods in F1User as I was originally planning.
---
 src/com/p4square/grow/frontend/GrowFrontend.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/com/p4square/grow/frontend/GrowFrontend.java')

diff --git a/src/com/p4square/grow/frontend/GrowFrontend.java b/src/com/p4square/grow/frontend/GrowFrontend.java
index 4b193d0..926670b 100644
--- a/src/com/p4square/grow/frontend/GrowFrontend.java
+++ b/src/com/p4square/grow/frontend/GrowFrontend.java
@@ -30,7 +30,7 @@ import com.p4square.fmfacade.FreeMarkerPageResource;
 
 import com.p4square.grow.config.Config;
 
-import com.p4square.f1oauth.F1OAuthHelper;
+import com.p4square.f1oauth.F1Access;
 import com.p4square.f1oauth.SecondPartyVerifier;
 
 import com.p4square.session.SessionCheckingAuthenticator;
@@ -49,7 +49,7 @@ public class GrowFrontend extends FMFacade {
 
     private Config mConfig;
 
-    private F1OAuthHelper mHelper;
+    private F1Access mHelper;
 
     public GrowFrontend() {
         this(new Config());
@@ -73,13 +73,13 @@ public class GrowFrontend extends FMFacade {
         super.start();
     }
 
-    synchronized F1OAuthHelper getHelper() {
+    synchronized F1Access getF1Access() {
         if (mHelper == null) {
-            mHelper = new F1OAuthHelper(getContext(), mConfig.getString("f1ConsumerKey", ""),
+            mHelper = new F1Access(getContext(), mConfig.getString("f1ConsumerKey", ""),
                     mConfig.getString("f1ConsumerSecret", ""),
                     mConfig.getString("f1BaseUrl", "staging.fellowshiponeapi.com"),
                     mConfig.getString("f1ChurchCode", "pfseawa"),
-                    F1OAuthHelper.UserType.WEBLINK);
+                    F1Access.UserType.WEBLINK);
         }
 
         return mHelper;
@@ -129,7 +129,7 @@ public class GrowFrontend extends FMFacade {
         SessionCheckingAuthenticator sessionChk = new SessionCheckingAuthenticator(context, true);
 
         // This is used to authenticate the user
-        SecondPartyVerifier f1Verifier = new SecondPartyVerifier(context, getHelper());
+        SecondPartyVerifier f1Verifier = new SecondPartyVerifier(context, getF1Access());
         LoginFormAuthenticator loginAuth = new LoginFormAuthenticator(context, false, f1Verifier);
         loginAuth.setLoginFormUrl(loginPage);
         loginAuth.setLoginPostUrl(loginPost);
-- 
cgit v1.2.3