Skip to content

Commit 9a01571

Browse files
committed
Refactor StudyplusLoginDelegate
1 parent 384fe15 commit 9a01571

File tree

3 files changed

+9
-24
lines changed

3 files changed

+9
-24
lines changed

Lib/StudyplusSDK/Studyplus.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ final public class Studyplus {
148148
/// __[studyplus-{consumerKey}]__と正しいpathComponentsを持つことを確認してください。
149149
public func handle(_ url: URL) -> Bool {
150150
guard isAcceptableURL(url: url) else {
151-
delegate?.studyplusDidFailToLogin(error: .unknownUrl(url))
151+
delegate?.studyplusLoginFail(error: .unknownUrl(url))
152152
return false
153153
}
154154

@@ -168,15 +168,15 @@ final public class Studyplus {
168168
username: username) { result in
169169
switch result {
170170
case .failure(let error):
171-
self.delegate?.studyplusDidFailToLogin(error: error)
171+
self.delegate?.studyplusLoginFail(error: error)
172172
case .success:
173-
self.delegate?.studyplusDidSuccessToLogin()
173+
self.delegate?.studyplusLoginSuccess()
174174
}
175175
}
176176
case "fail":
177-
delegate?.studyplusDidFailToLogin(error: .fail)
177+
delegate?.studyplusLoginFail(error: .applicationError)
178178
case "cancel":
179-
delegate?.studyplusDidFailToLogin(error: .cancel)
179+
delegate?.studyplusLoginFail(error: .cancel)
180180
default:
181181
return false
182182
}

Lib/StudyplusSDK/StudyplusError.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ public enum StudyplusPostError: Error {
5252
public enum StudyplusLoginError: Error {
5353
case unknownUrl(_ url: URL)
5454
case keychainError
55-
case fail
55+
case applicationError
5656
case cancel
5757
}

Lib/StudyplusSDK/StudyplusLoginDelegate.swift

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,7 @@
2626

2727
import Foundation
2828

29-
/**
30-
The delegate to receive callbacks from Studyplus.
31-
32-
Studyplusオブジェクトに対する各種操作後のコールバックを受けるdelegateです。
33-
*/
34-
public protocol StudyplusLoginDelegate: class {
35-
36-
/// Will be called after the Studyplus#login was successful.
37-
///
38-
/// Studyplus#login が成功した後に呼ばれます。
39-
func studyplusDidSuccessToLogin()
40-
41-
/// Will be called after the Studyplus#login was failure.
42-
///
43-
/// Studyplus#login が失敗した後に呼ばれます。
44-
///
45-
/// - Parameter error: failure reason, see StudyplusError. 失敗の理由です。詳細は StudyplusError を参照してください。
46-
func studyplusDidFailToLogin(error: StudyplusLoginError)
29+
public protocol StudyplusLoginDelegate: AnyObject {
30+
func studyplusLoginSuccess()
31+
func studyplusLoginFail(error: StudyplusLoginError)
4732
}

0 commit comments

Comments
 (0)