Second attempt to implement SMS 2FA for #51

Dadoum · May 30, 2024 · 96c27b9 · 96c27b9
1 parent 408bdc0
commit 96c27b9
Showing 1 changed file with 31 additions and 13 deletions.
diff --git a/source/server/appleaccount.d b/source/server/appleaccount.d
@@ -144,20 +144,38 @@ package class AppleAccount {
 
             // submits the given code to Apple servers
             AppleSecondaryActionResponse response = AppleSecondaryActionResponse(AppleLoginError(AppleLoginErrorCode.no2FAAttempt, "2FA has not been completed."));
-            AppleSecondaryActionResponse delegate(string) submitCode = (string code) {
-                request.headers["security-code"] = code;
-                auto codeValidationPlist = Plist.fromXml(request.get(urls["validateCode"]).responseBody().data!string()).dict();
-                log.traceF!"2FA response: %s"(codeValidationPlist.toXml());
-                auto resultCode = codeValidationPlist["ec"].uinteger().native();
-
-                if (resultCode == 0) {
-                    response = AppleSecondaryActionResponse(ReloginNeeded());
-                } else {
-                    response = AppleSecondaryActionResponse(AppleLoginError(cast(AppleLoginErrorCode) resultCode, codeValidationPlist["em"].str().native()));
-                }
+            AppleSecondaryActionResponse delegate(string) submitCode;
+            if (urlBagKey == "trustedDeviceSecondaryAuth") {
+                submitCode = (string code) {
+                    request.headers["security-code"] = code;
+                    auto codeValidationPlist = Plist.fromXml(request.get(urls["validateCode"]).responseBody().data!string()).dict();
+                    log.traceF!"2FA response: %s"(codeValidationPlist.toXml());
+                    auto resultCode = codeValidationPlist["ec"].uinteger().native();
+
+                    if (resultCode == 0) {
+                        response = AppleSecondaryActionResponse(ReloginNeeded());
+                    } else {
+                        response = AppleSecondaryActionResponse(AppleLoginError(cast(AppleLoginErrorCode) resultCode, codeValidationPlist["em"].str().native()));
+                    }
+
+                    return response;
+                };
+            } else if (urlBagKey == "secondaryAuth") {
+                submitCode = (string code) {
+                    auto codeValidationPlist = Plist.fromXml(request.post(urls["validateCode"], [ "securityCode": code ]).responseBody().data!string()).dict();
+                    log.traceF!"2FA response: %s"(codeValidationPlist.toXml());
+                    auto resultCode = codeValidationPlist["ec"].uinteger().native();
+
+                    if (resultCode == 0) {
+                        response = AppleSecondaryActionResponse(ReloginNeeded());
+                    } else {
+                        response = AppleSecondaryActionResponse(AppleLoginError(cast(AppleLoginErrorCode) resultCode, codeValidationPlist["em"].str().native()));
+                    }
+
+                    return response;
+                };
+            }
 
-                return response;
-            };
 
             tfaHandler(sendCode, submitCode);
             return response;