账号设置里面添加「关闭两步验证」功能

Author: wanghengheng

Coding_iOS/Controllers/Login/Close2FAViewController.h

@@ -9,5 +9,5 @@
 #import "BaseViewController.h"
 
 @interface Close2FAViewController : BaseViewController
-+ (id)vcWithPhone:(NSString *)phone sucessBlock:(void(^)())block;
++ (id)vcWithPhone:(NSString *)phone sucessBlock:(void(^)(UIViewController *vc))block;
 @end

Coding_iOS/Controllers/Login/Close2FAViewController.m

@@ -13,15 +13,15 @@
 
 @interface Close2FAViewController ()<UITableViewDataSource, UITableViewDelegate>
 @property (strong, nonatomic) NSString *phone, *phoneCode;
-@property (copy, nonatomic) void (^sucessBlock)();
+@property (copy, nonatomic) void (^sucessBlock)(UIViewController *vc);
 
 @property (strong, nonatomic) TPKeyboardAvoidingTableView *myTableView;
 @property (strong, nonatomic) UIButton *footerBtn;
 @property (strong, nonatomic) NSString *phoneCodeCellIdentifier;
 @end
 
 @implementation Close2FAViewController
-+ (id)vcWithPhone:(NSString *)phone sucessBlock:(void (^)())block{
++ (id)vcWithPhone:(NSString *)phone sucessBlock:(void (^)(UIViewController *vc))block{
     Close2FAViewController *vc = [self new];
     vc.phone = [phone isPhoneNo]? phone: nil;
     vc.sucessBlock = block;
@@ -136,7 +136,7 @@ - (void)footerBtnClicked:(id)sender{
         if (data) {
             [NSObject showHudTipStr:@"两步验证已关闭"];
             if (self.sucessBlock) {
-                self.sucessBlock();
+                self.sucessBlock(self);
             }
         }
     }];

Coding_iOS/Controllers/Login/LoginViewController.m

@@ -459,7 +459,7 @@ - (void)sendActivateEmail{
 - (IBAction)cannotLoginBtnClicked:(id)sender {
     UIViewController *vc;
     if (_is2FAUI) {
-        vc = [Close2FAViewController vcWithPhone:self.myLogin.email sucessBlock:^{
+        vc = [Close2FAViewController vcWithPhone:self.myLogin.email sucessBlock:^(UIViewController *vc) {
             self.is2FAUI = NO;
             [self.navigationController popToRootViewControllerAnimated:YES];
         }];

Coding_iOS/Controllers/MeSetting/SettingAccountViewController.m

@@ -15,11 +15,12 @@
 #import "SettingPhoneViewController.h"
 #import "Coding_NetAPIManager.h"
 #import "Login.h"
+#import "Close2FAViewController.h"
 
 @interface SettingAccountViewController ()
 @property (strong, nonatomic) User *myUser;
-
 @property (strong, nonatomic) UITableView *myTableView;
+@property (assign, nonatomic) BOOL is2FAOpen;
 @end
 
 @implementation SettingAccountViewController
@@ -53,12 +54,23 @@ - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     self.myUser = [Login curLoginUser];
     [self.myTableView reloadData];
+    [self refresh2FA];
+}
+
+- (void)refresh2FA{
+    __weak typeof(self) weakSelf = self;
+    [[Coding_NetAPIManager sharedManager] get_is2FAOpenBlock:^(BOOL data, NSError *error) {
+        if (!error) {
+            weakSelf.is2FAOpen = data;
+            [weakSelf.myTableView reloadData];
+        }
+    }];
 }
 
 #pragma mark TableM
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return 3;
+    return _is2FAOpen? 4: 3;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
@@ -95,7 +107,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
         }
     }else{
         TitleDisclosureCell *cell = [tableView dequeueReusableCellWithIdentifier:kCellIdentifier_TitleDisclosure forIndexPath:indexPath];
-        [cell setTitleStr:@"修改密码"];
+        [cell setTitleStr:indexPath.section == 2? @"修改密码": @"关闭两步验证"];
         [tableView addLineforPlainCell:cell forRowAtIndexPath:indexPath withLeftSpace:kPaddingLeftWidth];
         return cell;
     }
@@ -137,6 +149,11 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
         SettingPasswordViewController *vc = [[SettingPasswordViewController alloc] init];
         vc.myUser = self.myUser;
         [self.navigationController pushViewController:vc animated:YES];
+    }else if (indexPath.section == 3){
+        Close2FAViewController *vc = [Close2FAViewController vcWithPhone:_myUser.phone sucessBlock:^(UIViewController *vcc) {
+            [vcc.navigationController popToRootViewControllerAnimated:YES];
+        }];
+        [self.navigationController pushViewController:vc animated:YES];
     }
 }
 

Coding_iOS/Controllers/RootControllers/BaseViewController.m

@@ -41,6 +41,18 @@ typedef NS_ENUM(NSInteger, AnalyseMethodType) {
     AnalyseMethodTypeForceCreate
 };
 
+#pragma mark - UIViewController (Dismiss)
+@interface UIViewController (Dismiss)
+- (void)dismissModalVC;
+@end
+@implementation UIViewController (Dismiss)
+- (void)dismissModalVC{
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+@end
+
+#pragma mark - BaseViewController
+
 @interface BaseViewController ()
 
 @end
@@ -401,7 +413,7 @@ + (void)presentVC:(UIViewController *)viewController{
     }
     UINavigationController *nav = [[BaseNavigationController alloc] initWithRootViewController:viewController];
     if (!viewController.navigationItem.leftBarButtonItem) {
-        viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"关闭" style:UIBarButtonItemStylePlain target:viewController action:@selector(dismissModalViewControllerAnimated:)];
+        viewController.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"关闭" style:UIBarButtonItemStylePlain target:viewController action:@selector(dismissModalVC)];
     }
     [[self presentingVC] presentViewController:nav animated:YES completion:nil];
 }

Coding_iOS/Util/Manager/Coding_NetAPIManager.h

@@ -246,6 +246,7 @@ typedef NS_ENUM(NSInteger, PurposeType) {
 #pragma mark - 2FA
 - (void)post_Close2FAGeneratePhoneCode:(NSString *)phone block:(void (^)(id data, NSError *error))block;
 - (void)post_Close2FAWithPhone:(NSString *)phone code:(NSString *)code block:(void (^)(id data, NSError *error))block;
+- (void)get_is2FAOpenBlock:(void (^)(BOOL data, NSError *error))block;
 
 #pragma mark - Topic HotKey
 - (void)request_TopicHotkeyWithBlock:(void (^)(id data, NSError *error))block;

Coding_iOS/Util/Manager/Coding_NetAPIManager.m

@@ -2576,6 +2576,12 @@ - (void)post_Close2FAWithPhone:(NSString *)phone code:(NSString *)code block:(vo
     }];
 }
 
+- (void)get_is2FAOpenBlock:(void (^)(BOOL data, NSError *error))block{
+    [[CodingNetAPIClient sharedJsonClient] requestJsonDataWithPath:@"api/user/2fa/method" withParams:nil withMethodType:Get andBlock:^(id data, NSError *error) {
+        block([data[@"data"] isEqualToString:@"totp"], error);
+    }];
+}
+
 #pragma mark -
 #pragma mark Topic HotKey