OneTimePassword を扱うための Model を追加 #20
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| // | ||
| // OneTimePasswordSettings.h | ||
| // OneTimePasswordExample | ||
| // | ||
| // Created by KAWASHIMA Yoshiyuki on 2021/11/15. | ||
| // | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
| #import "OneTimePassword.h" | ||
|
|
||
| NS_ASSUME_NONNULL_BEGIN | ||
|
|
||
| @interface OneTimePasswordSettings : NSObject | ||
|
|
||
| @property (nonatomic) NSData *secretData; | ||
| @property (nonatomic) NSString *name; | ||
| @property (nonatomic) NSString *issuer; | ||
| @property (nonatomic) OTPAlgorithm algorithm; | ||
| @property (nonatomic) NSUInteger digits; | ||
| @property (nonatomic) NSTimeInterval period; | ||
|
|
||
| + (instancetype)sharedInstance; | ||
|
|
||
| - (NSString *)generateOneTimePassword; | ||
|
|
||
| // 設定の比較用に文字列表現を取得できるようにする | ||
| - (NSString *)algorithmString; | ||
| - (NSString *)digitsString; | ||
| - (NSString *)periodString; | ||
|
|
||
| // 設定の文字列から保存できるようにする | ||
| - (void)saveAlgorithmString:(NSString *)algorithmString; | ||
| - (void)saveDigitsString:(NSString *)digitsString; | ||
| - (void)savePeriodString:(NSString *)periodString; | ||
|
|
||
| @end | ||
|
|
||
| NS_ASSUME_NONNULL_END | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| // | ||
| // OneTimePasswordSettings.m | ||
| // OneTimePasswordExample | ||
| // | ||
| // Created by KAWASHIMA Yoshiyuki on 2021/11/15. | ||
| // | ||
|
|
||
| #import "OneTimePasswordSettings.h" | ||
| #import <Base32/MF_Base32Additions.h> | ||
|
|
||
| @implementation OneTimePasswordSettings | ||
|
|
||
| + (instancetype)sharedInstance { | ||
|
Collaborator
There was a problem hiding this comment. @ykws
Owner
Author
There was a problem hiding this comment. @NMai-source とても良い指摘です。 結論としては必要ないです。
|
||
| static OneTimePasswordSettings *sharedInstance = nil; | ||
| static dispatch_once_t onceToken; | ||
| dispatch_once(&onceToken, ^{ | ||
|
|
||
| sharedInstance = [[OneTimePasswordSettings alloc] init]; | ||
|
|
||
| NSString *name = @"..."; | ||
| NSString *issuer = @"..."; | ||
| NSString *secretString = @"..."; | ||
|
|
||
| NSData *secretData = [NSData dataWithBase32String:secretString]; | ||
|
|
||
| sharedInstance.secretData = secretData; | ||
| sharedInstance.name = name; | ||
| sharedInstance.issuer = issuer; | ||
| sharedInstance.algorithm = [OTPToken defaultAlgorithm]; | ||
| sharedInstance.digits = [OTPToken defaultDigits]; | ||
| sharedInstance.period = [OTPToken defaultPeriod]; | ||
|
|
||
| }); | ||
| return sharedInstance; | ||
| } | ||
|
|
||
| - (NSString *)generateOneTimePassword { | ||
|
|
||
| OTPToken *token = [OTPToken tokenWithType:OTPTokenTypeTimer secret:self.secretData name:self.name issuer:self.issuer]; | ||
| token.algorithm = self.algorithm; | ||
| token.digits = self.digits; | ||
| token.period = self.period; | ||
| return token.password; | ||
| } | ||
|
|
||
| - (NSString *)algorithmString { | ||
|
Owner
Author
There was a problem hiding this comment. 以下のコンバートの責務は Converter に切り離して、ここではそれを呼ぶだけにしても良さそう
|
||
| return [NSString stringForAlgorithm:self.algorithm]; | ||
| } | ||
|
|
||
| - (NSString *)digitsString { | ||
| return [NSString stringWithFormat:@"%d", (int)self.digits]; | ||
|
Owner
Author
There was a problem hiding this comment. int のキャストは雑ですが、メニューでの設定値が限定されているので問題ないもの考えています。 |
||
| } | ||
|
|
||
| - (NSString *)periodString { | ||
| return [NSString stringWithFormat:@"%d", (int)self.period]; | ||
| } | ||
|
|
||
| - (void)saveAlgorithmString:(NSString *)algorithmString { | ||
| self.algorithm = [algorithmString algorithmValue]; | ||
| } | ||
|
|
||
| - (void)saveDigitsString:(NSString *)digitsString { | ||
| self.digits = [digitsString intValue]; | ||
| } | ||
|
|
||
| - (void)savePeriodString:(NSString *)periodString { | ||
| self.period = [periodString intValue]; | ||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,14 +7,14 @@ | |
|
|
||
| #import "SettingController.h" | ||
| #import "SettingsTableViewCell.h" | ||
|
Owner
Author
There was a problem hiding this comment. Model/OneTimePasswordSettings を経由してデータの共有をしているため、 ViewController への依存をなくしました。 |
||
| #import "OneTimePasswordSettings.h" | ||
|
|
||
| #pragma mark - Settings item | ||
|
|
||
| typedef NS_ENUM(UInt8, SettingsItem) { | ||
| AlgorithmItem, | ||
| DigitsItem, | ||
| PeriodItem, | ||
|
|
||
| }; | ||
|
|
||
| extern SettingsItem SettingsItemUnknown; | ||
|
|
@@ -24,6 +24,8 @@ typedef NS_ENUM(UInt8, SettingsItem) { | |
|
|
||
| @interface SettingController () <UIPickerViewDataSource, UIPickerViewDelegate> | ||
|
|
||
| @property (nonatomic) OneTimePasswordSettings *settings; | ||
|
|
||
| @property (nonatomic) SettingsItem settingsItem; | ||
|
|
||
| @property (nonatomic) UIPickerView *pickerView; | ||
|
|
@@ -32,10 +34,6 @@ @interface SettingController () <UIPickerViewDataSource, UIPickerViewDelegate> | |
| @property (nonatomic) NSArray *digitsPatterns; | ||
| @property (nonatomic) NSArray *periodPatterns; | ||
|
|
||
|
Owner
Author
There was a problem hiding this comment. Model/OneTimePasswordSettings を利用するようになったので不要になりました。 |
||
| @end | ||
|
|
||
| @implementation SettingController { | ||
|
|
@@ -45,6 +43,8 @@ @implementation SettingController { | |
| - (void)viewDidLoad { | ||
| [super viewDidLoad]; | ||
|
|
||
| self.settings = [OneTimePasswordSettings sharedInstance]; | ||
|
|
||
| self.pickerView = [[UIPickerView alloc] init]; | ||
| self.pickerView.center = self.view.center; | ||
| self.pickerView.dataSource = self; | ||
|
|
@@ -54,10 +54,6 @@ - (void)viewDidLoad { | |
| self.algorithmPatterns = @[@"SHA1", @"SHA256", @"SHA512"]; | ||
| self.digitsPatterns = @[@"4", @"5", @"6", @"7", @"8", @"9", @"10"]; | ||
| self.periodPatterns = @[@"30", @"60"]; | ||
| } | ||
|
|
||
| #pragma mark - Table view data source | ||
|
|
@@ -76,15 +72,15 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N | |
| switch (indexPath.row) { | ||
| case 0: | ||
| cell.titleLabel.text = @"アルゴリズム"; | ||
| cell.valueLabel.text = [self.settings algorithmString]; | ||
| break; | ||
| case 1: | ||
| cell.titleLabel.text = @"OTP桁数"; | ||
| cell.valueLabel.text = [self.settings digitsString]; | ||
| break; | ||
| case 2: | ||
| cell.titleLabel.text = @"タイムステップ数"; | ||
| cell.valueLabel.text = [self.settings periodString]; | ||
| break; | ||
| } | ||
|
|
||
|
|
@@ -94,8 +90,10 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N | |
| #pragma mark - Table view delegate | ||
|
|
||
| - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { | ||
| // FIXME: タップしても反応しないことがある | ||
|
Owner
Author
There was a problem hiding this comment. 設定画面の任意のセルをタップしても #17 Model を追加とは別で、 TableView+Picker の課題なので、別途 Issue を作成して対応します。 |
||
| self.settingsItem = indexPath.row; | ||
| NSInteger selectRow = [self pickerSelectRowWithItem:self.settingsItem]; | ||
| [self.pickerView selectRow:selectRow inComponent:0 animated:true]; | ||
| [self.pickerView reloadAllComponents]; | ||
| } | ||
|
|
||
|
|
@@ -111,7 +109,7 @@ - (NSInteger)pickerView:(nonnull UIPickerView *)pickerView numberOfRowsInCompone | |
| return self.algorithmPatterns.count; | ||
| case DigitsItem: | ||
| return self.digitsPatterns.count; | ||
| case PeriodItem: | ||
| return self.periodPatterns.count; | ||
| default: | ||
| return 0; | ||
|
|
@@ -126,7 +124,7 @@ - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row f | |
| return self.algorithmPatterns[row]; | ||
| case DigitsItem: | ||
| return self.digitsPatterns[row]; | ||
| case PeriodItem: | ||
| return self.periodPatterns[row]; | ||
| } | ||
|
|
||
|
|
@@ -136,25 +134,58 @@ - (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row f | |
| - (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component { | ||
| switch (self.settingsItem) { | ||
| case AlgorithmItem: | ||
| [self.settings saveAlgorithmString:self.algorithmPatterns[row]]; | ||
| break; | ||
| case DigitsItem: | ||
| [self.settings saveDigitsString:self.digitsPatterns[row]]; | ||
| break; | ||
| case PeriodItem: | ||
| [self.settings savePeriodString:self.periodPatterns[row]]; | ||
| break; | ||
| } | ||
|
|
||
| [self.tableView reloadData]; | ||
| } | ||
|
|
||
| #pragma mark - Settigns Index | ||
|
|
||
| - (NSInteger)pickerSelectRowWithItem:(SettingsItem)item{ | ||
| switch (item) { | ||
| case AlgorithmItem: | ||
| return [self indexWithAlgorithmString:[self.settings algorithmString]]; | ||
| case DigitsItem: | ||
| return [self indexWithDigitsString:[self.settings digitsString]]; | ||
| case PeriodItem: | ||
| return [self indexWithPeriodString:[self.settings periodString]]; | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| - (NSInteger)indexWithAlgorithmString:(NSString *)algorithmString { | ||
| for (int i = 0; i < self.algorithmPatterns.count; i++) { | ||
| if ([self.algorithmPatterns[i] isEqual:algorithmString]) { | ||
| return i; | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| - (NSInteger)indexWithDigitsString:(NSString *)digitsString { | ||
| for (int i = 0; i < self.digitsPatterns.count; i++) { | ||
| if ([self.digitsPatterns[i] isEqual:digitsString]) { | ||
| return i; | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| - (NSInteger)indexWithPeriodString:(NSString *)periodString { | ||
| for (int i = 0; i < self.periodPatterns.count; i++) { | ||
| if ([self.periodPatterns[i] isEqual:periodString]) { | ||
| return i; | ||
| } | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
save より store の方がしっくりくる