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.

3 files changed, 11 insertions, 9 deletions

diff --git a/src/com/p4square/grow/frontend/AssessmentResultsPage.java b/src/com/p4square/grow/frontend/AssessmentResultsPage.java
index 95c3f6a..c205503 100644
--- a/src/com/p4square/grow/frontend/AssessmentResultsPage.java
+++ b/src/com/p4square/grow/frontend/AssessmentResultsPage.java
@@ -22,6 +22,8 @@ import com.p4square.fmfacade.json.JsonRequestClient;
 import com.p4square.fmfacade.json.JsonResponse;
 import com.p4square.fmfacade.json.ClientException;
 
+import com.p4square.f1oauth.F1User;
+
 import com.p4square.grow.config.Config;
 
 /**
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);
diff --git a/src/com/p4square/grow/frontend/NewAccountResource.java b/src/com/p4square/grow/frontend/NewAccountResource.java
index 9155a00..54c1790 100644
--- a/src/com/p4square/grow/frontend/NewAccountResource.java
+++ b/src/com/p4square/grow/frontend/NewAccountResource.java
@@ -18,7 +18,7 @@ import org.restlet.ext.freemarker.TemplateRepresentation;
 
 import org.apache.log4j.Logger;
 
-import com.p4square.f1oauth.F1OAuthHelper;
+import com.p4square.f1oauth.F1Access;
 import com.p4square.restlet.oauth.OAuthException;
 
 import com.p4square.fmfacade.FreeMarkerPageResource;
@@ -32,7 +32,7 @@ public class NewAccountResource extends FreeMarkerPageResource {
     private static Logger LOG = Logger.getLogger(NewAccountResource.class);
 
     private GrowFrontend mGrowFrontend;
-    private F1OAuthHelper mHelper;
+    private F1Access mHelper;
 
     private String mErrorMessage;
 
@@ -44,7 +44,7 @@ public class NewAccountResource extends FreeMarkerPageResource {
         super.doInit();
 
         mGrowFrontend = (GrowFrontend) getApplication();
-        mHelper = mGrowFrontend.getHelper();
+        mHelper = mGrowFrontend.getF1Access();
 
         mErrorMessage = "";