Add support for Google auth token as alternative to aas-token

Author: Benedikt

USAGE

@@ -28,6 +28,8 @@ Options:
           Google account email address (required if download source is Google Play)
   -t, --aas-token <google_aas_token>
           Google aas token  (required if download source is Google Play)
+      --auth-token <google_auth_token>
+          Google auth token (alternative to aas-token, e.g., from Aurora dispenser)
       --accept-tos
           Accept Google Play Terms of Service
   -s, --sleep-duration <sleep_duration>

USAGE-google-play.md

@@ -1,4 +1,8 @@
-To download directly from the Google Play Store, first you'll have to obtain an OAuth token by visiting the Google [embedded setup page](https://accounts.google.com/EmbeddedSetup) and:
+To download directly from the Google Play Store, you have two authentication options:
+
+## Option 1: Using OAuth Token (recommended for personal accounts)
+
+First, obtain an OAuth token by visiting the Google [embedded setup page](https://accounts.google.com/EmbeddedSetup) and:
 
 - Open the browser debugging console to the `Network` tab
 - Log in
@@ -20,7 +24,19 @@ An AAS token should be printed. You can use this to download an app:
 apkeep -a com.instagram.android -d google-play -e 'someone@gmail.com' -t some_aas_token .
 ```
 
-This will use a default device configuration of `px_9a`, a timezone of `UTC`, and a locale of `en_US`.  To specify a different device profile, use the `-o` option:
+## Option 2: Using AUTH Token (for token dispensers)
+
+If you have an AUTH token from a token dispenser (e.g., Aurora Store's dispenser), you can use it directly with the `--auth-token` flag:
+
+```shell
+apkeep -a com.instagram.android -d google-play -e 'dispenser_email@gmail.com' --auth-token 'ya29.a0...' --accept-tos .
+```
+
+AUTH tokens typically start with `ya29.`. The `--accept-tos` flag is recommended for first-time use with a new account to automatically accept Google Play's Terms of Service.
+
+## Device Configuration
+
+Both options will use a default device configuration of `px_9a`, a timezone of `UTC`, and a locale of `en_US`. To specify a different device profile, use the `-o` option:
 
 ```shell
 apkeep -a com.instagram.android -d google-play -o device=ad_g3_pro -e 'someone@gmail.com' -t some_aas_token .
@@ -62,12 +78,14 @@ A full list of options:
 * `include_dex_metadata`: when set to `1` or `true`, attempts to download the DexMetadata (dm) file for an app, which contains the apps' cloud profile
 * `include_additional_files`: when set to `1` or `true`, attempts to download any [additional `obb` expansion files](https://developer.android.com/google/play/expansion-files) for the app
 
-If you prefer not to provide your credentials on the command line, you can specify them in a config file named `apkeep.ini`.  This config file may have to be created, and must be located in the user config directory under the subpath `apkeep`.  Usually on Linux systems this will be `~/.config/apkeep/apkeep.ini`.  In this file specify your email and/or AAS token:
+If you prefer not to provide your credentials on the command line, you can specify them in a config file named `apkeep.ini`. This config file may have to be created, and must be located in the user config directory under the subpath `apkeep`. Usually on Linux systems this will be `~/.config/apkeep/apkeep.ini`. In this file specify your email and token:
 
 ```ini
 [google]
 email = someone@gmail.com
 aas_token = some_aas_token
+# OR use auth_token instead of aas_token:
+# auth_token = ya29.a0...
 ```
 
 Optionally, the path to this `ini` file can be specified:

src/cli.rs

@@ -123,6 +123,14 @@ pub fn app() -> Command {
                 .short('t')
                 .long("aas-token")
                 .action(ArgAction::Set)
+                .conflicts_with("google_auth_token")
+        )
+        .arg(
+            Arg::new("google_auth_token")
+                .help("Google auth token (alternative to aas-token, e.g., from Aurora dispenser)")
+                .long("auth-token")
+                .action(ArgAction::Set)
+                .conflicts_with("google_aas_token")
         )
         .arg(
             Arg::new("google_accept_tos")

src/download_sources/google_play.rs

@@ -15,7 +15,8 @@ pub async fn download_apps(
     parallel: usize,
     sleep_duration: u64,
     email: &str,
-    aas_token: &str,
+    aas_token: Option<&str>,
+    auth_token: Option<&str>,
     outpath: &Path,
     accept_tos: bool,
     mut options: HashMap<&str, &str>,
@@ -44,21 +45,25 @@ pub async fn download_apps(
         gpa.set_timezone(timezone);
     }
 
-    gpa.set_aas_token(aas_token);
+    // Set the appropriate token type
+    if let Some(aas) = aas_token {
+        gpa.set_aas_token(aas);
+    } else if let Some(auth) = auth_token {
+        gpa.set_auth_token(auth);
+    } else {
+        eprintln!("Either AAS token or AUTH token must be provided");
+        std::process::exit(1);
+    }
     if let Err(err) = gpa.login().await {
         match err.kind() {
             GpapiErrorKind::TermsOfService => {
                 if accept_tos {
                     match gpa.accept_tos().await {
                         Ok(_) => {
-                            if let Err(_) = gpa.login().await {
-                                eprintln!("Could not log in, even after accepting the Google Play Terms of Service");
-                                std::process::exit(1);
-                            }
                             println!("Google Play Terms of Service accepted.");
                         },
-                        _ => {
-                            eprintln!("Could not accept Google Play Terms of Service");
+                        Err(e) => {
+                            eprintln!("Could not accept Google Play Terms of Service: {}", e);
                             std::process::exit(1);
                         },
                     }

src/main.rs

@@ -322,6 +322,7 @@ async fn main() {
                     ).await;
                 } else {
                     let mut aas_token = matches.get_one::<String>("google_aas_token").map(|v| v.to_string());
+                    let mut auth_token = matches.get_one::<String>("google_auth_token").map(|v| v.to_string());
                     let accept_tos = match matches.get_one::<bool>("google_accept_tos") {
                         Some(true) => true,
                         _ => false,
@@ -339,13 +340,16 @@ async fn main() {
                         }
                     });
 
-                    if email.is_none() || aas_token.is_none() {
+                    if email.is_none() || (aas_token.is_none() && auth_token.is_none()) {
                         if let Ok(conf) = load_config(ini_file) {
                             if email.is_none() {
                                 email = conf.get("google", "email");
                             }
-                            if aas_token.is_none() {
+                            if aas_token.is_none() && auth_token.is_none() {
                                 aas_token = conf.get("google", "aas_token");
+                                if aas_token.is_none() {
+                                    auth_token = conf.get("google", "auth_token");
+                                }
                             }
                         }
                     }
@@ -358,20 +362,27 @@ async fn main() {
                         email = Some(prompt_email.trim().to_string());
                     }
 
-                    if aas_token.is_none() {
-                        let mut prompt_aas_token = String::new();
-                        print!("AAS Token: ");
+                    if aas_token.is_none() && auth_token.is_none() {
+                        let mut prompt_token = String::new();
+                        print!("AAS Token (or AUTH Token): ");
                         io::stdout().flush().unwrap();
-                        io::stdin().read_line(&mut prompt_aas_token).unwrap();
-                        aas_token = Some(prompt_aas_token.trim().to_string());
+                        io::stdin().read_line(&mut prompt_token).unwrap();
+                        let token = prompt_token.trim().to_string();
+                        // Heuristic: AUTH tokens typically start with "ya29."
+                        if token.starts_with("ya29.") {
+                            auth_token = Some(token);
+                        } else {
+                            aas_token = Some(token);
+                        }
                     }
 
                     google_play::download_apps(
                         list,
                         parallel,
                         sleep_duration,
                         &email.unwrap(),
-                        &aas_token.unwrap(),
+                        aas_token.as_deref(),
+                        auth_token.as_deref(),
                         &outpath.unwrap(),
                         accept_tos,
                         options,