From 0039e523299443d5d6d7d46b447eb0701ade07fc Mon Sep 17 00:00:00 2001 From: Ben Chatelain Date: Wed, 21 Feb 2018 09:18:47 -0700 Subject: [PATCH] Update private headers from macOS High Sierra 10.13.3 (17D2047) --- App/AppStore/ISStoreAccount.swift | 48 ++++++++++++------- .../CommerceKit/CKAccountStore.h | 32 +++++++++---- .../CommerceKit/CKDownloadQueue.h | 8 +++- .../CommerceKit/CKPurchaseController.h | 14 ++++-- .../CommerceKit/CKServiceInterface.h | 2 +- .../CommerceKit/CKSoftwareMap.h | 13 +++-- .../CommerceKit/CKUpdateController.h | 23 ++++++++- .../StoreFoundation/CKSoftwareProduct.h | 4 +- .../ISAccountService-Protocol.h | 48 ++++++++----------- .../ISAuthenticationResponse.h | 13 +++++ .../StoreFoundation/ISServiceProxy.h | 5 ++ .../StoreFoundation/ISStoreAccount.h | 6 +++ .../StoreFoundation/ISStoreClient.h | 4 ++ .../StoreFoundation/SSDownload.h | 1 + .../StoreFoundation/SSPurchase.h | 7 ++- App/mas-cli-Bridging-Header.h | 1 + 16 files changed, 161 insertions(+), 68 deletions(-) create mode 100644 App/PrivateHeaders/StoreFoundation/ISAuthenticationResponse.h diff --git a/App/AppStore/ISStoreAccount.swift b/App/AppStore/ISStoreAccount.swift index b610350..c833fd2 100644 --- a/App/AppStore/ISStoreAccount.swift +++ b/App/AppStore/ISStoreAccount.swift @@ -23,30 +23,46 @@ extension ISStoreAccount { let client = ISStoreClient(storeClientType: 0) accountService.setStoreClient(client) - let context = ISAuthenticationContext(accountID: 0)! - context.appleIDOverride = username - - if systemDialog { - context.appleIDOverride = username - } else { - context.demoMode = true - context.demoAccountName = username - context.demoAccountPassword = password - context.demoAutologinMode = true - } - +// let context = ISAuthenticationContext(accountID: 0)! +// context.appleIDOverride = username +// +// if systemDialog { +// context.appleIDOverride = username +// } else { +// context.demoMode = true +// context.demoAccountName = username +// context.demoAccountPassword = password +// context.demoAutologinMode = true +// } + let group = DispatchGroup() group.enter() - - accountService.signIn(with: context) { success, _account, _error in - if success { + + accountService.account(withAppleID: username) { (storeAccount: ISStoreAccount?) in + if let _account = storeAccount { + _account.password = password +// accountService.add(_account) + accountService.addAccount(authenticationResponse: ISAuthenticationResponse, makePrimary: true) { (storeAccount: ISStoreAccount?) + if let _account = storeAccount { + account = _account + } + } account = _account } else { - error = .signInFailed(error: _error as NSError?) + // TODO: Handle failed AppleID lookup } group.leave() } +// accountService.signIn(with: context) { success, _account, _error in +// if success { +// account = _account +// } else { +// error = .signInFailed(error: _error as NSError?) +// } +// group.leave() +// } + if systemDialog { group.wait() } else { diff --git a/App/PrivateHeaders/CommerceKit/CKAccountStore.h b/App/PrivateHeaders/CommerceKit/CKAccountStore.h index 37fdc34..fc793aa 100644 --- a/App/PrivateHeaders/CommerceKit/CKAccountStore.h +++ b/App/PrivateHeaders/CommerceKit/CKAccountStore.h @@ -8,30 +8,46 @@ #import "ISStoreURLOperationDelegate-Protocol.h" -@class ISStoreAccount, NSArray, NSString; +@class CKDemoAccount, CKStoreAccount, CKStoreClient, ISStoreAccount, NSArray, NSString; @interface CKAccountStore : CKServiceInterface { +// CKStoreClient *_storeClient; } + (CKAccountStore *)sharedAccountStore; -- (void)removePrimaryAccountObserver:(id)arg1; -//- (id)addPrimaryAccountObserverWithBlock:(CDUnknownBlockType)arg1; ++ (id)accountStoreForStoreClient:(id)arg1; +@property(readonly) CKStoreClient *storeClient; // @synthesize storeClient=_storeClient; +//- (void).cxx_destruct; +//- (void)getTouchIDStateForAccount:(id)arg1 completionBlock:(CDUnknownBlockType)arg2; +//- (void)setTouchIDStateForAccount:(id)arg1 state:(long long)arg2 completionBlock:(CDUnknownBlockType)arg3; //- (void)updatePasswordSettings:(id)arg1 completionBlock:(CDUnknownBlockType)arg2; //- (void)getPasswordSettingsWithCompletionBlock:(CDUnknownBlockType)arg1; //- (void)getEligibilityForService:(long long)arg1 completionBlock:(CDUnknownBlockType)arg2; - (id)eligibilityForService:(long long)arg1; -- (void)signOut; - (void)viewAccount; -- (void)signIn; //- (void)signInWithSuggestedAppleID:(id)arg1 allowChangeOfAppleID:(BOOL)arg2 completionHandler:(CDUnknownBlockType)arg3; +- (void)signIn; - (void)addAccount:(id)arg1; +@property(readonly) NSArray *accounts; - (id)accountWithAppleID:(id)arg1; - (id)accountForDSID:(id)arg1; -@property(readonly) BOOL primaryAccountIsPresentAndSignedIn; @property(readonly) ISStoreAccount *primaryAccount; -@property(readonly) NSArray *accounts; -- (id)init; +- (void)removePrimaryAccountObserver:(id)arg1; +//- (id)addPrimaryAccountObserverWithBlock:(CDUnknownBlockType)arg1; +- (id)initWithStoreClient:(id)arg1; +- (void)removeAccountObserver:(id)arg1; +- (id)addAccountObserver:(id)arg1; +//- (void)signOutWithCompletionHandler:(CDUnknownBlockType)arg1; +- (void)signOut; +- (id)storeAccountForAppleID:(id)arg1; +- (id)storeAccountForDSID:(id)arg1; +@property(readonly) BOOL primaryAccountIsPresentAndSignedIn; +@property(readonly) CKStoreAccount *primaryStoreAccount; +@property(readonly) CKDemoAccount *demoAccount; +@property(readonly) BOOL isDemoModeEnabled; +@property(readonly) NSArray *knownAccounts; +- (id)_initWithStoreClient:(id)arg1; @end diff --git a/App/PrivateHeaders/CommerceKit/CKDownloadQueue.h b/App/PrivateHeaders/CommerceKit/CKDownloadQueue.h index 3784b83..d170f25 100644 --- a/App/PrivateHeaders/CommerceKit/CKDownloadQueue.h +++ b/App/PrivateHeaders/CommerceKit/CKDownloadQueue.h @@ -8,21 +8,26 @@ @class NSArray, NSLock, NSMutableDictionary, CKDownloadQueueClient; @protocol CKDownloadQueueObserver; +@class CKDownloadQueueClient, NSArray, NSLock, NSMutableDictionary; @interface CKDownloadQueue : CKServiceInterface { NSMutableDictionary *_downloadsByItemID; NSLock *_downloadsLock; + NSMutableDictionary *_downloadQueueObservers; + CKDownloadQueueClient *_sharedObserver; } + (CKDownloadQueue *)sharedDownloadQueue; +@property(retain, nonatomic) CKDownloadQueueClient *sharedObserver; // @synthesize sharedObserver=_sharedObserver; +@property(retain, nonatomic) NSMutableDictionary *downloadQueueObservers; // @synthesize downloadQueueObservers=_downloadQueueObservers; //- (void).cxx_destruct; - (BOOL)cacheReceiptDataForDownload:(id)arg1; - (void)checkStoreDownloadQueueForAccount:(id)arg1; -- (void)recoverAvailableDiskSpace; - (void)lockedApplicationTriedToLaunchAtPath:(id)arg1; - (void)unlockApplicationsWithBundleIdentifier:(id)arg1; - (void)lockApplicationsForBundleID:(id)arg1; +- (void)performedIconAnimationForDownloadWithIdentifier:(unsigned long long)arg1; //- (void)fetchIconForItemIdentifier:(unsigned long long)arg1 atURL:(id)arg2 replyBlock:(CDUnknownBlockType)arg3; - (void)removeDownloadWithItemIdentifier:(unsigned long long)arg1; - (void)cancelDownload:(id)arg1 promptToConfirm:(BOOL)arg2 askToDelete:(BOOL)arg3; @@ -35,6 +40,7 @@ - (id)addObserver:(id)arg1; - (id)addObserver:(id)arg1 forDownloadTypes:(long long)arg2; //- (id)addObserverForDownloadTypes:(long long)arg1 withBlock:(CDUnknownBlockType)arg2; +- (void)connectionWasInterrupted; - (id)initWithStoreClient:(id)arg1; @end diff --git a/App/PrivateHeaders/CommerceKit/CKPurchaseController.h b/App/PrivateHeaders/CommerceKit/CKPurchaseController.h index 0dfba60..2bd89ae 100644 --- a/App/PrivateHeaders/CommerceKit/CKPurchaseController.h +++ b/App/PrivateHeaders/CommerceKit/CKPurchaseController.h @@ -8,6 +8,11 @@ #import @class SSPurchaseResponse; +@class NSArray, NSMutableArray, NSNumber; + +NS_ASSUME_NONNULL_BEGIN + +typedef void (^SSPurchaseCompletion)(SSPurchase * _Nullable purchase, BOOL completed, NSError * _Nullable error, SSPurchaseResponse * _Nullable response); @interface CKPurchaseController : CKServiceInterface { @@ -20,10 +25,9 @@ } + (void)setNeedsSilentMachineAuthorization:(BOOL)arg1; -+ (CKPurchaseController *)sharedPurchaseController; -- (void)performPurchase:(SSPurchase *)purchase withOptions:(NSUInteger)options completionHandler:(void(^)(SSPurchase *, BOOL, NSError*, SSPurchaseResponse *))completionHandler; - ++ (CKPurchaseController * _Nonnull)sharedPurchaseController; //@property(copy) CDUnknownBlockType dialogHandler; // @synthesize dialogHandler=_dialogHandler; +//- (void).cxx_destruct; //- (BOOL)adoptionCompletedForBundleID:(id)arg1; //- (void)_performVPPReceiptRenewal; //- (void)checkServerDownloadQueue; @@ -32,7 +36,9 @@ //- (void)cancelPurchaseWithProductID:(id)arg1; //- (void)resumeDownloadForPurchasedProductID:(id)arg1; //- (void)startPurchases:(NSArray *)purchases shouldStartDownloads:(BOOL)downloads eventHandler:(CDUnknownBlockType)arg3; -//- (void)checkInstallRequirementsAtURL:(id)arg1 productID:(id)arg2 completionHandler:(CDUnknownBlockType)arg3; +//- (void)startPurchases:(NSArray *)purchases withOptions:(unsigned long long)arg2 completionHandler:(CDUnknownBlockType)arg3; +- (void)performPurchase:(SSPurchase * _Nonnull)purchase withOptions:(unsigned long long)arg2 completionHandler:(SSPurchaseCompletion _Nullable)completionHandler; @end +NS_ASSUME_NONNULL_END diff --git a/App/PrivateHeaders/CommerceKit/CKServiceInterface.h b/App/PrivateHeaders/CommerceKit/CKServiceInterface.h index 501dadd..14a2639 100644 --- a/App/PrivateHeaders/CommerceKit/CKServiceInterface.h +++ b/App/PrivateHeaders/CommerceKit/CKServiceInterface.h @@ -4,7 +4,7 @@ // class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard. // -#import +#import "ISServiceProxy.h" @interface CKServiceInterface : ISServiceProxy { diff --git a/App/PrivateHeaders/CommerceKit/CKSoftwareMap.h b/App/PrivateHeaders/CommerceKit/CKSoftwareMap.h index 74bb401..c24be71 100644 --- a/App/PrivateHeaders/CommerceKit/CKSoftwareMap.h +++ b/App/PrivateHeaders/CommerceKit/CKSoftwareMap.h @@ -9,15 +9,19 @@ NS_ASSUME_NONNULL_BEGIN @class NSLock, NSMutableArray; +@class CKSoftwareMapObserver, NSMutableDictionary; @interface CKSoftwareMap : CKServiceInterface { - NSMutableArray *_observers; - NSLock *_observersLock; + NSMutableDictionary *_productsObservers; + CKSoftwareMapObserver *_sharedObserver; } + (CKSoftwareMap *)sharedSoftwareMap; -- (id)adaptableBundleIdentifiers; +@property(retain, nonatomic) CKSoftwareMapObserver *sharedObserver; // @synthesize sharedObserver=_sharedObserver; +@property(retain, nonatomic) NSMutableDictionary *productsObservers; // @synthesize productsObservers=_productsObservers; +//- (void).cxx_destruct; +- (id)adoptableBundleIdentifiers; - (BOOL)adoptionCompletedForBundleID:(id)arg1 adoptingDSID:(out _Nullable id * _Nonnull)arg2 appleID:(out _Nullable id * _Nonnull)arg3; - (id)updateRequestBodyData:(char *)arg1 includeInstalledApps:(BOOL)arg2 includeBundledApps:(BOOL)arg3 conditionally:(BOOL)arg4 hadUnadoptedApps:(out char *)arg5; - (id)iconForApplicationWithBundeID:(id)arg1; @@ -28,8 +32,9 @@ NS_ASSUME_NONNULL_BEGIN - (NSArray* __nullable)allProducts; - (CKSoftwareProduct *)productForItemIdentifier:(unsigned long long)arg1; - (nullable CKSoftwareProduct *)productForBundleIdentifier:(NSString *)arg1; -- (void)removeProductsObserver:(id)arg1; +- (void)removeProductsObserverForToken:(id)arg1; //- (id)addProductsObserver:(CDUnknownBlockType)arg1 queue:(id)arg2; +- (void)connectionWasInterrupted; - (id)initWithStoreClient:(id)arg1; @end diff --git a/App/PrivateHeaders/CommerceKit/CKUpdateController.h b/App/PrivateHeaders/CommerceKit/CKUpdateController.h index c938d67..cb11cff 100644 --- a/App/PrivateHeaders/CommerceKit/CKUpdateController.h +++ b/App/PrivateHeaders/CommerceKit/CKUpdateController.h @@ -7,16 +7,29 @@ #import "CKServiceInterface.h" @class CKUpdate; +@class CKUpdateControllerClient, NSMutableDictionary; NS_ASSUME_NONNULL_BEGIN @interface CKUpdateController : CKServiceInterface { + BOOL _shouldNotAttemptInstallationAfterFailureDialog; // CDUnknownBlockType _dialogHandler; + NSMutableDictionary *_availableUpdatesObservers; + NSMutableDictionary *_updateScanObservers; + NSMutableDictionary *_updateProgressObservers; + CKUpdateControllerClient *_sharedObserver; } + (CKUpdateController * _Nullable)sharedUpdateController; +@property(retain, nonatomic) CKUpdateControllerClient *sharedObserver; // @synthesize sharedObserver=_sharedObserver; +@property(retain, nonatomic) NSMutableDictionary *updateProgressObservers; // @synthesize updateProgressObservers=_updateProgressObservers; +@property(retain, nonatomic) NSMutableDictionary *updateScanObservers; // @synthesize updateScanObservers=_updateScanObservers; +@property(retain, nonatomic) NSMutableDictionary *availableUpdatesObservers; // @synthesize availableUpdatesObservers=_availableUpdatesObservers; +@property BOOL shouldNotAttemptInstallationAfterFailureDialog; // @synthesize shouldNotAttemptInstallationAfterFailureDialog=_shouldNotAttemptInstallationAfterFailureDialog; //@property(copy) CDUnknownBlockType dialogHandler; // @synthesize dialogHandler=_dialogHandler; //- (void).cxx_destruct; +- (void)didInteractivelyPurchaseItemIdentifier:(unsigned long long)arg1 success:(BOOL)arg2; +- (BOOL)willInteractivelyPurchaseItemIdentifier:(unsigned long long)arg1; - (void)promptUserToOptInForAutoUpdateWithShowNotification:(BOOL)arg1; - (BOOL)shouldPromptForAutoUpdateOptIn; - (BOOL)isAutoUpdatedEnabled; @@ -26,9 +39,9 @@ NS_ASSUME_NONNULL_BEGIN - (int)catalogTrustLevel; - (id)catalogHostName; - (void)stopObservingOSUpdateProgressWithCallback:(id)arg1; -//- (id)observerOSUpdateProgressWithProgressHandler:(CDUnknownBlockType)arg1; +//- (id)observeOSUpdateProgressWithProgressHandler:(CDUnknownBlockType)arg1; - (void)stopObservingOSUpdateScansWithCallback:(id)arg1; -//- (id)observerOSUpdateScansWithProgressHandler:(CDUnknownBlockType)arg1; +//- (id)observeOSUpdateScansWithProgressHandler:(CDUnknownBlockType)arg1; - (void)startOSUpdateScanWithForceFullScan:(BOOL)arg1 reportProgressImmediately:(BOOL)arg2 launchedFromNotification:(BOOL)arg3 userHasSeenAllUpdates:(BOOL)arg4 checkForOtherUpdates:(BOOL)arg5; - (void)unhideAllOSUpdates; - (void)hideOSUpdatesWithProductKeys:(id)arg1; @@ -42,10 +55,14 @@ NS_ASSUME_NONNULL_BEGIN - (id)osUpdatesToBeInstalledLater; - (id)osUpdatesToBeInstalledAfterLogout; - (void)cancelUpdatesToBeInstalledLater; +//- (void)queueOSUpdatesForLaterInstall:(id)arg1 withMode:(long long)arg2 completionHandler:(CDUnknownBlockType)arg3; - (void)installAvailableUpdatesLaterWithMode:(long long)arg1; - (BOOL)shouldOfferDoItLater; +//- (void)updatesWithTags:(id)arg1 completionHandler:(CDUnknownBlockType)arg2; - (void)installAllAvailableUpdates; +//- (void)startAppInstallWithTags:(id)arg1 fallbackPurchase:(id)arg2 completionHandler:(CDUnknownBlockType)arg3; //- (void)startAppUpdates:(id)arg1 andOSUpdates:(id)arg2 withDelegate:(id)arg3 completionHandler:(CDUnknownBlockType)arg4; +//- (void)_checkForBookUpdatesWithCompletionHandler:(CDUnknownBlockType)arg1; //- (void)checkForUpdatesWithUserHasSeenUpdates:(BOOL)arg1 completionHandler:(CDUnknownBlockType)arg2; - (void)removeAvailableUpdatesObserver:(id)arg1; //- (id)addAvailableUpdatesObserverWithBlock:(CDUnknownBlockType)arg1; @@ -53,6 +70,8 @@ NS_ASSUME_NONNULL_BEGIN - (id)incompatibleUpdates; - (nullable CKUpdate *)availableUpdateWithItemIdentifier:(unsigned long long)arg1; - (NSArray*)availableUpdates; +- (void)connectionWasInterrupted; +- (id)initWithStoreClient:(id)arg1; - (id)init; @end diff --git a/App/PrivateHeaders/StoreFoundation/CKSoftwareProduct.h b/App/PrivateHeaders/StoreFoundation/CKSoftwareProduct.h index dc689e1..f56f132 100644 --- a/App/PrivateHeaders/StoreFoundation/CKSoftwareProduct.h +++ b/App/PrivateHeaders/StoreFoundation/CKSoftwareProduct.h @@ -25,6 +25,7 @@ NSNumber *_itemIdentifier; NSNumber *_storeFrontIdentifier; NSNumber *_versionIdentifier; + NSDate *_purchaseDate; NSValue *_mdItemRef; NSString *_vppLicenseOrganizationName; NSDate *_vppLicenseExpirationDate; @@ -35,7 +36,7 @@ NSNumber *_expectedStoreVersion; } -+ (nullable instancetype)productAtPath:(nonnull NSString *)arg1; ++ (nullable instancetype)createSoftwareProductForAppAtPath:(nonnull NSString *)arg1; + (nullable instancetype)productPathToUpgradeForBundleIdentifier:(nonnull NSString *)bundleIdentifier versionNumberString:(nonnull NSString *)versionNumber; + (BOOL)supportsSecureCoding; @property(copy, nullable) NSNumber *expectedStoreVersion; // @synthesize expectedStoreVersion=_expectedStoreVersion; @@ -52,6 +53,7 @@ @property BOOL isVPPLicensed; // @synthesize isVPPLicensed=_isVPPLicensed; @property BOOL installed; // @synthesize installed=_installed; @property(retain, nullable) NSValue *mdItemRef; // @synthesize mdItemRef=_mdItemRef; +@property(retain, nullable) NSDate *purchaseDate; // @synthesize purchaseDate=_purchaseDate; @property(retain, nullable) NSNumber *versionIdentifier; // @synthesize versionIdentifier=_versionIdentifier; @property(retain, nullable) NSNumber *storeFrontIdentifier; // @synthesize storeFrontIdentifier=_storeFrontIdentifier; @property(retain, nonnull) NSNumber *itemIdentifier; // @synthesize itemIdentifier=_itemIdentifier; diff --git a/App/PrivateHeaders/StoreFoundation/ISAccountService-Protocol.h b/App/PrivateHeaders/StoreFoundation/ISAccountService-Protocol.h index 3086f3f..10ea81b 100644 --- a/App/PrivateHeaders/StoreFoundation/ISAccountService-Protocol.h +++ b/App/PrivateHeaders/StoreFoundation/ISAccountService-Protocol.h @@ -4,23 +4,16 @@ // class-dump is Copyright (C) 1997-1998, 2000-2001, 2004-2013 by Steve Nygard. // -@class ISAuthenticationContext, ISAuthenticationResponse, ISStoreAccount, NSDictionary, NSNumber, NSString, NSURL; +@class ISAuthenticationContext, ISAuthenticationResponse, ISStoreAccount, NSDictionary, NSNumber, NSString, NSURL, NSURLResponse; @protocol ISAccountService -//- (void)completeSetupWithResponse:(NSDictionary *)arg1 withReply:(void (^)(BOOL, NSError *))arg2; -//- (void)handlePushNotificationMessage:(NSDictionary *)arg1; -//- (void)isRegisteredForAccount:(NSNumber *)arg1 andMask:(long long)arg2 withReply:(void (^)(BOOL, NSError *, BOOL))arg3; -//- (void)disableAutoDownloadWithReply:(void (^)(BOOL, NSError *))arg1; -//- (void)enableAutoDownloadForEnvironmentNamed:(NSString *)arg1 withReply:(void (^)(BOOL, NSError *))arg2; -//- (void)getEnabledMediaTypesWithReply:(void (^)(BOOL, NSError *, long long))arg1; -//- (void)registerDeviceTokenForEnvironmentNamed:(NSString *)arg1 withReply:(void (^)(BOOL, NSError *))arg2; -//- (void)recommendedAppleIDForAccountSignIn:(void (^)(NSString *))arg1; -//- (void)iCloudDSIDReplyBlock:(void (^)(NSString *))arg1; -//- (void)setStoreFrontID:(NSString *)arg1; -//- (void)storeFrontWithReplyBlock:(void (^)(NSString *))arg1; -//- (void)shouldSendGUIDWithRequestForURL:(NSURL *)arg1 withReplyBlock:(void (^)(BOOL))arg2; -//- (void)consumeCookiesWithHTTPHeaders:(NSDictionary *)arg1 fromURL:(NSURL *)arg2; -//- (void)httpHeadersForURL:(NSURL *)arg1 forDSID:(NSNumber *)arg2 includeADIHeaders:(BOOL)arg3 withReplyBlock:(void (^)(NSDictionary *))arg4; +- (void)recommendedAppleIDForAccountSignIn:(void (^)(NSString *))arg1; +- (void)iCloudDSIDReplyBlock:(void (^)(NSString *))arg1; +- (void)setStoreFrontID:(NSString *)arg1; +- (void)storeFrontWithReplyBlock:(void (^)(NSString *))arg1; +- (void)shouldSendGUIDWithRequestForURL:(NSURL *)arg1 withReplyBlock:(void (^)(BOOL))arg2; +- (void)processURLResponse:(NSURLResponse *)arg1; +- (void)httpHeadersForURL:(NSURL *)arg1 forDSID:(NSNumber *)arg2 includeADIHeaders:(BOOL)arg3 withReplyBlock:(void (^)(NSDictionary *))arg4; //- (void)removeURLBagObserver:(id )arg1; //- (void)addURLBagObserver:(id )arg1; //- (void)dictionaryWithReplyBlock:(void (^)(NSDictionary *))arg1; @@ -31,23 +24,20 @@ //- (void)needsSilentADIActionForURL:(NSURL *)arg1 withReplyBlock:(void (^)(BOOL))arg2; //- (void)urlIsTrustedByURLBag:(NSURL *)arg1 withReplyBlock:(void (^)(BOOL))arg2; //- (void)valueForURLBagKey:(NSString *)arg1 withReplyBlock:(void (^)(id))arg2; -//- (void)updatePasswordSettings:(NSDictionary *)arg1 replyBlock:(void (^)(BOOL, NSError *))arg2; -//- (void)getPasswordSettingsWithReplyBlock:(void (^)(NSDictionary *, NSError *))arg1; -//- (void)getEligibilityForService:(NSNumber *)arg1 replyBlock:(void (^)(NSNumber *, NSError *))arg2; -//- (void)eligibilityForService:(NSNumber *)arg1 replyBlock:(void (^)(NSNumber *))arg2; -//- (void)retailStoreDemoModeReplyBlock:(void (^)(BOOL, NSString *, NSString *, BOOL))arg1; +- (void)getTouchIDPreferenceWithReplyBlock:(void (^)(BOOL, ISStoreAccount *, NSError *))arg1; +- (void)updateTouchIDSettingsForDSID:(NSNumber *)arg1 replyBlock:(void (^)(BOOL, NSError *))arg2; +- (void)setTouchIDState:(long long)arg1 forDSID:(NSNumber *)arg2 replyBlock:(void (^)(BOOL, NSError *))arg3; +- (void)generateTouchIDHeadersForDSID:(NSNumber *)arg1 challenge:(NSString *)arg2 caller:(id)arg3 replyBlock:(void (^)(NSDictionary *, NSError *))arg4; +- (void)retailStoreDemoModeReplyBlock:(void (^)(BOOL, NSString *, NSString *, BOOL))arg1; //- (void)removeAccountStoreObserver:(id )arg1; //- (void)addAccountStoreObserver:(id )arg1; //- (void)parseCreditStringForProtocol:(NSDictionary *)arg1; - (void)signOut; -- (void)signInWithContext:(ISAuthenticationContext * __nonnull)arg1 replyBlock:(void (^ __nonnull)(BOOL, ISStoreAccount * __nullable, NSError * __nullable))arg2; -//- (void)addAccount:(ISStoreAccount *)arg1; -//- (void)addAccountWithAuthenticationResponse:(ISAuthenticationResponse *)arg1 makePrimary:(BOOL)arg2 replyBlock:(void (^)(ISStoreAccount *))arg3; -//- (void)accountWithAppleID:(NSString *)arg1 replyBlock:(void (^)(ISStoreAccount *))arg2; -//- (void)accountWithDSID:(NSNumber *)arg1 replyBlock:(void (^)(ISStoreAccount *))arg2; -//- (void)primaryAccountWithReplyBlock:(void (^)(ISStoreAccount *))arg1; -//- (void)authIsExpiredWithReplyBlock:(void (^)(BOOL))arg1; -//- (void)strongTokenForAccount:(ISStoreAccount *)arg1 withReplyBlock:(void (^)(NSString *))arg2; -//- (void)accountsWithReplyBlock:(void (^)(NSArray *))arg1; +- (void)addAccount:(ISStoreAccount *)arg1; +- (void)addAccountWithAuthenticationResponse:(ISAuthenticationResponse *)arg1 makePrimary:(BOOL)arg2 replyBlock:(void (^)(ISStoreAccount *))arg3; +- (void)accountWithAppleID:(NSString *)arg1 replyBlock:(void (^)(ISStoreAccount *))arg2; +- (void)accountWithDSID:(NSNumber *)arg1 replyBlock:(void (^)(ISStoreAccount *))arg2; +- (void)primaryAccountWithReplyBlock:(void (^)(ISStoreAccount *))arg1; +- (void)authIsExpiredWithReplyBlock:(void (^)(BOOL))arg1; @end diff --git a/App/PrivateHeaders/StoreFoundation/ISAuthenticationResponse.h b/App/PrivateHeaders/StoreFoundation/ISAuthenticationResponse.h new file mode 100644 index 0000000..06244c4 --- /dev/null +++ b/App/PrivateHeaders/StoreFoundation/ISAuthenticationResponse.h @@ -0,0 +1,13 @@ +// +// ISAuthenticationResponse.h +// mas-cli +// +// Created by Ben Chatelain on 2/25/18. +// Copyright © 2018 Andrew Naylor. All rights reserved. +// + +#ifndef ISAuthenticationResponse_h +#define ISAuthenticationResponse_h + + +#endif /* ISAuthenticationResponse_h */ diff --git a/App/PrivateHeaders/StoreFoundation/ISServiceProxy.h b/App/PrivateHeaders/StoreFoundation/ISServiceProxy.h index 8dd5a5e..08678cd 100644 --- a/App/PrivateHeaders/StoreFoundation/ISServiceProxy.h +++ b/App/PrivateHeaders/StoreFoundation/ISServiceProxy.h @@ -9,6 +9,7 @@ @class ISStoreClient, NSLock, NSMutableDictionary, Protocol; @protocol ISAccountService; +@class ISStoreClient, Protocol; @interface ISServiceProxy : NSObject { @@ -21,7 +22,9 @@ typedef void (^ISErrorHandler)(NSError * __nonnull error); + (ISServiceProxy * __nonnull)genericSharedProxy; ++ (void)initialize; @property(retain, nonatomic) ISStoreClient * __nullable storeClient; // @synthesize storeClient=_storeClient; +//- (void).cxx_destruct; //- (void)uiServiceSynchronousBlock:(CDUnknownBlockType)arg1; //@property(readonly, nonatomic) id uiService; //- (id)uiServiceWithErrorHandler:(CDUnknownBlockType)arg1; @@ -40,6 +43,8 @@ typedef void (^ISErrorHandler)(NSError * __nonnull error); //- (void)accountServiceSynchronousBlock:(void (^ __nonnull)(id __nonnull))arg1; @property(readonly, nonatomic) id __nonnull accountService; //- (id __nonnull)accountServiceWithErrorHandler:(ISErrorHandler __nonnull)arg1; +- (void)connectionWasInterrupted; +- (void)registerForInterrptionNotification; //- (void)performSynchronousBlock:(CDUnknownBlockType)arg1 withServiceName:(id)arg2 protocol:(id)arg3 isMachService:(BOOL)arg4 interfaceClassName:(id)arg5; //- (id)objectProxyForServiceName:(id)arg1 protocol:(id)arg2 interfaceClassName:(id)arg3 isMachService:(BOOL)arg4 errorHandler:(CDUnknownBlockType)arg5; //- (id)connectionWithServiceName:(id)arg1 protocol:(id)arg2 isMachService:(BOOL)arg3; diff --git a/App/PrivateHeaders/StoreFoundation/ISStoreAccount.h b/App/PrivateHeaders/StoreFoundation/ISStoreAccount.h index cba764b..af0162b 100644 --- a/App/PrivateHeaders/StoreFoundation/ISStoreAccount.h +++ b/App/PrivateHeaders/StoreFoundation/ISStoreAccount.h @@ -10,7 +10,9 @@ { NSTimer *_tokenInvalidTimer; BOOL _isSignedIn; + BOOL _isManagedStudent; BOOL _primary; + long long _touchIDState; NSNumber *_dsID; NSString *_identifier; long long _kind; @@ -32,6 +34,7 @@ @property long long URLBagType; // @synthesize URLBagType=_URLBagType; @property(copy) NSString *token; // @synthesize token=_token; @property(copy) NSString *password; // @synthesize password=_password; +@property BOOL isManagedStudent; // @synthesize isManagedStudent=_isManagedStudent; @property BOOL isSignedIn; // @synthesize isSignedIn=_isSignedIn; @property(retain) NSString *storeFront; // @synthesize storeFront=_storeFront; @property(copy) NSString *creditString; // @synthesize creditString=_creditString; @@ -39,6 +42,9 @@ @property(copy) NSString *identifier; // @synthesize identifier=_identifier; @property(copy) NSNumber *dsID; // @synthesize dsID=_dsID; //- (void).cxx_destruct; +- (long long)getTouchIDState; +@property long long touchIDState; // @synthesize touchIDState=_touchIDState; +- (void)resetTouchIDState; - (void)mergeValuesFromAuthenticationResponse:(id)arg1; - (BOOL)hasValidStrongToken; - (double)strongTokenValidForSecond; diff --git a/App/PrivateHeaders/StoreFoundation/ISStoreClient.h b/App/PrivateHeaders/StoreFoundation/ISStoreClient.h index 9d8c7d5..7fdf5ba 100644 --- a/App/PrivateHeaders/StoreFoundation/ISStoreClient.h +++ b/App/PrivateHeaders/StoreFoundation/ISStoreClient.h @@ -10,6 +10,7 @@ { BOOL __alwaysUseSandboxEnvironment; BOOL _isDaemon; + int _pid; unsigned long long _frameworkVersion; NSString *_identifier; long long _clientType; @@ -39,6 +40,7 @@ + (BOOL)supportsSecureCoding; @property BOOL isDaemon; // @synthesize isDaemon=_isDaemon; @property(copy) NSString *agentListenerName; // @synthesize agentListenerName=_agentListenerName; +@property(readonly) int pid; // @synthesize pid=_pid; @property(copy) NSString *displayUIHostID; // @synthesize displayUIHostID=_displayUIHostID; @property(copy) NSDictionary *daap; // @synthesize daap=_daap; @property(copy) NSString *appPath; // @synthesize appPath=_appPath; @@ -63,12 +65,14 @@ @property(copy) NSString *identifier; // @synthesize identifier=_identifier; @property unsigned long long frameworkVersion; // @synthesize frameworkVersion=_frameworkVersion; //- (void).cxx_destruct; +- (id)callerIdentity; - (BOOL)isEqualToStoreClient:(id)arg1; - (void)_cacheKnownClient:(id)arg1; - (id)initWithCoder:(id)arg1; - (void)encodeWithCoder:(id)arg1; - (id)initWithApplicationPath:(id)arg1; - (id)initWithStoreClientType:(long long)arg1; +- (id)init; @end diff --git a/App/PrivateHeaders/StoreFoundation/SSDownload.h b/App/PrivateHeaders/StoreFoundation/SSDownload.h index c89fa41..9852de6 100644 --- a/App/PrivateHeaders/StoreFoundation/SSDownload.h +++ b/App/PrivateHeaders/StoreFoundation/SSDownload.h @@ -52,6 +52,7 @@ - (void)encodeWithCoder:(id)arg1; - (BOOL)isEqual:(id)arg1; - (id)initWithAssets:(id)arg1 metadata:(id)arg2; +- (id)init; - (void)resume; - (void)pause; - (void)cancel; diff --git a/App/PrivateHeaders/StoreFoundation/SSPurchase.h b/App/PrivateHeaders/StoreFoundation/SSPurchase.h index 8036a3e..24995b5 100644 --- a/App/PrivateHeaders/StoreFoundation/SSPurchase.h +++ b/App/PrivateHeaders/StoreFoundation/SSPurchase.h @@ -22,25 +22,29 @@ BOOL _isVPP; BOOL _shouldBeInstalledAfterLogout; BOOL _isCancelled; + BOOL _isDSIDLessPurchase; NSString *_sortableAccountIdentifier; unsigned long long _itemIdentifier; // CDUnknownBlockType _authFallbackHandler; ISOperation *_purchaseOperation; NSDictionary *_responseDialog; + NSDictionary *_dsidLessOptions; } + (id)purchasesGroupedByAccountIdentifierWithPurchases:(id)arg1; + (BOOL)supportsSecureCoding; + (id)purchaseWithBuyParameters:(id)arg1; +@property(retain) NSDictionary *dsidLessOptions; // @synthesize dsidLessOptions=_dsidLessOptions; +@property BOOL isDSIDLessPurchase; // @synthesize isDSIDLessPurchase=_isDSIDLessPurchase; @property(copy) NSDictionary *responseDialog; // @synthesize responseDialog=_responseDialog; @property __weak ISOperation *purchaseOperation; // @synthesize purchaseOperation=_purchaseOperation; @property BOOL isCancelled; // @synthesize isCancelled=_isCancelled; //@property(copy) CDUnknownBlockType authFallbackHandler; // @synthesize authFallbackHandler=_authFallbackHandler; @property unsigned long long itemIdentifier; // @synthesize itemIdentifier=_itemIdentifier; @property BOOL shouldBeInstalledAfterLogout; // @synthesize shouldBeInstalledAfterLogout=_shouldBeInstalledAfterLogout; +@property BOOL checkPreflightAterPurchase; // @synthesize checkPreflightAterPurchase=_checkPreflightAterPurchase; @property(readonly, nonatomic) NSString *sortableAccountIdentifier; // @synthesize sortableAccountIdentifier=_sortableAccountIdentifier; @property(retain, nonatomic) NSString *parentalControls; // @synthesize parentalControls=_parentalControls; -@property BOOL checkPreflightAterPurchase; // @synthesize checkPreflightAterPurchase=_checkPreflightAterPurchase; @property(retain, nonatomic) NSData *receiptData; // @synthesize receiptData=_receiptData; @property(nonatomic) long long purchaseType; // @synthesize purchaseType=_purchaseType; @property BOOL isVPP; // @synthesize isVPP=_isVPP; @@ -54,7 +58,6 @@ - (BOOL)purchaseDSIDMatchesPrimaryAccount; @property(readonly) BOOL needsAuthentication; // @dynamic needsAuthentication; @property BOOL isRecoveryPurchase; // @dynamic isRecoveryPurchase; -@property(readonly) BOOL isDSIDLessPurchase; - (id)productID; @property(readonly, nonatomic) NSString *uniqueIdentifier; - (id)_sortableAccountIdentifier; diff --git a/App/mas-cli-Bridging-Header.h b/App/mas-cli-Bridging-Header.h index e169f88..7f1487d 100644 --- a/App/mas-cli-Bridging-Header.h +++ b/App/mas-cli-Bridging-Header.h @@ -29,6 +29,7 @@ #import #import #import +#import "ISAccountService-Protocol.h" #import @protocol CKDownloadQueueObserver