Merge remote-tracking branch 'nonint/main'

Implement the environment credential code (again) from Dadoum#40
Remove old fix 570a3a6 from steilerDev/Sideloader to allow merge

Author: Lethaltail

README.md

@@ -55,6 +55,8 @@ Optional arguments:
   -h, --help     Show this help message and exit                                                                                                                                                                      
 ```
 
+Additionally, AppleID user and password can be set via the environment variables `APPLE_ID_USER` and `APPLE_ID_PWD`.
+
 Table of Contents
 =================
 

frontends/cli/source/cli_frontend.d

@@ -110,24 +110,29 @@ DeveloperSession login(Device device, ADI adi, bool interactive) {
     // ...
 
     if (account) return null;
-    if (!interactive) {
+    string appleId = environment.get("APPLE_ID_USER");
+    string password = environment.get("APPLE_ID_PWD");
+    if(interactive && (appleId is null || password is null)) {
+        log.info("Please enter your account informations. They will only be sent to Apple servers.");
+        log.info("See it for yourself at https://github.com/Dadoum/Sideloader/");
+
+        write("Apple ID: ");
+        appleId = readln().chomp();
+        password = readPasswordLine("Password: ");
+    }
+
+    if (appleId is null || password is null) {
         log.error("You are not logged in. (use `sidestore login` to log-in, or add `-i` to make us ask you the account)");
         return null;
     }
 
-    log.info("Please enter your account informations. They will only be sent to Apple servers.");
-    log.info("See it for yourself at https://github.com/Dadoum/Sideloader/");
-
-    write("Apple ID: ");
-    string appleId = readln().chomp();
-    string password = readPasswordLine("Password: ");
-
     return DeveloperSession.login(
         device,
         adi,
         appleId,
         password,
         (sendCode, submitCode) {
+            if(!interactive) return;
             sendCode();
             string code;
             do {