diff --git a/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.h b/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.h index 2b75186..6f51596 100644 --- a/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.h +++ b/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.h @@ -37,11 +37,11 @@ extern NSString *const PFFacebookUserAuthenticationType; /// @name Authenticate ///-------------------------------------- -- (BFTask PF_GENERIC(NSDictionary*)*)authenticateAsyncWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)publishPermissions; -- (BFTask PF_GENERIC(NSDictionary*)*)authenticateAsyncWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)publishPermissions - fromViewComtroller:(UIViewController *)viewController; +- (BFTask*> *)authenticateAsyncWithReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions; +- (BFTask*> *)authenticateAsyncWithReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions + fromViewComtroller:(UIViewController *)viewController; @end diff --git a/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.m b/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.m index 14337b2..9ade2d8 100644 --- a/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.m +++ b/ParseFacebookUtils/Internal/AuthenticationProvider/PFFacebookAuthenticationProvider.m @@ -42,16 +42,16 @@ + (instancetype)providerWithApplication:(UIApplication *)application #pragma mark - Authenticate ///-------------------------------------- -- (BFTask PF_GENERIC(NSDictionary*)*)authenticateAsyncWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)publishPermissions { +- (BFTask*> *)authenticateAsyncWithReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions { return [self authenticateAsyncWithReadPermissions:readPermissions publishPermissions:publishPermissions fromViewComtroller:[PFFacebookPrivateUtilities applicationTopViewController]]; } -- (BFTask PF_GENERIC(NSDictionary*)*)authenticateAsyncWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)publishPermissions - fromViewComtroller:(UIViewController *)viewController { +- (BFTask*> *)authenticateAsyncWithReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions + fromViewComtroller:(UIViewController *)viewController { return [BFTask taskWithError:[NSError pffb_invalidFacebookSessionError]]; } @@ -59,7 +59,7 @@ + (instancetype)providerWithApplication:(UIApplication *)application #pragma mark - PFUserAuthenticationDelegate ///-------------------------------------- -- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary PF_GENERIC(NSString *, NSString *)*)authData { +- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary *)authData { FBSDKAccessToken *token = [PFFacebookPrivateUtilities facebookAccessTokenFromUserAuthenticationData:authData]; if (!token) { return !authData; // Only deauthenticate if authData was nil, otherwise - return failure (`NO`). diff --git a/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.h b/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.h index 6b58b73..3101fcf 100644 --- a/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.h +++ b/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.h @@ -16,7 +16,7 @@ #import "PFFacebookAuthenticationProvider.h" -@class BFTask PF_GENERIC(__covariant BFGenericType); +@class BFTask<__covariant BFGenericType>; NS_ASSUME_NONNULL_BEGIN diff --git a/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.m b/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.m index 0d6f3b7..3ab0141 100644 --- a/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.m +++ b/ParseFacebookUtils/Internal/AuthenticationProvider/iOS/PFFacebookMobileAuthenticationProvider.m @@ -42,9 +42,9 @@ - (instancetype)initWithApplication:(UIApplication *)application #pragma mark - Authenticate ///-------------------------------------- -- (BFTask PF_GENERIC(NSDictionary*)*)authenticateAsyncWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *) *)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *) *)publishPermissions - fromViewComtroller:(UIViewController *)viewController { +- (BFTask*> *)authenticateAsyncWithReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions + fromViewComtroller:(UIViewController *)viewController { if (readPermissions && publishPermissions) { NSException *exception = [NSException exceptionWithName:NSInvalidArgumentException reason:@"Read permissions are not permitted to be requested with publish permissions." @@ -78,7 +78,7 @@ - (instancetype)initWithApplication:(UIApplication *)application #pragma mark - PFUserAuthenticationDelegate ///-------------------------------------- -- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary PF_GENERIC(NSString *, NSString *) *)authData { +- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary *)authData { if (!authData) { [self.loginManager logOut]; } diff --git a/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m b/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m index 53eb98e..daeb637 100644 --- a/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m +++ b/ParseFacebookUtils/Internal/AuthenticationProvider/tvOS/PFFacebookDeviceAuthenticationProvider.m @@ -32,9 +32,9 @@ @implementation PFFacebookDeviceAuthenticationProvider #pragma mark - PFFacebookAuthenticationProvider ///-------------------------------------- -- (BFTask PF_GENERIC(NSDictionary*)*)authenticateAsyncWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)publishPermissions - fromViewComtroller:(UIViewController *)viewController { +- (BFTask*> *)authenticateAsyncWithReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions + fromViewComtroller:(UIViewController *)viewController { return [BFTask taskFromExecutor:[BFExecutor mainThreadExecutor] withBlock:^id _Nonnull{ if (_loginTaskCompletionSource) { return [NSError errorWithDomain:FBSDKErrorDomain @@ -57,7 +57,7 @@ @implementation PFFacebookDeviceAuthenticationProvider #pragma mark - PFUserAuthenticationDelegate ///-------------------------------------- -- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary PF_GENERIC(NSString *, NSString *)*)authData { +- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary *)authData { if (!authData) { [FBSDKAccessToken setCurrentAccessToken:nil]; } @@ -76,7 +76,7 @@ - (void)deviceLoginViewControllerDidCancel:(FBSDKDeviceLoginViewController *)vie - (void)deviceLoginViewControllerDidFinish:(FBSDKDeviceLoginViewController *)viewController { FBSDKAccessToken *accessToken = [FBSDKAccessToken currentAccessToken]; - NSDictionary PF_GENERIC(NSString *,NSString*) *result = [PFFacebookPrivateUtilities userAuthenticationDataFromAccessToken:accessToken]; + NSDictionary *result = [PFFacebookPrivateUtilities userAuthenticationDataFromAccessToken:accessToken]; [_loginTaskCompletionSource trySetResult:result]; _loginViewController = nil; _loginTaskCompletionSource = nil; diff --git a/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.h b/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.h index 04d2202..5dbc1ce 100644 --- a/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.h +++ b/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.h @@ -28,11 +28,11 @@ NS_ASSUME_NONNULL_BEGIN ///-------------------------------------- + (NSDictionary *)userAuthenticationDataWithFacebookUserId:(NSString *)userId - accessToken:(NSString *)accessToken - expirationDate:(NSDate *)expirationDate; + accessToken:(NSString *)accessToken + expirationDate:(NSDate *)expirationDate; + (NSDictionary *)userAuthenticationDataFromAccessToken:(FBSDKAccessToken *)token; -+ (FBSDKAccessToken *)facebookAccessTokenFromUserAuthenticationData:(nullable NSDictionary PF_GENERIC(NSString *,NSString *) *)authData; ++ (FBSDKAccessToken *)facebookAccessTokenFromUserAuthenticationData:(nullable NSDictionary *)authData; @end diff --git a/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.m b/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.m index 76c96e1..88ef728 100644 --- a/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.m +++ b/ParseFacebookUtils/Internal/PFFacebookPrivateUtilities.m @@ -43,7 +43,7 @@ + (NSDictionary *)userAuthenticationDataFromAccessToken:(FBSDKAccessToken *)toke expirationDate:token.expirationDate]; } -+ (FBSDKAccessToken *)facebookAccessTokenFromUserAuthenticationData:(nullable NSDictionary PF_GENERIC(NSString *,NSString *) *)authData { ++ (FBSDKAccessToken *)facebookAccessTokenFromUserAuthenticationData:(nullable NSDictionary *)authData { NSString *accessToken = authData[@"access_token"]; NSString *expirationDateString = authData[@"expiration_date"]; if (!accessToken || !expirationDateString) { diff --git a/ParseFacebookUtils/PFFacebookUtils.h b/ParseFacebookUtils/PFFacebookUtils.h index a512468..665cb34 100644 --- a/ParseFacebookUtils/PFFacebookUtils.h +++ b/ParseFacebookUtils/PFFacebookUtils.h @@ -71,7 +71,7 @@ NS_ASSUME_NONNULL_BEGIN @return The task that has will a have `result` set to `PFUser` if operation succeeds. */ -+ (BFTask PF_GENERIC(PFUser *)*)logInInBackgroundWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions; ++ (BFTask *)logInInBackgroundWithReadPermissions:(nullable NSArray *)permissions; /** *Asynchronously* logs in a user using Facebook with read permissions. @@ -83,7 +83,7 @@ NS_ASSUME_NONNULL_BEGIN @param block The block to execute when the log in completes. It should have the following signature: `^(PFUser *user, NSError *error)`. */ -+ (void)logInInBackgroundWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions ++ (void)logInInBackgroundWithReadPermissions:(nullable NSArray *)permissions block:(nullable PFUserResultBlock)block; /** @@ -96,7 +96,7 @@ NS_ASSUME_NONNULL_BEGIN @return The task that has will a have `result` set to `PFUser` if operation succeeds. */ -+ (BFTask PF_GENERIC(PFUser *)*)logInInBackgroundWithPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions; ++ (BFTask *)logInInBackgroundWithPublishPermissions:(nullable NSArray *)permissions; /** *Asynchronously* logs in a user using Facebook with publish permissions. @@ -108,7 +108,7 @@ NS_ASSUME_NONNULL_BEGIN @param block The block to execute when the log in completes. It should have the following signature: `^(PFUser *user, NSError *error)`. */ -+ (void)logInInBackgroundWithPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions ++ (void)logInInBackgroundWithPublishPermissions:(nullable NSArray *)permissions block:(nullable PFUserResultBlock)block; /** @@ -121,7 +121,7 @@ NS_ASSUME_NONNULL_BEGIN @return The task that has will a have `result` set to `PFUser` if operation succeeds. */ -+ (BFTask PF_GENERIC(PFUser *)*)logInInBackgroundWithAccessToken:(FBSDKAccessToken *)accessToken; ++ (BFTask *)logInInBackgroundWithAccessToken:(FBSDKAccessToken *)accessToken; /** *Asynchronously* logs in a user using given Facebook Acess Token. @@ -152,8 +152,8 @@ NS_ASSUME_NONNULL_BEGIN @return The task that will have a `result` set to `@YES` if operation succeeds. */ -+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user - withReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions; ++ (BFTask *)linkUserInBackground:(PFUser *)user + withReadPermissions:(nullable NSArray *)permissions; /** *Asynchronously* links Facebook with read permissions to an existing `PFUser`. @@ -168,7 +168,7 @@ NS_ASSUME_NONNULL_BEGIN It should have the following signature: `^(BOOL succeeded, NSError *error)`. */ + (void)linkUserInBackground:(PFUser *)user - withReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions + withReadPermissions:(nullable NSArray *)permissions block:(nullable PFBooleanResultBlock)block; /** @@ -183,8 +183,8 @@ NS_ASSUME_NONNULL_BEGIN @return The task that will have a `result` set to `@YES` if operation succeeds. */ -+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user - withPublishPermissions:(NSArray PF_GENERIC(NSString *)*)permissions; ++ (BFTask *)linkUserInBackground:(PFUser *)user + withPublishPermissions:(NSArray *)permissions; /** *Asynchronously* links Facebook with publish permissions to an existing `PFUser`. @@ -199,7 +199,7 @@ NS_ASSUME_NONNULL_BEGIN It should have the following signature: `^(BOOL succeeded, NSError *error)`. */ + (void)linkUserInBackground:(PFUser *)user - withPublishPermissions:(NSArray PF_GENERIC(NSString *)*)permissions + withPublishPermissions:(NSArray *)permissions block:(nullable PFBooleanResultBlock)block; /** @@ -214,7 +214,7 @@ NS_ASSUME_NONNULL_BEGIN @return The task that will have a `result` set to `@YES` if operation succeeds. */ -+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user withAccessToken:(FBSDKAccessToken *)accessToken; ++ (BFTask *)linkUserInBackground:(PFUser *)user withAccessToken:(FBSDKAccessToken *)accessToken; /** *Asynchronously* links Facebook Access Token to an existing `PFUser`. @@ -242,7 +242,7 @@ NS_ASSUME_NONNULL_BEGIN @param user User to unlink from Facebook. @return The task, that encapsulates the work being done. */ -+ (BFTask PF_GENERIC(NSNumber *)*)unlinkUserInBackground:(PFUser *)user; ++ (BFTask *)unlinkUserInBackground:(PFUser *)user; /** Unlinks the `PFUser` from a Facebook account *asynchronously*. diff --git a/ParseFacebookUtils/PFFacebookUtils.m b/ParseFacebookUtils/PFFacebookUtils.m index 10da29f..efb3648 100644 --- a/ParseFacebookUtils/PFFacebookUtils.m +++ b/ParseFacebookUtils/PFFacebookUtils.m @@ -77,26 +77,26 @@ + (FBSDKLoginManager *)facebookLoginManager { #pragma mark - Logging In ///-------------------------------------- -+ (BFTask PF_GENERIC(PFUser *)*)logInInBackgroundWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions { ++ (BFTask *)logInInBackgroundWithReadPermissions:(nullable NSArray *)permissions { return [self _logInAsyncWithReadPermissions:permissions publishPermissions:nil]; } -+ (void)logInInBackgroundWithReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions ++ (void)logInInBackgroundWithReadPermissions:(nullable NSArray *)permissions block:(nullable PFUserResultBlock)block { [[self logInInBackgroundWithReadPermissions:permissions] pffb_continueWithMainThreadUserBlock:block]; } -+ (BFTask *)logInInBackgroundWithPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions { ++ (BFTask *)logInInBackgroundWithPublishPermissions:(nullable NSArray *)permissions { return [self _logInAsyncWithReadPermissions:nil publishPermissions:permissions]; } -+ (void)logInInBackgroundWithPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions ++ (void)logInInBackgroundWithPublishPermissions:(nullable NSArray *)permissions block:(nullable PFUserResultBlock)block { [[self logInInBackgroundWithPublishPermissions:permissions] pffb_continueWithMainThreadUserBlock:block]; } -+ (BFTask PF_GENERIC(PFUser *)*)_logInAsyncWithReadPermissions:(NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(NSArray PF_GENERIC(NSString *)*)publishPermissions { ++ (BFTask *)_logInAsyncWithReadPermissions:(NSArray *)readPermissions + publishPermissions:(NSArray *)publishPermissions { [self _assertFacebookInitialized]; PFFacebookAuthenticationProvider *provider = [self _authenticationProvider]; @@ -106,7 +106,7 @@ + (void)logInInBackgroundWithPublishPermissions:(nullable NSArray PF_GENERIC(NSS }]; } -+ (BFTask PF_GENERIC(PFUser *)*)logInInBackgroundWithAccessToken:(FBSDKAccessToken *)accessToken { ++ (BFTask *)logInInBackgroundWithAccessToken:(FBSDKAccessToken *)accessToken { [self _assertFacebookInitialized]; NSDictionary *authData = [PFFacebookPrivateUtilities userAuthenticationDataFromAccessToken:accessToken]; @@ -129,29 +129,29 @@ + (void)logInInBackgroundWithAccessToken:(FBSDKAccessToken *)accessToken #pragma mark - Linking Users ///-------------------------------------- -+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user - withReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions { ++ (BFTask *)linkUserInBackground:(PFUser *)user + withReadPermissions:(nullable NSArray *)permissions { return [self _linkUserAsync:user withReadPermissions:permissions publishPermissions:nil]; } + (void)linkUserInBackground:(PFUser *)user - withReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions + withReadPermissions:(nullable NSArray *)permissions block:(nullable PFBooleanResultBlock)block { [[self linkUserInBackground:user withReadPermissions:permissions] pffb_continueWithMainThreadBooleanBlock:block]; } -+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user - withPublishPermissions:(NSArray PF_GENERIC(NSString *)*)permissions { ++ (BFTask *)linkUserInBackground:(PFUser *)user + withPublishPermissions:(NSArray *)permissions { return [self _linkUserAsync:user withReadPermissions:nil publishPermissions:permissions]; } + (void)linkUserInBackground:(PFUser *)user - withPublishPermissions:(NSArray PF_GENERIC(NSString *)*)permissions + withPublishPermissions:(NSArray *)permissions block:(nullable PFBooleanResultBlock)block { [[self linkUserInBackground:user withPublishPermissions:permissions] pffb_continueWithMainThreadBooleanBlock:block]; } -+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user withAccessToken:(FBSDKAccessToken *)accessToken { ++ (BFTask *)linkUserInBackground:(PFUser *)user withAccessToken:(FBSDKAccessToken *)accessToken { [self _assertFacebookInitialized]; NSDictionary *authData = [PFFacebookPrivateUtilities userAuthenticationDataFromAccessToken:accessToken]; @@ -168,8 +168,8 @@ + (void)linkUserInBackground:(PFUser *)user } + (BFTask *)_linkUserAsync:(PFUser *)user - withReadPermissions:(nullable NSArray PF_GENERIC(NSString *)*)readPermissions - publishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)publishPermissions { + withReadPermissions:(nullable NSArray *)readPermissions + publishPermissions:(nullable NSArray *)publishPermissions { [self _assertFacebookInitialized]; PFFacebookAuthenticationProvider *authenticationProvider = [self _authenticationProvider]; @@ -183,7 +183,7 @@ + (BFTask *)_linkUserAsync:(PFUser *)user #pragma mark - Unlinking ///-------------------------------------- -+ (BFTask PF_GENERIC(NSNumber *)*)unlinkUserInBackground:(PFUser *)user { ++ (BFTask *)unlinkUserInBackground:(PFUser *)user { [self _assertFacebookInitialized]; return [user unlinkWithAuthTypeInBackground:PFFacebookUserAuthenticationType]; }