add deprecated methods

zh2608 · Jan 7, 2016 · a8cd4e5 · a8cd4e5
1 parent 2458c41
commit a8cd4e5
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 32 deletions.
diff --git a/Classes/NWHub.h b/Classes/NWHub.h
@@ -143,4 +143,11 @@
  */
 - (BOOL)trimIdentifiers;
 
+// deprecated
+
++ (instancetype)connectWithDelegate:(id<NWHubDelegate>)delegate identity:(NWIdentityRef)identity error:(NSError **)error __deprecated;
++ (instancetype)connectWithDelegate:(id<NWHubDelegate>)delegate PKCS12Data:(NSData *)data password:(NSString *)password error:(NSError **)error __deprecated;
+- (BOOL)connectWithIdentity:(NWIdentityRef)identity error:(NSError **)error __deprecated;
+- (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError **)error __deprecated;
+
 @end
diff --git a/Classes/NWHub.m b/Classes/NWHub.m
@@ -205,4 +205,26 @@ - (BOOL)trimIdentifiers
     return !!old.count;
 }
 
+#pragma mark - Deprecated
+
+- (BOOL)connectWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithIdentity:identity environment:NWEnvironmentAuto error:error];
+}
+
+- (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithPKCS12Data:data password:password environment:NWEnvironmentAuto error:error];
+}
+
++ (instancetype)connectWithDelegate:(id<NWHubDelegate>)delegate identity:(NWIdentityRef)identity error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithDelegate:delegate identity:identity environment:NWEnvironmentAuto error:error];
+}
+
++ (instancetype)connectWithDelegate:(id<NWHubDelegate>)delegate PKCS12Data:(NSData *)data password:(NSString *)password error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithDelegate:delegate identity:data environment:NWEnvironmentAuto error:error];
+}
+
 @end
diff --git a/Classes/NWPushFeedback.h b/Classes/NWPushFeedback.h
@@ -6,7 +6,6 @@
 //
 
 #import "NWType.h"
-
 #import <Foundation/Foundation.h>
 
 @class NWSSLConnection;
@@ -55,4 +54,11 @@
 /** Read all (or max) token-date pairs, where token is hex string. */
 - (NSArray *)readTokenDatePairsWithMax:(NSUInteger)max error:(NSError **)error;
 
+// deprecated
+
++ (instancetype)connectWithIdentity:(NWIdentityRef)identity error:(NSError **)error __deprecated;
++ (instancetype)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError **)error __deprecated;
+- (BOOL)connectWithIdentity:(NWIdentityRef)identity error:(NSError **)error __deprecated;
+- (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError **)error __deprecated;
+
 @end
diff --git a/Classes/NWPushFeedback.m b/Classes/NWPushFeedback.m
@@ -23,7 +23,7 @@ @implementation NWPushFeedback
 - (BOOL)connectWithIdentity:(NWIdentityRef)identity environment:(NWEnvironment)environment error:(NSError *__autoreleasing *)error
 {
     if (_connection) [_connection disconnect]; _connection = nil;
-
+    if (environment == NWEnvironmentAuto) environment = [NWSecTools environmentForIdentity:identity];
     NSString *host = (environment == NWEnvironmentSandbox) ? NWSandboxPushHost : NWPushHost;
     NWSSLConnection *connection = [[NWSSLConnection alloc] initWithHost:host port:NWPushPort identity:identity];
     BOOL connected = [connection connectWithError:error];
@@ -123,4 +123,26 @@ - (NSArray *)readTokenDatePairsWithMax:(NSUInteger)max error:(NSError *__autorel
     return pairs;
 }
 
+#pragma mark - Deprecated
+
+- (BOOL)connectWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithIdentity:identity environment:NWEnvironmentAuto error:error];
+}
+
+- (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithPKCS12Data:data password:password environment:NWEnvironmentAuto error:error];
+}
+
++ (instancetype)connectWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithIdentity:identity environment:NWEnvironmentAuto error:error];
+}
+
++ (instancetype)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithPKCS12Data:data password:password environment:NWEnvironmentAuto error:error];
+}
+
 @end
diff --git a/Classes/NWPusher.h b/Classes/NWPusher.h
@@ -67,4 +67,11 @@
 /** Read back multiple notification identifiers of, up to max, failed pushes. */
 - (NSArray *)readFailedIdentifierErrorPairsWithMax:(NSUInteger)max error:(NSError **)error;
 
+// deprecated
+
++ (instancetype)connectWithIdentity:(NWIdentityRef)identity error:(NSError **)error __deprecated;
++ (instancetype)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError **)error __deprecated;
+- (BOOL)connectWithIdentity:(NWIdentityRef)identity error:(NSError **)error __deprecated;
+- (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError **)error __deprecated;
+
 @end
diff --git a/Classes/NWPusher.m b/Classes/NWPusher.m
@@ -22,7 +22,7 @@ @implementation NWPusher
 - (BOOL)connectWithIdentity:(NWIdentityRef)identity environment:(NWEnvironment)environment error:(NSError *__autoreleasing *)error
 {
     if (_connection) [_connection disconnect]; _connection = nil;
-
+    if (environment == NWEnvironmentAuto) environment = [NWSecTools environmentForIdentity:identity];
     NSString *host = (environment == NWEnvironmentSandbox) ? NWSandboxPushHost : NWPushHost;
     NWSSLConnection *connection = [[NWSSLConnection alloc] initWithHost:host port:NWPushPort identity:identity];
     BOOL connected = [connection connectWithError:error];
@@ -39,7 +39,7 @@ - (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password envir
     if (!identity) {
         return NO;
     }
-    return [self connectWithIdentity:identity environment:(NWEnvironment)environment error:error];
+    return [self connectWithIdentity:identity environment:environment error:error];
 }
 
 - (BOOL)reconnectWithError:(NSError *__autoreleasing *)error
@@ -142,4 +142,26 @@ - (NSArray *)readFailedIdentifierErrorPairsWithMax:(NSUInteger)max error:(NSErro
     return pairs;
 }
 
+#pragma mark - Deprecated
+
+- (BOOL)connectWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithIdentity:identity environment:NWEnvironmentAuto error:error];
+}
+
+- (BOOL)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithPKCS12Data:data password:password environment:NWEnvironmentAuto error:error];
+}
+
++ (instancetype)connectWithIdentity:(NWIdentityRef)identity error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithIdentity:identity environment:NWEnvironmentAuto error:error];
+}
+
++ (instancetype)connectWithPKCS12Data:(NSData *)data password:(NSString *)password error:(NSError *__autoreleasing *)error
+{
+    return [self connectWithPKCS12Data:data password:password environment:NWEnvironmentAuto error:error];
+}
+
 @end
diff --git a/Classes/NWSecTools.h b/Classes/NWSecTools.h
@@ -12,7 +12,6 @@
 
  This is practically the glue that connects this framework to the Security framework and allows interacting with the OS Keychain and PKCS #12 files. It is mostly an Objective-C around the Security framework, including the benefits of ARC. `NWIdentityRef`, `NWCertificateRef` and `NWKeyRef` represent respectively `SecIdentityRef`, `SecCertificateRef`, `SecKeyRef`. It uses Cocoa-style error handling, so methods return `nil` or `NO` if an error occurred.
  */
-
 @interface NWSecTools : NSObject
 
 /** @name Initialization */
@@ -67,4 +66,11 @@
 + (NSDictionary *)valuesWithCertificate:(NWCertificateRef)certificate keys:(NSArray *)keys error:(NSError **)error;
 #endif
 
+// deprecated
+
++ (BOOL)isSandboxIdentity:(NWIdentityRef)identity __deprecated;
++ (BOOL)isSandboxCertificate:(NWCertificateRef)certificate __deprecated;
++ (NWEnvironment)environmentForIdentity:(NWIdentityRef)identity;
++ (NWEnvironment)environmentForCertificate:(NWCertificateRef)certificate;
+
 @end
diff --git a/Classes/NWSecTools.m b/Classes/NWSecTools.m
@@ -155,7 +155,6 @@ + (BOOL)isPushCertificate:(NWCertificateRef)certificate
         case kNWCertTypeWebProduction:
         case kNWCertTypeVoIPServices:
             return YES;
-
         case kNWCertTypeNone:
         case kNWCertTypeUnknown:
             break;
@@ -309,4 +308,42 @@ + (NSDictionary *)valuesWithCertificate:(NWCertificateRef)certificate keys:(NSAr
 }
 #endif
 
+#pragma mark - Deprecated
+
++ (BOOL)isSandboxIdentity:(NWIdentityRef)identity
+{
+    return [self environmentForIdentity:identity] == NWEnvironmentSandbox;
+}
+
++ (BOOL)isSandboxCertificate:(NWCertificateRef)certificate
+{
+    return [self environmentForCertificate:certificate] == NWEnvironmentSandbox;
+}
+
++ (NWEnvironment)environmentForIdentity:(NWIdentityRef)identity
+{
+    NWCertificateRef certificate = [self certificateWithIdentity:identity error:nil];
+    return [self environmentForCertificate:certificate];
+}
+
++ (NWEnvironment)environmentForCertificate:(NWCertificateRef)certificate
+{
+    switch ([self typeWithCertificate:certificate summary:nil]) {
+        case kNWCertTypeIOSDevelopment:
+        case kNWCertTypeMacDevelopment:
+            return NWEnvironmentSandbox;
+
+        case kNWCertTypeIOSProduction:
+        case kNWCertTypeMacProduction:
+            return NWEnvironmentProduction;
+        case kNWCertTypeSimplified:
+        case kNWCertTypeWebProduction:
+        case kNWCertTypeVoIPServices:
+        case kNWCertTypeNone:
+        case kNWCertTypeUnknown:
+            break;
+    }
+    return NWEnvironmentOptionNone;
+}
+
 @end
diff --git a/Classes/NWType.h b/Classes/NWType.h
@@ -163,8 +163,10 @@ typedef NS_ENUM(NSInteger, NWError) {
 };
 
 typedef NS_ENUM(NSInteger, NWEnvironment) {
-    NWEnvironmentSandbox = 0,
-    NWEnvironmentProduction = 1,
+    NWEnvironmentNone = 0,
+    NWEnvironmentSandbox = 1,
+    NWEnvironmentProduction = 2,
+    NWEnvironmentAuto = 3,
 };
 
 typedef NS_ENUM(NSInteger, NWEnvironmentOptions) {

diff --git a/Classes/NWType.m b/Classes/NWType.m
@@ -12,38 +12,22 @@
 NSString * descriptionForEnvironentOptions(NWEnvironmentOptions environmentOptions)
 {
     switch (environmentOptions) {
-        case NWEnvironmentOptionNone:
-            return @"No environment";
-
-        case NWEnvironmentOptionSandbox:
-            return @"Sandbox";
-
-        case NWEnvironmentOptionProduction:
-            return @"Production";
-
-        case NWEnvironmentOptionAny:
-            return @"Sandbox|Production";
-
-        default:
-            break;
+        case NWEnvironmentOptionNone: return @"No environment";
+        case NWEnvironmentOptionSandbox: return @"Sandbox";
+        case NWEnvironmentOptionProduction: return @"Production";
+        case NWEnvironmentOptionAny: return @"Sandbox|Production";
     }
-
     return nil;
 }
 
 NSString * descriptionForEnvironent(NWEnvironment environment)
 {
     switch (environment) {
-        case NWEnvironmentProduction:
-            return @"production";
-
-        case NWEnvironmentSandbox:
-            return @"sandbox";
-
-        default:
-            break;
+        case NWEnvironmentNone: return @"none";
+        case NWEnvironmentProduction: return @"production";
+        case NWEnvironmentSandbox: return @"sandbox";
+        case NWEnvironmentAuto: return @"auto";
     }
-
     return nil;
 }