From 249c935f449f94778911218d79ec92737d907999 Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Wed, 2 Dec 2015 23:55:47 -0800
Subject: [PATCH] Update Auth API

---
 extern/GmsApi                                 |  2 +-
 .../src/main/AndroidManifest.xml              |  4 +--
 .../java/org/microg/gms/auth/AuthManager.java |  9 +++++-
 .../gms/auth/AuthManagerServiceImpl.java      | 29 ++++++++++++++-----
 .../org/microg/gms/auth/AuthResponse.java     | 26 +++++++++++++++++
 5 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/extern/GmsApi b/extern/GmsApi
index 5ed675a9..a55281ec 160000
--- a/extern/GmsApi
+++ b/extern/GmsApi
@@ -1 +1 @@
-Subproject commit 5ed675a90b0d9831b06845ba2b95d7de3433acf6
+Subproject commit a55281ec5d48681e071b85290fc020ea56af482c
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 3c1fd1b8..d43ace4e 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest
     package="com.google.android.gms"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="8115238"
-    android:versionName="8.1.15 (microG v0.01)">
+    android:versionCode="8489238"
+    android:versionName="8.4.89 (microG v0.02)">
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
index b8e102e1..49d11406 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java
@@ -25,6 +25,7 @@ import android.util.Log;
 
 import com.google.android.gms.R;
 
+import org.microg.gms.common.Constants;
 import org.microg.gms.common.PackageUtils;
 
 import java.io.IOException;
@@ -120,12 +121,13 @@ public class AuthManager {
     }
 
     public String peekAuthToken() {
+        Log.d(TAG, "peekAuthToken: " + buildTokenKey());
         return getAccountManager().peekAuthToken(getAccount(), buildTokenKey());
     }
 
     public String getAuthToken() {
         if (service.startsWith("weblogin:")) return null;
-        if (getExpiry() != -1 && getExpiry() < System.currentTimeMillis() / 1000L) {
+        if (getExpiry() < System.currentTimeMillis() / 1000L) {
             Log.d(TAG, "token present, but expired");
             return null;
         }
@@ -178,6 +180,11 @@ public class AuthManager {
     }
 
     public AuthResponse requestAuth(boolean legacy) throws IOException {
+        if (service.equals(Constants.SCOPE_GET_ACCOUNT_ID)) {
+            AuthResponse response = new AuthResponse();
+            response.accountId = response.auth = getAccountManager().getUserData(getAccount(), "GoogleUserId");
+            return response;
+        }
         if (isPermitted() || isTrustGooglePermitted(context)) {
             String token = getAuthToken();
             if (token != null) {
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
index a2eee641..0b3b74ff 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java
@@ -32,10 +32,14 @@ import com.google.android.auth.IAuthManagerService;
 import com.google.android.gms.R;
 import com.google.android.gms.auth.AccountChangeEventsRequest;
 import com.google.android.gms.auth.AccountChangeEventsResponse;
+import com.google.android.gms.auth.TokenData;
+import com.google.android.gms.common.api.Scope;
 
 import org.microg.gms.common.PackageUtils;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static android.accounts.AccountManager.KEY_ACCOUNT_NAME;
 import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE;
@@ -83,16 +87,19 @@ public class AuthManagerServiceImpl extends IAuthManagerService.Stub {
         scope = scope.replace("https://www.googleapis.com/auth/identity.plus.page.impersonation ", "");
 
         AuthManager authManager = new AuthManager(context, accountName, packageName, scope);
+        Bundle result = new Bundle();
+        result.putString(KEY_ACCOUNT_NAME, accountName);
+        result.putString(KEY_ACCOUNT_TYPE, authManager.getAccountType());
         try {
             AuthResponse res = authManager.requestAuth(false);
             if (res.auth != null) {
-                Log.d(TAG, "getToken: " + res.auth);
-                Bundle result = new Bundle();
+                Log.d(TAG, "getToken: " + res);
                 result.putString(KEY_AUTHTOKEN, res.auth);
+                Bundle details = new Bundle();
+                details.putParcelable("TokenData", new TokenData(res.auth, res.expiry, scope.startsWith("oauth2:"), getScopes(scope)));
+                result.putBundle("tokenDetails", details);
                 result.putString(KEY_ERROR, "OK");
-                return result;
             } else {
-                Bundle result = new Bundle();
                 result.putString(KEY_ERROR, "NeedPermission");
                 Intent i = new Intent(context, AskPermissionActivity.class);
                 i.putExtras(extras);
@@ -116,14 +123,22 @@ public class AuthManagerServiceImpl extends IAuthManagerService.Stub {
                             .build());
                 }
                 result.putParcelable(KEY_USER_RECOVERY_INTENT, i);
-                return result;
             }
         } catch (IOException e) {
             Log.w(TAG, e);
-            Bundle result = new Bundle();
             result.putString(KEY_ERROR, "NetworkError");
-            return result;
         }
+        return result;
+    }
+
+    private List<Scope> getScopes(String scope) {
+        if (!scope.startsWith("oauth2:")) return null;
+        String[] strings = scope.substring(7).split(" ");
+        List<Scope> res = new ArrayList<Scope>();
+        for (String string : strings) {
+            res.add(new Scope(string));
+        }
+        return res;
     }
 
     private static CharSequence getPackageLabel(String packageName, PackageManager pm) {
diff --git a/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java
index 24fb4c64..af585964 100644
--- a/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java
+++ b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java
@@ -92,4 +92,30 @@ public class AuthResponse {
         }
         return response;
     }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("AuthResponse{");
+        sb.append("auth='").append(auth).append('\'');
+        if (Sid != null) sb.append(", Sid='").append(Sid).append('\'');
+        if (LSid != null) sb.append(", LSid='").append(LSid).append('\'');
+        if (token != null) sb.append(", token='").append(token).append('\'');
+        if (email != null) sb.append(", email='").append(email).append('\'');
+        if (services != null) sb.append(", services='").append(services).append('\'');
+        if (isGooglePlusUpgrade) sb.append(", isGooglePlusUpgrade=").append(isGooglePlusUpgrade);
+        if (picasaUserName != null) sb.append(", picasaUserName='").append(picasaUserName).append('\'');
+        if (ropText != null) sb.append(", ropText='").append(ropText).append('\'');
+        if (ropRevision != 0) sb.append(", ropRevision=").append(ropRevision);
+        if (firstName != null) sb.append(", firstName='").append(firstName).append('\'');
+        if (lastName != null) sb.append(", lastName='").append(lastName).append('\'');
+        if (issueAdvice != null) sb.append(", issueAdvice='").append(issueAdvice).append('\'');
+        if (accountId != null) sb.append(", accountId='").append(accountId).append('\'');
+        if (expiry != -1) sb.append(", expiry=").append(expiry);
+        if (!storeConsentRemotely) sb.append(", storeConsentRemotely=").append(storeConsentRemotely);
+        if (permission != null) sb.append(", permission='").append(permission).append('\'');
+        if (scopeConsentDetails != null) sb.append(", scopeConsentDetails='").append(scopeConsentDetails).append('\'');
+        if (consentDataBase64 != null) sb.append(", consentDataBase64='").append(consentDataBase64).append('\'');
+        sb.append('}');
+        return sb.toString();
+    }
 }