Add more entitlement options, rename Apple ID to Apple Account, andadd debug toggle

Author: NovaDev404

iRAM-Plus/AppIDViewModel.swift

@@ -5,6 +5,7 @@
 //  Created by s s on 2025/3/15.
 //
 import SwiftUI
+import Foundation
 import StosSign_API_NoCertificate
 import StosSign_Auth
 
@@ -35,6 +36,8 @@ class AppIDModel : ObservableObject, Hashable {
 
         try await AppleAPI.shared.refreshAnisetteDataIfNeeded(for: session)
 
+        let enableExtendedVirtualAddressing = UserDefaults.standard.bool(forKey: "enableExtendedVirtualAddressing")
+        
         let dateFormatter = ISO8601DateFormatter()
         let httpHeaders = [
             "Content-Type": "application/vnd.api+json",
@@ -56,10 +59,67 @@ class AppIDModel : ObservableObject, Hashable {
             "X-Apple-I-TimeZone": session.anisetteData.timeZone.abbreviation()!
         ] as [String : String];
 
+        // Build capabilities array based on settings
+        var capabilities: [[String: Any]] = [
+            [
+                "relationships": [
+                    "capability": [
+                        "data": [
+                            "id": "INCREASED_MEMORY_LIMIT",
+                            "type": "capabilities"
+                        ]
+                    ]
+                ],
+                "type": "bundleIdCapabilities",
+                "attributes": [
+                    "settings": [],
+                    "enabled": true
+                ]
+            ]
+        ]
+        
+        if enableExtendedVirtualAddressing {
+            capabilities.append([
+                "relationships": [
+                    "capability": [
+                        "data": [
+                            "id": "EXTENDED_VIRTUAL_ADDRESSING",
+                            "type": "capabilities"
+                        ]
+                    ]
+                ],
+                "type": "bundleIdCapabilities",
+                "attributes": [
+                    "settings": [],
+                    "enabled": true
+                ]
+            ])
+        }
+        
+        let requestBody: [String: Any] = [
+            "data": [
+                "relationships": [
+                    "bundleIdCapabilities": [
+                        "data": capabilities
+                    ]
+                ],
+                "id": appID.identifier,
+                "attributes": [
+                    "hasExclusiveManagedCapabilities": false,
+                    "teamId": team.identifier,
+                    "bundleType": "bundle",
+                    "identifier": appID.bundleIdentifier,
+                    "seedId": team.identifier,
+                    "name": appID.name
+                ],
+                "type": "bundleIds"
+            ]
+        ]
+        
         var request = URLRequest(url: URL(string: "https://developerservices2.apple.com/services/v1/bundleIds/\(appID.identifier)")!)
         request.httpMethod = "PATCH"
         request.allHTTPHeaderFields = httpHeaders
-        request.httpBody = "{\"data\":{\"relationships\":{\"bundleIdCapabilities\":{\"data\":[{\"relationships\":{\"capability\":{\"data\":{\"id\":\"INCREASED_MEMORY_LIMIT\",\"type\":\"capabilities\"}}},\"type\":\"bundleIdCapabilities\",\"attributes\":{\"settings\":[],\"enabled\":true}}]}},\"id\":\"\(appID.identifier)\",\"attributes\":{\"hasExclusiveManagedCapabilities\":false,\"teamId\":\"\(team.identifier)\",\"bundleType\":\"bundle\",\"identifier\":\"\(appID.bundleIdentifier)\",\"seedId\":\"\(team.identifier)\",\"name\":\"\(appID.name)\"},\"type\":\"bundleIds\"}}".data(using: .utf8)
+        request.httpBody = try JSONSerialization.data(withJSONObject: requestBody)
 
         let (data, response) = try await URLSession.shared.data(for: request)
         let responseString = String(data: data, encoding: .utf8) ?? "Unable to decode response."
@@ -70,7 +130,12 @@ class AppIDModel : ObservableObject, Hashable {
         }
 
         await MainActor.run {
-            result = "✅ Success! Increased Memory Limit capability has been enabled.\n\nAPI Response:\n\(responseString)"
+            var successMessage = "✅ Success! Increased Memory Limit capability has been enabled."
+            if enableExtendedVirtualAddressing {
+                successMessage += "\n\nExtended Virtual Addressing capability has also been enabled."
+            }
+            successMessage += "\n\nAPI Response:\n\(responseString)"
+            result = successMessage
         }
 
     }

iRAM-Plus/Keychain.swift

@@ -45,35 +45,18 @@ public class Keychain
 
     fileprivate let keychain = SystemKeychain(service: Bundle.main.bundleIdentifier!)
 
-    @KeychainItem(key: "appleIDEmailAddress")
-    public var appleIDEmailAddress: String?
-    
-    @KeychainItem(key: "appleIDPassword")
-    public var appleIDPassword: String?
-    
-    @KeychainItem(key: "signingCertificatePrivateKey")
-    public var signingCertificatePrivateKey: Data?
-    
-    @KeychainItem(key: "signingCertificateSerialNumber")
-    public var signingCertificateSerialNumber: String?
-    
-    @KeychainItem(key: "signingCertificate")
-    public var signingCertificate: Data?
-    
-    @KeychainItem(key: "signingCertificatePassword")
-    public var signingCertificatePassword: String?
+    @KeychainItem(key: "appleAccountEmailAddress")
+    public var appleAccountEmailAddress: String?
 
-    @KeychainItem(key: "patreonAccessToken")
-    public var patreonAccessToken: String?
+    @KeychainItem(key: "appleAccountPassword")
+    public var appleAccountPassword: String?
 
-    @KeychainItem(key: "patreonRefreshToken")
-    public var patreonRefreshToken: String?
-    
-    @KeychainItem(key: "patreonCreatorAccessToken")
-    public var patreonCreatorAccessToken: String?
+    // Old keychain keys for backward compatibility
+    @KeychainItem(key: "appleIDEmailAddress")
+    private var oldAppleIDEmailAddress: String?
 
-    @KeychainItem(key: "patreonAccountID")
-    public var patreonAccountID: String?
+    @KeychainItem(key: "appleIDPassword")
+    private var oldAppleIDPassword: String?
 
     @KeychainItem(key: "identifier")
     public var identifier: String?
@@ -87,10 +70,22 @@ public class Keychain
 
     public func reset()
     {
-        self.appleIDEmailAddress = nil
-        self.appleIDPassword = nil
-        self.signingCertificatePrivateKey = nil
-        self.signingCertificateSerialNumber = nil
+        self.appleAccountEmailAddress = nil
+        self.appleAccountPassword = nil
+        self.identifier = nil
+        self.adiPb = nil
+    }
+    
+    public func migrateOldCredentials() {
+        // If new keys are empty but old keys have values, migrate them
+        if appleAccountEmailAddress == nil && oldAppleIDEmailAddress != nil {
+            appleAccountEmailAddress = oldAppleIDEmailAddress
+            oldAppleIDEmailAddress = nil // Clear old value after migration
+        }
+        if appleAccountPassword == nil && oldAppleIDPassword != nil {
+            appleAccountPassword = oldAppleIDPassword
+            oldAppleIDPassword = nil // Clear old value after migration
+        }
     }
 }
 

iRAM-Plus/LoginViewModel.swift

@@ -9,7 +9,7 @@ import StosSign_API_NoCertificate
 import StosSign_Auth
 
 class LoginViewModel: ObservableObject {
-    @Published var appleID = ""
+    @Published var appleAccount = ""
     @Published var password = ""
     @Published var needVerificationCode = false
     @Published var verificationCode = ""
@@ -90,7 +90,7 @@ class LoginViewModel: ObservableObject {
                 guard let self else { return }
                 if !self.needVerificationCode {
                     self.verificationCodeHandler = nil
-                    self.appleID = ""
+                    self.appleAccount = ""
                     self.password = ""
                     self.verificationCode = ""
                     self.isLoginInProgress = false
@@ -112,7 +112,7 @@ class LoginViewModel: ObservableObject {
             await MainActor.run {
                 progressCallback?(0.4, "Authenticating with Apple")
             }
-            let (account, session) = try await AppleAPI.shared.authenticate(appleID: appleID, password: password, anisetteData: anisetteData) { [weak self] completionHandler in
+            let (account, session) = try await AppleAPI.shared.authenticate(appleID: appleAccount, password: password, anisetteData: anisetteData) { [weak self] completionHandler in
                 guard let self else {
                     completionHandler(nil)
                     return
@@ -238,7 +238,7 @@ class LoginViewModel: ObservableObject {
         // Cleanup after successful 2FA
         await MainActor.run {
             verificationCodeHandler = nil
-            appleID = ""
+            appleAccount = ""
             password = ""
             needVerificationCode = false
             verificationCode = ""

iRAM-Plus/SideStoreAccount.swift

@@ -86,8 +86,8 @@ enum SideStoreAccountImporter {
             throw SideStoreAccountImportError.invalidLocalUser
         }
 
-        Keychain.shared.appleIDEmailAddress = email
-        Keychain.shared.appleIDPassword = password
+        Keychain.shared.appleAccountEmailAddress = email
+        Keychain.shared.appleAccountPassword = password
         Keychain.shared.adiPb = adiPB
         Keychain.shared.identifier = localUser
         AnisetteDataHelper.shared.resetClientInfo()

iRAM-Plus/WizardViewModel.swift

@@ -75,6 +75,21 @@ class WizardViewModel: ObservableObject {
     @Published var saveLoginToKeychain = UserDefaults.standard.bool(forKey: "saveLoginToKeychain") {
         didSet {
             UserDefaults.standard.set(saveLoginToKeychain, forKey: "saveLoginToKeychain")
+            // Clear keychain when toggle is turned off
+            if !saveLoginToKeychain {
+                Keychain.shared.appleAccountEmailAddress = nil
+                Keychain.shared.appleAccountPassword = nil
+            }
+        }
+    }
+    @Published var enableExtendedVirtualAddressing = UserDefaults.standard.bool(forKey: "enableExtendedVirtualAddressing") {
+        didSet {
+            UserDefaults.standard.set(enableExtendedVirtualAddressing, forKey: "enableExtendedVirtualAddressing")
+        }
+    }
+    @Published var enableDebugging = UserDefaults.standard.bool(forKey: "enableDebugging") {
+        didSet {
+            UserDefaults.standard.set(enableDebugging, forKey: "enableDebugging")
         }
     }
     @Published var anisetteServers: [AnisetteServer] = []
@@ -141,8 +156,8 @@ class WizardViewModel: ObservableObject {
         let sharedModel = DataManager.shared.model
         Keychain.shared.adiPb = nil
         Keychain.shared.identifier = nil
-        Keychain.shared.appleIDPassword = nil
-        Keychain.shared.appleIDEmailAddress = nil
+        Keychain.shared.appleAccountPassword = nil
+        Keychain.shared.appleAccountEmailAddress = nil
         AnisetteDataHelper.shared.resetClientInfo()
         sharedModel.session = nil
         sharedModel.account = nil
@@ -153,7 +168,7 @@ class WizardViewModel: ObservableObject {
     }
 
     func resetLoginState() {
-        loginViewModel.appleID = ""
+        loginViewModel.appleAccount = ""
         loginViewModel.password = ""
         loginViewModel.needVerificationCode = false
         loginViewModel.verificationCode = ""