Merge branch 'master' into version-1.0.0-dev

Author: samtstern

CONTRIBUTING.md

@@ -12,15 +12,26 @@ need to be sure of various other things—for instance that you'll tell us if yo
 know that your code infringes on other people's patents. You don't have to sign
 the CLA until after you've submitted your code for review and a member has
 approved it, but you must do it before we can put your code into our codebase.
+
+### Adding new features
+
 Before you start working on a larger contribution, you should get in touch with
 us first through the issue tracker with your idea so that we can help out and
 possibly guide you. Coordinating up front makes it much easier to avoid
 frustration later on.
 
+If this has been discussed in an issue, make sure to mention the issue number.
+If not, go file an issue about this to make sure this is a desirable change.
+
+If this is a new feature please co-ordinate with someone on [FirebaseUI-iOS](https://github.com/firebase/FirebaseUI-iOS)
+to make sure that we can implement this on both platforms and maintain feature parity.
+Feature parity (where it makes sense) is a strict requirement for feature development in FirebaseUI.
+
 ### Code reviews
 
 All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose.
+use Github pull requests for this purpose. We adhere to the
+[Google Java style guide](https://google.github.io/styleguide/javaguide.html).
 
 ### The small print
 

README.md

@@ -25,16 +25,16 @@ those separately in your app.
 In your `app/build.gradle` file add a dependency on one of the FirebaseUI
 libraries.
 
-```
+```groovy
 dependencies {
     // Single target that includes all FirebaseUI libraries
-    compile 'com.firebaseui:firebase-ui:0.5.1'
+    compile 'com.firebaseui:firebase-ui:0.5.3'
 
     // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:0.5.1'
+    compile 'com.firebaseui:firebase-ui-database:0.5.3'
 
     // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:0.5.1'
+    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.1              | 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                          |

auth/README.md

@@ -41,20 +41,20 @@ Firebase: see the
 Then, add the FirebaseUI auth library dependency. If your project uses
 Gradle, add:
 
-```
+```groovy
 dependencies {
   // ...
-  compile 'com.firebaseui:firebase-ui-auth:0.5.1'
+  compile 'com.firebaseui:firebase-ui-auth:0.5.3'
 }
 ```
 
 If instead your project uses Maven, add:
 
-```
+```xml
 <dependency>
   <groupId>com.firebaseui</groupId>
   <artifactId>firebase-ui-auth</artifactId>
-  <version>0.5.1</version>
+  <version>0.5.3</version>
 </dependency>
 ```
 
@@ -70,7 +70,7 @@ If support for Facebook Sign-in is also required, define the
 resource string `facebook_application_id` to match the application ID in
 the [Facebook developer dashboard](https://developers.facebook.com):
 
-```
+```xml
 <resources>
   <!-- ... -->
   <string name="facebook_application_id" translatable="false">APPID</string>
@@ -95,7 +95,7 @@ Before invoking the FirebaseUI authentication flow, your app should check
 whether a
 [user is already signed in](https://firebase.google.com/docs/auth/android/manage-users#get_the_currently_signed-in_user) from a previous session:
 
-```
+```java
 FirebaseAuth auth = FirebaseAuth.getInstance();
 if (auth.getCurrentUser() != null) {
   // already signed in
@@ -127,15 +127,15 @@ The builder provides the following customization options for the authentication
   a link in the small-print of the account creation step for new users. If no
   terms of service URL is provided, the associated small-print is omitted.
 
-- A custom theme can specified for the flow, which is applied to all the
+- A custom theme can be specified for the flow, which is applied to all the
   activities in the flow for consistent customization of colors and typography.
 
 #### Sign-in examples
 
 If no customization is required, and only email authentication is required, the sign-in flow
 can be started as follows:
 
-```
+```java
 startActivityForResult(
     // Get an instance of AuthUI based on the default app
     AuthUI.getInstance().createSignInIntentBuilder().build(),
@@ -145,7 +145,7 @@ startActivityForResult(
 You can enable sign-in providers like Google Sign-In or Facebook Log In by calling the
 `setProviders` method:
 
-```
+```java
 startActivityForResult(
     AuthUI.getInstance()
         .createSignInIntentBuilder()
@@ -159,7 +159,7 @@ startActivityForResult(
 
 If a terms of service URL and a custom theme are required:
 
-```
+```java
 startActivityForResult(
     AuthUI.getInstance()
         .createSignInIntentBuilder()
@@ -176,7 +176,7 @@ Using SmartLock is recommended to provide the best user experience, but in some
 to disable SmartLock for testing or development.  To disable SmartLock, you can use the 
 `setIsSmartLockEnabled` method when building your sign-in Intent:
 
-```
+```java
 startActivityForResult(
     AuthUI.getInstance()
         .createSignInIntentBuilder()
@@ -188,7 +188,7 @@ startActivityForResult(
 It is often desirable to disable SmartLock in development but enable it in production. To achieve
 this, you can use the `BuildConfig.DEBUG` flag to control SmartLock:
 
-```
+```java
 startActivityForResult(
     AuthUI.getInstance()
         .createSignInIntentBuilder()
@@ -206,7 +206,7 @@ typically useful; the only recourse for most apps if sign in fails is to ask
 the user to sign in again later, or proceed with an anonymous account if
 supported.
 
-```
+```java
 protected void onActivityResult(int requestCode, int resultCode, Intent data) {
    super.onActivityResult(requestCode, resultCode, data);
    if (requestCode == RC_SIGN_IN) {
@@ -246,7 +246,7 @@ In order to make this process easier, AuthUI provides a simple `signOut` method
 to encapsulate this behavior. The method returns a `Task` which is marked
 completed once all necessary sign-out operations are completed:
 
-```
+```java
 public void onClick(View v) {
   if (v.getId() == R.id.sign_out) {
       AuthUI.getInstance()
@@ -303,7 +303,7 @@ the flow, a new theme can be declared. Standard material design color
 and typography properties will take effect as expected. For example, to define
 a green theme:
 
-```
+```xml
 <style name="GreenTheme" parent="FirebaseUI">
     <item name="colorPrimary">@color/material_green_500</item>
     <item name="colorPrimaryDark">@color/material_green_700</item>
@@ -317,7 +317,7 @@ a green theme:
 
 With associated colors:
 
-```
+```xml
 <color name="material_green_50">#E8F5E9</color>
 <color name="material_green_500">#4CAF50</color>
 <color name="material_green_700">#388E3C</color>
@@ -328,7 +328,7 @@ With associated colors:
 
 This would then be used in the construction of the sign-in intent:
 
-```
+```java
 startActivityForResult(
     AuthUI.getInstance(this).createSignInIntentBuilder()
         // ...
@@ -344,7 +344,7 @@ easily overridden by name in your application. See
 [the built-in strings.xml](src/main/res/values/strings.xml) and simply
 redefine a string to change it, for example:
 
-```
+```java
 <resources>
   <!-- was "Signing up..." -->
   <string name="progress_dialog_signing_up">Creating your shiny new account...</string>
@@ -353,24 +353,37 @@ redefine a string to change it, for example:
 
 ### OAuth Scope Customization
 
+#### Google
+By default, FirebaseUI requests the `email` and `profile` scopes when using Google Sign In. If you
+would like to request additional scopes from the user, add a string array resource named 
+`google_permissions` to your `strings.xml` file like this:
+
+```xml
+<!--
+    For a list of all scopes, see:
+    https://developers.google.com/identity/protocols/googlescopes
+-->
+<string-array name="google_permissions">
+    <!-- Request permission to read the user's Google Drive files -->
+    <item>https://www.googleapis.com/auth/drive.readonly</item>
+</string-array>
+```
+
+
 #### Facebook
 
 By default, FirebaseUI requests the `email` and `public_profile` permissions when initiating
-Facebook Login.  If you would like to override these scopes, add a string array resource
-to your application like this:
+Facebook Login.  If you would like to override these scopes, a string array resource named 
+`facebook_permissions` to your `strings.xml` file like this:
 
-```
+```xml
 <!--
     See:
     https://developers.facebook.com/docs/facebook-login/android
     https://developers.facebook.com/docs/facebook-login/permissions
 -->
-<array name="facebook_permissions">
-    <item>public_profile</item>
-    <item>email</item>
-    <!-- ... -->
-</array>
+<string-array name="facebook_permissions">
+    <!-- Request permission to know the user's birthday -->
+    <item>user_birthday</item>
+</string-array>
 ```
-
-Note that if you do not include at least the `email` and `public_profile` scopes, FirebaseUI
-will not work properly.

auth/src/main/AndroidManifest.xml

@@ -36,9 +36,6 @@
             android:name="com.firebase.ui.auth.ui.account_link.SaveCredentialsActivity"
             android:label="@string/default_toolbar_title"
             android:theme="@style/FirebaseUI.Translucent" />
-        <activity
-            android:name="com.firebase.ui.auth.ui.account_link.AccountLinkInitActivity"
-            android:theme="@style/FirebaseUI" />
         <activity
             android:name="com.firebase.ui.auth.ui.account_link.WelcomeBackIDPPrompt"
             android:label="@string/title_welcome_back_idp_prompt"

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -469,6 +469,8 @@ public SignInIntentBuilder setProviders(@NonNull String... providers) {
 
         /**
          * Enables or disables the use of Smart Lock for Passwords in the sign in flow.
+         * 
+         * <p>SmartLock is enabled by default
          */
         public SignInIntentBuilder setIsSmartLockEnabled(boolean enabled) {
             mIsSmartLockEnabled = enabled;

auth/src/main/java/com/firebase/ui/auth/provider/FacebookProvider.java

@@ -36,7 +36,9 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 
 public class FacebookProvider implements IDPProvider, FacebookCallback<LoginResult> {
     public static final String ACCESS_TOKEN = "facebook_access_token";
@@ -46,6 +48,9 @@ public class FacebookProvider implements IDPProvider, FacebookCallback<LoginResu
 
     private static final String TAG = "FacebookProvider";
     private static final String APPLICATION_ID = "application_id";
+    private static final String EMAIL = "email";
+    private static final String PUBLIC_PROFILE = "public_profile";
+
     private CallbackManager mCallbackManager;
     private IDPCallback mCallbackObject;
 
@@ -79,9 +84,19 @@ public void startLogin(Activity activity) {
         loginManager.registerCallback(mCallbackManager, this);
 
         String[] permissions = activity.getResources().getStringArray(R.array.facebook_permissions);
+        List<String> permissionsList = new ArrayList<>(Arrays.asList(permissions));
+
+        // Ensure we have email and public_profile scopes
+        if (!permissionsList.contains(EMAIL)) {
+            permissionsList.add(EMAIL);
+        }
+
+        if (!permissionsList.contains(PUBLIC_PROFILE)) {
+            permissionsList.add(PUBLIC_PROFILE);
+        }
 
-        loginManager.logInWithReadPermissions(
-                activity, Arrays.asList(permissions));
+        // Log in with permissions
+        loginManager.logInWithReadPermissions(activity, permissionsList);
     }
 
     @Override

auth/src/main/java/com/firebase/ui/auth/provider/GoogleProvider.java

@@ -33,6 +33,7 @@
 import com.google.android.gms.auth.api.signin.GoogleSignInResult;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.common.api.Scope;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.GoogleAuthProvider;
 
@@ -60,6 +61,12 @@ public GoogleProvider(FragmentActivity activity, IDPProviderParcel parcel, @Null
                 .requestEmail()
                 .requestIdToken(mClientId);
 
+        // Add additional scopes
+        String[] extraScopes = mActivity.getResources().getStringArray(R.array.google_permissions);
+        for (String scopeString : extraScopes) {
+            builder.requestScopes(new Scope(scopeString));
+        }
+
         if (!TextUtils.isEmpty(email)) {
             builder.setAccountName(email);
         }

auth/src/main/java/com/firebase/ui/auth/ui/AuthCredentialHelper.java

@@ -14,6 +14,8 @@
 
 package com.firebase.ui.auth.ui;
 
+import android.support.annotation.Nullable;
+
 import com.firebase.ui.auth.provider.FacebookProvider;
 import com.firebase.ui.auth.provider.GoogleProvider;
 import com.firebase.ui.auth.provider.IDPResponse;
@@ -22,6 +24,8 @@
 import com.google.firebase.auth.GoogleAuthProvider;
 
 public class AuthCredentialHelper {
+
+    @Nullable
     public static AuthCredential getAuthCredential(IDPResponse idpResponse) {
         switch (idpResponse.getProviderType()) {
             case GoogleAuthProvider.PROVIDER_ID:
@@ -32,4 +36,5 @@ public static AuthCredential getAuthCredential(IDPResponse idpResponse) {
                 return null;
         }
     }
+
 }

auth/src/main/java/com/firebase/ui/auth/ui/ChooseAccountActivity.java

@@ -31,6 +31,7 @@
 import com.firebase.ui.auth.util.EmailFlowUtil;
 import com.firebase.ui.auth.util.PlayServicesHelper;
 import com.google.android.gms.auth.api.credentials.Credential;
+import com.google.android.gms.auth.api.credentials.CredentialsApi;
 import com.google.android.gms.auth.api.credentials.IdentityProviders;
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.tasks.OnCompleteListener;
@@ -207,7 +208,8 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                             mCredentialsApi.getPasswordFromCredential(),
                             mCredentialsApi.getAccountTypeFromCredential()
                     );
-                } else if (resultCode == RESULT_CANCELED) {
+                } else if (resultCode == RESULT_CANCELED
+                        || resultCode == CredentialsApi.ACTIVITY_RESULT_OTHER_ACCOUNT) {
                     // Smart lock selector cancelled, go to the AuthMethodPicker screen
                     startAuthMethodChoice(mActivityHelper);
                 } else if (resultCode == RESULT_FIRST_USER) {