Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 74e3219

Browse files
nlutsenkonlutsenko
committed
Merge pull request #36 from ParsePlatform/nlutsenko.v3.generics
Remove all usages of PF_GENERIC macro.
2 parents 39bb21a + 91e2bcd commit 74e3219

File tree

3 files changed

+44
-45
lines changed

3 files changed

+44
-45
lines changed

‎ParseFacebookUtils/Internal/PFFacebookAuthenticationProvider.m‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ - (void)initializeSession {
185185
self.session = FBSession.activeSession = sessionProxy;
186186
}
187187

188-
- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary PF_GENERIC(NSString *,NSString *)*)authData {
188+
- (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary<NSString *, NSString *> *)authData {
189189
if (!authData) {
190190
OSAtomicIncrement32(&_currentOperationId);
191191
self.tokenCache.facebookId = nil;
@@ -213,10 +213,9 @@ - (BOOL)restoreAuthenticationWithAuthData:(nullable NSDictionary PF_GENERIC(NSSt
213213
if (!rawSession.isOpen ||
214214
!([rawSession.accessTokenData.accessToken isEqualToString:self.tokenCache.accessToken] &&
215215
[rawSession.accessTokenData.expirationDate isEqualToDate:self.tokenCache.expirationDate])) {
216+
// We don't pass the permissions here because we don't actually know the permissions for this access token at this point.
216217
rawSession = [self.sessionProvider sessionWithAppID:self.appId
217-
permissions:nil // We don't pass the permissions here because
218-
// we don't actually know the permissions for
219-
// this access token at this point.
218+
permissions:nil
220219
urlSchemeSuffix:self.urlSchemeSuffix
221220
tokenCacheStrategy:self.tokenCache];
222221
if ([rawSession respondsToSelector:@selector(clearAffinitizedThread)]) {

‎ParseFacebookUtils/PFFacebookUtils.h‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
127127
128128
@returns The task, that encapsulates the work being done.
129129
*/
130-
+ (BFTask PF_GENERIC(PFUser *)*)logInWithPermissionsInBackground:(nullable NSArray PF_GENERIC(NSString *)*)permissions;
130+
+ (BFTask<PFUser *> *)logInWithPermissionsInBackground:(nullable NSArray<NSString *> *)permissions;
131131

132132
/*!
133133
@abstract Logs in a user using Facebook.
@@ -143,7 +143,7 @@ NS_ASSUME_NONNULL_BEGIN
143143
@param block The block to execute.
144144
It should have the following argument signature: `^(PFUser *user, NSError *error)`.
145145
*/
146-
+ (void)logInWithPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
146+
+ (void)logInWithPermissions:(nullable NSArray<NSString *> *)permissions
147147
block:(nullable PFUserResultBlock)block;
148148

149149
/*
@@ -161,7 +161,7 @@ NS_ASSUME_NONNULL_BEGIN
161161
@param selector The selector that will be called when the asynchronous request is complete.
162162
It should have the following signature: `(void)callbackWithUser:(PFUser *)user error:(NSError *)error`.
163163
*/
164-
+ (void)logInWithPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
164+
+ (void)logInWithPermissions:(nullable NSArray<NSString *> *)permissions
165165
target:(nullable id)target
166166
selector:(nullable SEL)selector;
167167

@@ -177,9 +177,9 @@ NS_ASSUME_NONNULL_BEGIN
177177
178178
@returns The task, that encapsulates the work being done.
179179
*/
180-
+ (BFTask PF_GENERIC(PFUser *)*)logInWithFacebookIdInBackground:(NSString *)facebookId
181-
accessToken:(NSString *)accessToken
182-
expirationDate:(NSDate *)expirationDate;
180+
+ (BFTask<PFUser *> *)logInWithFacebookIdInBackground:(NSString *)facebookId
181+
accessToken:(NSString *)accessToken
182+
expirationDate:(NSDate *)expirationDate;
183183

184184
/*!
185185
@abstract Logs in a user using Facebook *asynchronously*.
@@ -233,7 +233,7 @@ NS_ASSUME_NONNULL_BEGIN
233233
234234
@deprecated Please use `[PFFacebookUtils linkUserInBackground:permissions:]` instead.
235235
*/
236-
+ (void)linkUser:(PFUser *)user permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions PARSE_DEPRECATED("Please use `[PFFacebookUtils linkUserInBackground:permissions:]` instead.");
236+
+ (void)linkUser:(PFUser *)user permissions:(nullable NSArray<NSString *> *)permissions PARSE_DEPRECATED("Please use `[PFFacebookUtils linkUserInBackground:permissions:]` instead.");
237237

238238
/*!
239239
@abstract Links Facebook to an existing <PFUser> *asynchronously*.
@@ -247,8 +247,8 @@ NS_ASSUME_NONNULL_BEGIN
247247
248248
@returns The task, that encapsulates the work being done.
249249
*/
250-
+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user
251-
permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions;
250+
+ (BFTask<NSNumber *> *)linkUserInBackground:(PFUser *)user
251+
permissions:(nullable NSArray<NSString *> *)permissions;
252252

253253
/*!
254254
@abstract Links Facebook to an existing <PFUser> *asynchronously*.
@@ -263,7 +263,7 @@ NS_ASSUME_NONNULL_BEGIN
263263
It should have the following argument signature: `^(BOOL *success, NSError *error)`.
264264
*/
265265
+ (void)linkUser:(PFUser *)user
266-
permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
266+
permissions:(nullable NSArray<NSString *> *)permissions
267267
block:(nullable PFBooleanResultBlock)block;
268268

269269
/*
@@ -280,7 +280,7 @@ NS_ASSUME_NONNULL_BEGIN
280280
It should have the following signature: `(void)callbackWithResult:(NSNumber *)result error:(NSError *)error`.
281281
*/
282282
+ (void)linkUser:(PFUser *)user
283-
permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
283+
permissions:(nullable NSArray<NSString *> *)permissions
284284
target:(nullable id)target
285285
selector:(nullable SEL)selector;
286286

@@ -297,10 +297,10 @@ NS_ASSUME_NONNULL_BEGIN
297297
298298
@returns The task, that encapsulates the work being done.
299299
*/
300-
+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user
301-
facebookId:(NSString *)facebookId
302-
accessToken:(NSString *)accessToken
303-
expirationDate:(NSDate *)expirationDate;
300+
+ (BFTask<NSNumber *> *)linkUserInBackground:(PFUser *)user
301+
facebookId:(NSString *)facebookId
302+
accessToken:(NSString *)accessToken
303+
expirationDate:(NSDate *)expirationDate;
304304

305305
/*!
306306
@abstract Links Facebook to an existing <PFUser> *asynchronously*.
@@ -371,7 +371,7 @@ NS_ASSUME_NONNULL_BEGIN
371371
@param user User to unlink from Facebook.
372372
@returns The task, that encapsulates the work being done.
373373
*/
374-
+ (BFTask PF_GENERIC(NSNumber *)*)unlinkUserInBackground:(PFUser *)user;
374+
+ (BFTask<NSNumber *> *)unlinkUserInBackground:(PFUser *)user;
375375

376376
/*!
377377
@abstract Unlinks the <PFUser> from a Facebook account *asynchronously*.
@@ -409,9 +409,9 @@ NS_ASSUME_NONNULL_BEGIN
409409
410410
@returns The task, that encapsulates the work being done.
411411
*/
412-
+ (BFTask PF_GENERIC(NSNumber *)*)reauthorizeUserInBackground:(PFUser *)user
413-
withPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
414-
audience:(FBSessionDefaultAudience)audience;
412+
+ (BFTask<NSNumber *> *)reauthorizeUserInBackground:(PFUser *)user
413+
withPublishPermissions:(nullable NSArray<NSString *> *)permissions
414+
audience:(FBSessionDefaultAudience)audience;
415415

416416
/*!
417417
@abstract Requests new Facebook publish permissions for the given user *asynchronously*.
@@ -427,7 +427,7 @@ NS_ASSUME_NONNULL_BEGIN
427427
It should have the following argument signature: `^(BOOL succeeded, NSError *error)`.
428428
*/
429429
+ (void)reauthorizeUser:(PFUser *)user
430-
withPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
430+
withPublishPermissions:(nullable NSArray<NSString *> *)permissions
431431
audience:(FBSessionDefaultAudience)audience
432432
block:(nullable PFBooleanResultBlock)block;
433433

@@ -446,7 +446,7 @@ NS_ASSUME_NONNULL_BEGIN
446446
It should have the following signature: `(void)callbackWithResult:(NSNumber *)result error:(NSError *)error`.
447447
*/
448448
+ (void)reauthorizeUser:(PFUser *)user
449-
withPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
449+
withPublishPermissions:(nullable NSArray<NSString *> *)permissions
450450
audience:(FBSessionDefaultAudience)audience
451451
target:(nullable id)target
452452
selector:(nullable SEL)selector;

‎ParseFacebookUtils/PFFacebookUtils.m‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ + (FBSessionLoginBehavior)facebookLoginBehavior {
9191
#pragma mark - Log In
9292
///--------------------------------------
9393

94-
+ (BFTask PF_GENERIC(PFUser *)*)logInWithPermissionsInBackground:(nullable NSArray PF_GENERIC(NSString *)*)permissions {
94+
+ (BFTask<PFUser *> *)logInWithPermissionsInBackground:(nullable NSArray<NSString *> *)permissions {
9595
[self checkInitialization];
9696
provider.permissions = permissions;
9797

@@ -100,22 +100,22 @@ + (FBSessionLoginBehavior)facebookLoginBehavior {
100100
}];
101101
}
102102

103-
+ (void)logInWithPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
103+
+ (void)logInWithPermissions:(nullable NSArray<NSString *> *)permissions
104104
block:(nullable PFUserResultBlock)block {
105105
[[self logInWithPermissionsInBackground:permissions] pffb_continueWithMainThreadUserBlock:block];
106106
}
107107

108-
+ (void)logInWithPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
108+
+ (void)logInWithPermissions:(nullable NSArray<NSString *> *)permissions
109109
target:(nullable id)target
110110
selector:(nullable SEL)selector {
111111
[self logInWithPermissions:permissions block:^(PFUser *user, NSError *error) {
112112
[PFFacebookPrivateUtilities safePerformSelector:selector onTarget:target withObject:user object:error];
113113
}];
114114
}
115115

116-
+ (BFTask PF_GENERIC(PFUser *)*)logInWithFacebookIdInBackground:(NSString *)facebookId
117-
accessToken:(NSString *)accessToken
118-
expirationDate:(NSDate *)expirationDate {
116+
+ (BFTask<PFUser *> *)logInWithFacebookIdInBackground:(NSString *)facebookId
117+
accessToken:(NSString *)accessToken
118+
expirationDate:(NSDate *)expirationDate {
119119
[self checkInitialization];
120120

121121
NSDictionary *authData = [provider authDataWithFacebookId:facebookId
@@ -154,13 +154,13 @@ + (void)logInWithFacebookId:(NSString *)facebookId
154154
#pragma mark - Link
155155
///--------------------------------------
156156

157-
+ (void)linkUser:(PFUser *)user permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions {
157+
+ (void)linkUser:(PFUser *)user permissions:(nullable NSArray<NSString *> *)permissions {
158158
// This is misnamed `*InBackground` method. Left as is for backward compatability.
159159
[self linkUserInBackground:user permissions:permissions];
160160
}
161161

162-
+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user
163-
permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions {
162+
+ (BFTask<NSNumber *> *)linkUserInBackground:(PFUser *)user
163+
permissions:(nullable NSArray<NSString *> *)permissions {
164164
[self checkInitialization];
165165
provider.permissions = permissions;
166166

@@ -170,7 +170,7 @@ + (void)linkUser:(PFUser *)user permissions:(nullable NSArray PF_GENERIC(NSStrin
170170
}
171171

172172
+ (void)linkUser:(PFUser *)user
173-
permissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
173+
permissions:(nullable NSArray<NSString *> *)permissions
174174
block:(nullable PFBooleanResultBlock)block {
175175
[[self linkUserInBackground:user permissions:permissions] pffb_continueWithMainThreadBooleanBlock:block];
176176
}
@@ -184,10 +184,10 @@ + (void)linkUser:(PFUser *)user
184184
}];
185185
}
186186

187-
+ (BFTask PF_GENERIC(NSNumber *)*)linkUserInBackground:(PFUser *)user
188-
facebookId:(NSString *)facebookId
189-
accessToken:(NSString *)accessToken
190-
expirationDate:(NSDate *)expirationDate {
187+
+ (BFTask<NSNumber *> *)linkUserInBackground:(PFUser *)user
188+
facebookId:(NSString *)facebookId
189+
accessToken:(NSString *)accessToken
190+
expirationDate:(NSDate *)expirationDate {
191191
[self checkInitialization];
192192

193193
NSDictionary *authData = [provider authDataWithFacebookId:facebookId
@@ -237,7 +237,7 @@ + (BOOL)unlinkUser:(PFUser *)user error:(NSError **)error {
237237
return [[[self unlinkUserInBackground:user] pffb_waitForResult:error] boolValue];
238238
}
239239

240-
+ (BFTask PF_GENERIC(NSNumber *)*)unlinkUserInBackground:(PFUser *)user {
240+
+ (BFTask<NSNumber *> *)unlinkUserInBackground:(PFUser *)user {
241241
[self checkInitialization];
242242
return [user unlinkWithAuthTypeInBackground:PFFacebookUserAuthenticationType];
243243
}
@@ -256,9 +256,9 @@ + (void)unlinkUserInBackground:(PFUser *)user target:(nullable id)target selecto
256256
#pragma mark - Reauthorize
257257
///--------------------------------------
258258

259-
+ (BFTask PF_GENERIC(NSNumber *)*)reauthorizeUserInBackground:(PFUser *)user
260-
withPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
261-
audience:(FBSessionDefaultAudience)audience {
259+
+ (BFTask<NSNumber *> *)reauthorizeUserInBackground:(PFUser *)user
260+
withPublishPermissions:(nullable NSArray<NSString *> *)permissions
261+
audience:(FBSessionDefaultAudience)audience {
262262
[self checkInitialization];
263263
if (![self isLinkedWithUser:user]) {
264264
[NSException raise:NSInternalInconsistencyException
@@ -273,7 +273,7 @@ + (void)unlinkUserInBackground:(PFUser *)user target:(nullable id)target selecto
273273
}
274274

275275
+ (void)reauthorizeUser:(PFUser *)user
276-
withPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
276+
withPublishPermissions:(nullable NSArray<NSString *> *)permissions
277277
audience:(FBSessionDefaultAudience)audience
278278
block:(nullable PFBooleanResultBlock)block {
279279
[[self reauthorizeUserInBackground:user
@@ -282,7 +282,7 @@ + (void)reauthorizeUser:(PFUser *)user
282282
}
283283

284284
+ (void)reauthorizeUser:(PFUser *)user
285-
withPublishPermissions:(nullable NSArray PF_GENERIC(NSString *)*)permissions
285+
withPublishPermissions:(nullable NSArray<NSString *> *)permissions
286286
audience:(FBSessionDefaultAudience)audience
287287
target:(nullable id)target
288288
selector:(nullable SEL)selector {

0 commit comments

Comments
 (0)