Skip to content

Commit cfa48e4

Browse files
committed
make returned credential optional
1 parent 4dd0f7c commit cfa48e4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ObjectiveGit/GTCredential.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
3232
///
3333
/// credentialBlock - a block that will be called when credentials are requested.
3434
/// Must not be nil.
35-
+ (instancetype)providerWithBlock:(GTCredential *(^)(GTCredentialType type, NSString *URL, NSString *userName))credentialBlock;
35+
+ (instancetype)providerWithBlock:(GTCredential * _Nullable(^)(GTCredentialType type, NSString *URL, NSString *userName))credentialBlock;
3636

3737
/// Default credential provider method.
3838
///
@@ -46,7 +46,7 @@ NS_ASSUME_NONNULL_BEGIN
4646
/// type - the credential types allowed by the operation.
4747
/// URL - the URL the operation is authenticating against.
4848
/// userName - the user name provided by the operation. Can be nil, and might be ignored.
49-
- (GTCredential *)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(nullable NSString *)userName;
49+
- (GTCredential * _Nullable)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(nullable NSString *)userName;
5050
@end
5151

5252
/// The GTCredential class is used to provide authentication data.

ObjectiveGit/GTCredential.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#import "git2/errors.h"
1414

15-
typedef GTCredential *(^GTCredentialProviderBlock)(GTCredentialType allowedTypes, NSString *URL, NSString *userName);
15+
typedef GTCredential * _Nullable (^GTCredentialProviderBlock)(GTCredentialType allowedTypes, NSString *URL, NSString *userName);
1616

1717
@interface GTCredentialProvider ()
1818
@property (nonatomic, readonly, copy) GTCredentialProviderBlock credBlock;
@@ -30,7 +30,7 @@ + (instancetype)providerWithBlock:(GTCredentialProviderBlock)credentialBlock {
3030
return provider;
3131
}
3232

33-
- (GTCredential *)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(NSString *)userName {
33+
- (GTCredential * _Nullable)credentialForType:(GTCredentialType)type URL:(NSString *)URL userName:(NSString *)userName {
3434
NSAssert(self.credBlock != nil, @"Provider asked for credentials without block being set.");
3535

3636
return self.credBlock(type, URL, userName);

0 commit comments

Comments
 (0)