Add Google Auth example + auto Sign In

mythz · mythz · commit 4fdac947a5ff · 2017-03-27T03:12:14.000-04:00
diff --git a/src/androidchat/app/build.gradle b/src/androidchat/app/build.gradle
@@ -1,6 +1,7 @@
 buildscript {
     repositories {
         maven { url 'https://maven.fabric.io/public' }
+        jcenter()
     }
 
     dependencies {
@@ -10,6 +11,7 @@ buildscript {
         // We recommend changing it to the latest version from our changelog:
         // https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin
         classpath 'io.fabric.tools:gradle:1.+'
+        classpath 'com.google.gms:google-services:3.0.0'
     }
 }
 
@@ -52,12 +54,13 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:design:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.0'
+    compile 'com.android.support:design:25.3.0'
     compile 'net.servicestack:android:1.0.31'
     compile 'com.facebook.android:facebook-android-sdk:[4,5)'
     compile('com.twitter.sdk.android:twitter:2.3.1@aar') {
         transitive = true;
     }
+    compile 'com.google.android.gms:play-services-auth:10.2.1'
     testCompile 'junit:junit:4.12'
 }
diff --git a/src/androidchat/app/src/main/java/servicestack/net/androidchat/App.java b/src/androidchat/app/src/main/java/servicestack/net/androidchat/App.java
@@ -63,6 +63,14 @@ public dtos.Authenticate getSavedAccessToken(){
                 .setRememberMe(true);
         }
 
+        String googleAccessToken = prefs.getString("google.AccessToken", null);
+        if (googleAccessToken != null){
+            return new dtos.Authenticate()
+                .setProvider("GoogleOAuth")
+                .setAccessToken(googleAccessToken)
+                .setRememberMe(true);
+        }
+
         String twitterAccessToken = prefs.getString("twitter.AccessToken", null);
         String twitterAccessSecret = prefs.getString("twitter.AccessTokenSecret", null);
 
@@ -83,12 +91,19 @@ public void saveTwitterAccessToken(TwitterAuthToken authToken){
         editor.apply();
     }
 
+    public void saveGoogleAccessToken(String accessToken){
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putString("google.AccessToken", accessToken);
+        editor.apply();
+    }
+
     public void logout(){
         App.get().getServiceClient().clearCookies();    //Logout server
 
         LoginManager.getInstance().logOut();            //Logout facebook
 
-        SharedPreferences.Editor editor = prefs.edit(); //Logout twitter
+        SharedPreferences.Editor editor = prefs.edit(); //Logout google + twitter
+        editor.remove("google.AccessToken");
         editor.remove("twitter.AccessToken");
         editor.remove("twitter.AccessTokenSecret");
         editor.apply();
diff --git a/src/androidchat/app/src/main/java/servicestack/net/androidchat/LoginButtonsActivity.java b/src/androidchat/app/src/main/java/servicestack/net/androidchat/LoginButtonsActivity.java
@@ -13,12 +13,18 @@
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.facebook.AccessToken;
 import com.facebook.CallbackManager;
 import com.facebook.FacebookCallback;
 import com.facebook.FacebookException;
 import com.facebook.login.LoginResult;
 import com.facebook.login.widget.LoginButton;
+import com.google.android.gms.auth.api.Auth;
+import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
+import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
+import com.google.android.gms.auth.api.signin.GoogleSignInResult;
+import com.google.android.gms.common.SignInButton;
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.gson.JsonObject;
 import com.twitter.sdk.android.Twitter;
 import com.twitter.sdk.android.core.Callback;
 import com.twitter.sdk.android.core.Result;
@@ -27,10 +33,18 @@
 import com.twitter.sdk.android.core.TwitterSession;
 import com.twitter.sdk.android.core.identity.TwitterLoginButton;
 
-import net.servicestack.android.AndroidServiceClient;
+import net.servicestack.client.JsonUtils;
 import net.servicestack.client.Log;
 
+import java.io.IOException;
+
 import io.fabric.sdk.android.Fabric;
+import okhttp3.Call;
+import okhttp3.FormBody;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 
 /**
  * This Login Page signs in using Facebook and Twitter's SDK Buttons
@@ -45,6 +59,8 @@ public class LoginButtonsActivity extends AppCompatActivity {
     private LoginButton btnFacebookLogin;
     private CallbackManager facebookCallback;
     private Button btnGuestLogin;
+    GoogleApiClient googleApiClient;
+    private static final int RC_SIGN_IN = 9001;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -142,6 +158,20 @@ public void onError(FacebookException exception) {
             }
         });
 
+        SignInButton btnGoogleSignIn = (SignInButton) findViewById(R.id.sign_in_button);
+        GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
+            .requestEmail()
+            .requestServerAuthCode(getResources().getString(R.string.google_key))
+            .build();
+        googleApiClient = new GoogleApiClient.Builder(this)
+            .enableAutoManage(this, r -> { /* Handle On Connection Failed...*/ })
+            .addApi(Auth.GOOGLE_SIGN_IN_API, gso)
+            .build();
+        btnGoogleSignIn.setOnClickListener(v -> {
+            Intent signInIntent = Auth.GoogleSignInApi.getSignInIntent(googleApiClient);
+            startActivityForResult(signInIntent, RC_SIGN_IN);
+        });
+
         Button btnGuestLogin = (Button)findViewById(R.id.btnGuestLogin);
         btnGuestLogin.setOnClickListener(view -> {
             UiHelpers.setStatus(txtStatus, "Opening chat as guest...");
@@ -171,6 +201,59 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         btnTwitterLogin.onActivityResult(requestCode, resultCode, data);
         facebookCallback.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == RC_SIGN_IN) {
+            handleGoogleSignInResult(Auth.GoogleSignInApi.getSignInResultFromIntent(data));
+        }
+    }
+
+    private void handleGoogleSignInResult(GoogleSignInResult result) {
+        if (result.isSuccess()) {
+            GoogleSignInAccount acct = result.getSignInAccount();
+            UiHelpers.setStatus(txtStatus, "Local google sign-in successful, signing into server...");
+
+            Activity activity = this;
+            OkHttpClient client = new OkHttpClient();
+            RequestBody requestBody = new FormBody.Builder()
+                .add("grant_type", "authorization_code")
+                .add("client_id", getResources().getString(R.string.google_key))
+                .add("client_secret", getResources().getString(R.string.google_secret))
+                .add("redirect_uri","")
+                .add("code", acct.getServerAuthCode())
+                .build();
+            Request request = new Request.Builder()
+                .url("https://www.googleapis.com/oauth2/v4/token")
+                .post(requestBody)
+                .build();
+            client.newCall(request).enqueue(new okhttp3.Callback() {
+                @Override
+                public void onFailure(Call call, IOException e) {
+                    UiHelpers.setStatus(txtStatus, "Failed to retrieve AccessToken from Google");
+                }
+
+                @Override
+                public void onResponse(Call call, Response response) throws IOException {
+                    String json = response.body().string();
+                    JsonObject obj = JsonUtils.toJsonObject(json);
+                    String accessToken = obj.get("access_token").getAsString();
+                    App.get().saveGoogleAccessToken(accessToken);
+
+                    App.get().getServiceClient().postAsync(new dtos.Authenticate()
+                        .setProvider("GoogleOAuth")
+                        .setAccessToken(accessToken)
+                        .setRememberMe(true),
+                        r -> {
+                            UiHelpers.setStatus(txtStatus, "Server google sign-in successful, opening chat...");
+                            Intent intent = new Intent(activity, MainActivity.class);
+                            stopProgressBar();
+                            startActivity(intent);
+                        },
+                        error -> {
+                            UiHelpers.setStatusError(txtStatus, "Server google sign-in failed", error);
+                            stopProgressBar();
+                        });
+                }
+            });
+        }
     }
 
     private void startProgressBar(){
diff --git a/src/androidchat/app/src/main/res/layout/login_buttons.xml b/src/androidchat/app/src/main/res/layout/login_buttons.xml
@@ -34,6 +34,11 @@
             android:layout_marginTop="30dp"
             android:layout_marginBottom="30dp" />
 
+        <com.google.android.gms.common.SignInButton
+            android:id="@+id/sign_in_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
         <Button
             android:text="Guest Login"
             android:layout_width="wrap_content"
diff --git a/src/androidchat/app/src/main/res/values/strings.xml b/src/androidchat/app/src/main/res/values/strings.xml
@@ -11,6 +11,9 @@
     <string name="twitter_key">8dXLKcaGWqrtkC02uoETHVzat</string>
     <string name="twitter_secret">v6DTRjK5o6dwSPrA5ipbMzXwMybGHuJZdcazip2KbUQtBZ4244</string>
 
+    <string name="google_key">1052104404413-ltjkinrgo98st0393ogjcc39va25ll0p.apps.googleusercontent.com</string>
+    <string name="google_secret">GXy14QuFXGArhs-ZCMS0qsil</string>
+
     <!-- For: http://localhost:11001/ -->
     <!--<string name="twitter_key">3H1FHjGbA1N0n0aT5yApA</string>-->
     <!--<string name="twitter_secret">MLrZ0ujK6DwyjlRk2YLp6HwSdoBjtuqwXeHDQLv0Q</string>-->

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`buildscript {`
`2`	`2`	`repositories {`
`3`	`3`	`maven { url 'https://maven.fabric.io/public' }`
	`4`	`+ jcenter()`
`4`	`5`	`}`
`5`	`6`
`6`	`7`	`dependencies {`
`@@ -10,6 +11,7 @@ buildscript {`
`10`	`11`	`// We recommend changing it to the latest version from our changelog:`
`11`	`12`	`// https://docs.fabric.io/android/changelog.html#fabric-gradle-plugin`
`12`	`13`	`classpath 'io.fabric.tools:gradle:1.+'`
	`14`	`+ classpath 'com.google.gms:google-services:3.0.0'`
`13`	`15`	`}`
`14`	`16`	`}`
`15`	`17`
`@@ -52,12 +54,13 @@ dependencies {`
`52`	`54`	`androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {`
`53`	`55`	`exclude group: 'com.android.support', module: 'support-annotations'`
`54`	`56`	`})`
`55`		`- compile 'com.android.support:appcompat-v7:25.2.0'`
`56`		`- compile 'com.android.support:design:25.2.0'`
	`57`	`+ compile 'com.android.support:appcompat-v7:25.3.0'`
	`58`	`+ compile 'com.android.support:design:25.3.0'`
`57`	`59`	`compile 'net.servicestack:android:1.0.31'`
`58`	`60`	`compile 'com.facebook.android:facebook-android-sdk:[4,5)'`
`59`	`61`	`compile('com.twitter.sdk.android:twitter:2.3.1@aar') {`
`60`	`62`	`transitive = true;`
`61`	`63`	`}`
	`64`	`+ compile 'com.google.android.gms:play-services-auth:10.2.1'`
`62`	`65`	`testCompile 'junit:junit:4.12'`
`63`	`66`	`}`