Merge pull request #293 from samtstern/master

Version 0.5.3
firebase · Sep 8, 2016 · a95d541 · a95d541
2 parents e857f8b + fb5f31b
commit a95d541
Show file tree

Hide file tree

Showing 10 changed files with 69 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -28,13 +28,13 @@ libraries.
 ```groovy
 dependencies {
     // Single target that includes all FirebaseUI libraries
-    compile 'com.firebaseui:firebase-ui:0.5.2'
+    compile 'com.firebaseui:firebase-ui:0.5.3'
 
     // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:0.5.2'
+    compile 'com.firebaseui:firebase-ui-database:0.5.3'
 
     // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:0.5.2'
+    compile 'com.firebaseui:firebase-ui-auth:0.5.3'
 }
 ```
 
@@ -61,7 +61,7 @@ For convenience, here are some examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
-| 0.5.2              | 9.4.0                          |
+| 0.5.3              | 9.4.0                          |
 | 0.4.4              | 9.4.0                          |
 | 0.4.3              | 9.2.1                          |
 | 0.4.2              | 9.2.0                          |

diff --git a/auth/README.md b/auth/README.md
@@ -44,7 +44,7 @@ Gradle, add:
 ```groovy
 dependencies {
   // ...
-  compile 'com.firebaseui:firebase-ui-auth:0.5.2'
+  compile 'com.firebaseui:firebase-ui-auth:0.5.3'
 }
 ```
 
@@ -54,7 +54,7 @@ If instead your project uses Maven, add:
 <dependency>
   <groupId>com.firebaseui</groupId>
   <artifactId>firebase-ui-auth</artifactId>
-  <version>0.5.2</version>
+  <version>0.5.3</version>
 </dependency>
 ```
 
@@ -325,10 +325,10 @@ would like to request additional scopes from the user, add a string array resour
     For a list of all scopes, see:
     https://developers.google.com/identity/protocols/googlescopes
 -->
-<array name="google_permissions">
+<string-array name="google_permissions">
     <!-- Request permission to read the user's Google Drive files -->
     <item>https://www.googleapis.com/auth/drive.readonly</item>
-</array>
+</string-array>
 ```
 
 
@@ -344,8 +344,8 @@ Facebook Login.  If you would like to override these scopes, a string array reso
     https://developers.facebook.com/docs/facebook-login/android
     https://developers.facebook.com/docs/facebook-login/permissions
 -->
-<array name="facebook_permissions">
+<string-array name="facebook_permissions">
     <!-- Request permission to know the user's birthday -->
     <item>user_birthday</item>
-</array>
+</string-array>
 ```
diff --git a/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java b/auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java
@@ -62,7 +62,7 @@ public GoogleProvider(FragmentActivity activity, IDPProviderParcel parcel, @Null
                 .requestIdToken(mClientId);
 
         // Add additional scopes
-        String[] extraScopes = getExtraScopes();
+        String[] extraScopes = mActivity.getResources().getStringArray(R.array.google_permissions);
         for (String scopeString : extraScopes) {
             builder.requestScopes(new Scope(scopeString));
         }
@@ -154,9 +154,5 @@ public void onClick(View view) {
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
         Log.w(TAG, "onConnectionFailed:" + connectionResult);
     }
-
-    private String[] getExtraScopes() {
-        return mActivity.getResources().getStringArray(R.array.google_permissions);
-    }
 }
 
diff --git a/auth/src/main/res/values/config.xml b/auth/src/main/res/values/config.xml
@@ -29,8 +29,8 @@
     https://developers.facebook.com/docs/facebook-login/android
     https://developers.facebook.com/docs/facebook-login/permissions
     -->
-    <array name="facebook_permissions">
-    </array>
+    <string-array name="facebook_permissions">
+    </string-array>
 
     <!--
     The additional Google scopes that this application will request from the user. Users of
@@ -43,8 +43,8 @@
     For a list of all scopes, see:
     https://developers.google.com/identity/protocols/googlescopes
     -->
-    <array name="google_permissions">
-    </array>
+    <string-array name="google_permissions">
+    </string-array>
 
 
     <!--

diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/CustomRobolectricGradleTestRunner.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/CustomRobolectricGradleTestRunner.java
@@ -14,6 +14,7 @@
 
 package com.firebase.ui.auth.test_helpers;
 
+import com.facebook.login.LoginManager;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.ui.ActivityHelper;
@@ -34,12 +35,15 @@ public CustomRobolectricGradleTestRunner(Class<?> klass) throws InitializationEr
     @Override
     public InstrumentationConfiguration createClassLoaderConfig(Config config) {
         InstrumentationConfiguration.Builder builder = InstrumentationConfiguration.newBuilder();
+
         builder.addInstrumentedClass(FirebaseAuthWrapperFactory.class.getName());
         builder.addInstrumentedClass(CredentialsAPI.class.getName());
         builder.addInstrumentedClass(ActivityHelper.class.getName());
         builder.addInstrumentedClass(FirebaseAuthWrapperImpl.class.getName());
         builder.addInstrumentedClass(FacebookProvider.class.getName());
         builder.addInstrumentedClass(GoogleProvider.class.getName());
+        builder.addInstrumentedClass(LoginManager.class.getName());
+
         return builder.build();
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/FacebookProviderShadow.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/FacebookProviderShadow.java
@@ -14,12 +14,10 @@
 
 package com.firebase.ui.auth.test_helpers;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 import android.app.Activity;
 import android.os.Bundle;
 
+import com.facebook.login.LoginResult;
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.IDPProvider;
 import com.firebase.ui.auth.provider.IDPProviderParcel;
@@ -29,6 +27,9 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 
 @Implements(FacebookProvider.class)
 public class FacebookProviderShadow {
@@ -58,7 +59,7 @@ public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {
     }
 
     @Implementation
-    public void startLogin(Activity activity) {
+    public void onSuccess(final LoginResult loginResult) {
         mCallback.onSuccess(mMockIdpResponse);
     }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/GoogleProviderShadow.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/GoogleProviderShadow.java
@@ -62,9 +62,4 @@ public void setAuthenticationCallback(IDPProvider.IDPCallback idpCallback) {
     public void startLogin(Activity activity) {
         mCallback.onSuccess(mMockIdpResponse);
     }
-
-    @Implementation
-    public String[] getExtraScopes() {
-        return new String[]{};
-    }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/test_helpers/LoginManagerShadow.java b/auth/src/test/java/com/firebase/ui/auth/test_helpers/LoginManagerShadow.java
@@ -0,0 +1,41 @@
+package com.firebase.ui.auth.test_helpers;
+
+import android.app.Activity;
+
+import com.facebook.CallbackManager;
+import com.facebook.FacebookCallback;
+import com.facebook.login.LoginManager;
+import com.facebook.login.LoginResult;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.util.Collection;
+
+/**
+ * Shadow for Facebook SDK {@link LoginManager}.
+ */
+@Implements(LoginManager.class)
+public class LoginManagerShadow {
+
+    private FacebookCallback<LoginResult> mCallback;
+
+    @Implementation
+    public void registerCallback(final CallbackManager callbackManager,
+                                 final FacebookCallback<LoginResult> callback) {
+        mCallback = callback;
+    }
+
+    @Implementation
+    public void logInWithReadPermissions(Activity activity, Collection<String> permissions) {
+        // Check for minimum permission set
+        if (!(permissions.contains("email") && permissions.contains("public_profile"))) {
+            throw new IllegalArgumentException("Facebook permissions must contain email and " +
+                    "public_profile.");
+        }
+
+        // Call back with success
+        mCallback.onSuccess(null);
+    }
+
+}
diff --git a/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java b/auth/src/test/java/com/firebase/ui/auth/ui/idp/AuthMethodPickerActivityTest.java
@@ -29,6 +29,7 @@
 import com.firebase.ui.auth.test_helpers.FakeAuthResult;
 import com.firebase.ui.auth.test_helpers.FirebaseAuthWrapperImplShadow;
 import com.firebase.ui.auth.test_helpers.GoogleProviderShadow;
+import com.firebase.ui.auth.test_helpers.LoginManagerShadow;
 import com.firebase.ui.auth.test_helpers.TestConstants;
 import com.firebase.ui.auth.test_helpers.TestHelper;
 import com.firebase.ui.auth.ui.ExtraConstants;
@@ -63,7 +64,8 @@
         shadows = {
                 FirebaseAuthWrapperImplShadow.class,
                 GoogleProviderShadow.class,
-                FacebookProviderShadow.class
+                FacebookProviderShadow.class,
+                LoginManagerShadow.class
         }, sdk = 21)
 public class AuthMethodPickerActivityTest {
 

diff --git a/common/constants.gradle b/common/constants.gradle
@@ -3,7 +3,7 @@ project.ext.support_library_version = '23.4.0'
 
 project.ext.submodules = ['database', 'auth']
 project.ext.group = "com.firebaseui"
-project.ext.version = '0.5.3-SNAPSHOT'
+project.ext.version = '0.5.3'
 project.ext.pomdesc = 'Firebase UI Android'
 project.ext.buildtools = '23.0.3'
 project.ext.compileSdk = 23