ease_SecAttrAccount

wanghengheng · wanghengheng · commit 87a8a2aa9bb0 · 2015-07-06T14:59:17.000+08:00
diff --git a/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m b/Coding_iOS/Ease_2FA/Controllers/OTPListViewController.m
@@ -11,6 +11,7 @@
 #import "OTPTableViewCell.h"
 
 #import "OTPAuthURL.h"
+#import <SSKeychain/SSKeychain.h>
 
 static NSString *const kOTPKeychainEntriesArray = @"OTPKeychainEntries";
 
@@ -38,24 +39,16 @@ - (void)viewDidLoad{
 }
 
 - (void)loadKeychainArray{
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    NSArray *savedKeychainReferences = [ud arrayForKey:kOTPKeychainEntriesArray];
-    self.authURLs = [NSMutableArray arrayWithCapacity:[savedKeychainReferences count]];
-    for (NSData *keychainRef in savedKeychainReferences) {
-        OTPAuthURL *authURL = [OTPAuthURL authURLWithKeychainItemRef:keychainRef];
+    NSArray *otpAccountDictList = [SSKeychain accountsForService:kOTPService];
+    self.authURLs = [NSMutableArray arrayWithCapacity:[otpAccountDictList count]];
+    for (NSDictionary *otpAccountDict in otpAccountDictList) {
+        OTPAuthURL *authURL = [OTPAuthURL ease_authURLWithKeychainDictionary:otpAccountDict];
         if (authURL) {
             [self.authURLs addObject:authURL];
         }
     }
 }
 
-- (void)saveKeychainArray {
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    NSArray *keychainReferences = [self valueForKeyPath:@"authURLs.keychainItemRef"];
-    [ud setObject:keychainReferences forKey:kOTPKeychainEntriesArray];
-    [ud synchronize];
-}
-
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     [self configUI];
@@ -141,7 +134,6 @@ - (void)beginButtonClicked:(id)sender{
 - (void)addOneAuthURL:(OTPAuthURL *)authURL{
     [authURL saveToKeychain];
     [self.authURLs addObject:authURL];
-    [self saveKeychainArray];
     [self configUI];
 }
 
@@ -197,7 +189,6 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
         OTPAuthURL *authURL = self.authURLs[indexPath.section];
         [self.authURLs removeObject:authURL];
         [authURL removeFromKeychain];
-        [self saveKeychainArray];
         [self configUI];
     }
 }
diff --git a/Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.h b/Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.h
@@ -17,6 +17,7 @@
 //
 
 #import <Foundation/Foundation.h>
+static NSString *const kOTPService = @"com.google.otp.authentication";
 
 @class OTPGenerator;
 
@@ -29,7 +30,7 @@
 @interface OTPAuthURL : NSObject
 
 // |name| is an arbitrary UTF8 text string extracted from the url path.
-@property (nonatomic, copy) NSString *name, *issuer;
+@property (nonatomic, copy) NSString *name, *issuer, *ease_SecAttrAccount;
 @property (nonatomic, copy, readonly) NSString *otpCode;
 @property (nonatomic, copy, readonly) NSString *checkCode;
 @property (nonatomic, strong, readonly) NSData *keychainItemRef;
@@ -38,6 +39,8 @@
                         secret:(NSData *)secret;
 + (OTPAuthURL *)authURLWithKeychainItemRef:(NSData *)keychainItemRef;
 
++ (OTPAuthURL *)ease_authURLWithKeychainDictionary:(NSDictionary *)dict;//
+
 // Returns a reconstructed NSURL object representing the current state of the
 // |generator|.
 - (NSURL *)url;
diff --git a/Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.m b/Coding_iOS/Ease_2FA/GoogleOTP/OTPAuthURL.m
@@ -28,9 +28,10 @@
 #import "HOTPGenerator.h"
 #import "TOTPGenerator.h"
 
+#import <SSKeychain/SSKeychain.h>
+
 static NSString *const kOTPAuthScheme = @"otpauth";
 static NSString *const kTOTPAuthScheme = @"totp";
-static NSString *const kOTPService = @"com.google.otp.authentication";
 // These are keys in the otpauth:// query string.
 static NSString *const kQueryAlgorithmKey = @"algorithm";
 static NSString *const kQuerySecretKey = @"secret";
@@ -165,6 +166,17 @@ + (OTPAuthURL *)authURLWithKeychainItemRef:(NSData *)data {
   return authURL;
 }
 
++ (OTPAuthURL *)ease_authURLWithKeychainDictionary:(NSDictionary *)dict{
+    OTPAuthURL *authURL = [self authURLWithKeychainDictionary:dict];
+    if (authURL) {
+        NSString *secAttrAccount = dict[(__bridge id)kSecAttrAccount];
+        if (secAttrAccount.length > 0) {
+            authURL.ease_SecAttrAccount = secAttrAccount;
+        }
+    }
+    return authURL;
+}
+
 + (OTPAuthURL *)authURLWithKeychainDictionary:(NSDictionary *)dict {
   NSData *urlData = dict[(__bridge id)kSecAttrGeneric];
   NSData *secretData = dict[(__bridge id)kSecValueData];
@@ -258,6 +270,10 @@ - (BOOL)saveToKeychain {
 }
 
 - (BOOL)removeFromKeychain {
+    if (self.ease_SecAttrAccount.length > 0) {
+        return [SSKeychain deletePasswordForService:kOTPService account:self.ease_SecAttrAccount];
+    }
+    
   if (![self isInKeychain]) {
     return NO;
   }
