Fix

koji-1009 · koji-1009 · commit 74ddea62ead5 · 2021-03-16T11:07:32.000+09:00
diff --git a/Lib/StudyplusSDK/Studyplus.swift b/Lib/StudyplusSDK/Studyplus.swift
@@ -26,88 +26,67 @@
 
 import UIKit
 
-/**
- The class for using Studyplus.
- For example, you can authenticate in Studyplus account, de-authentication, and post study record.
-
- Studyplusの各機能を使うためのクラスです。
- Studyplusアカウントとの連携、連携解除、勉強記録の投稿ができます。
- */
 final public class Studyplus {
 
-    /**
-     Returns the shared defaults object.
-     
-     Studyplusのオブジェクトを返します
-     */
-    public static let shared: Studyplus = Studyplus()
+    private init() {
+        guard let data = Bundle.main.infoDictionary?["StudyplusSDK"] as? [String: String],
+              let consumerKey = data["consumerKey"],
+              let consumerSecret = data["consumerSecret"] else {
+            assert(false, "StudyplusSDK: *** Please set consumerKey and consumerSecret in your Info.plist. ***")
 
-    /**
-     Consumer Key for Studyplus API.
+            self.consumerKey = ""
+            self.consumerSecret = ""
+            return
+        }
 
-     StudyplusAPI用のConsumer Keyです。
-     */
-    public private(set) var consumerKey: String
+        if consumerKey == "set_your_consumerKey" || consumerSecret == "set_your_consumerSecret" {
+            assert(false, "StudyplusSDK: *** Please set consumerKey and consumerSecret in Info.plist. ***")
 
-    /**
-     Consumer Secret for Studyplus API.
+            self.consumerKey = ""
+            self.consumerSecret = ""
+            return
+        }
 
-     StudyplusAPI用のConsumer Secretです。
-     */
-    public private(set) var consumerSecret: String
+        self.consumerKey = consumerKey
+        self.consumerSecret = consumerSecret
+    }
 
-    /**
-     see StudyplusLoginDelegate protocol
-     */
+    public static let shared: Studyplus = Studyplus()
+
+    public private(set) var consumerKey: String
+    public private(set) var consumerSecret: String
     public weak var delegate: StudyplusLoginDelegate?
 
     private var serviceName: String {
         return "Studyplus_iOS_SDK_\(consumerKey)"
     }
 
-    /// Opens the login screen by invoking the Studyplus application.
-    /// If Studyplus app is not installed, open the Studyplus page in AppStore.
-    /// After the process has returned from Studyplus application, delegate method will be called back.
-    ///
-    /// Studyplusアプリを起動してStudyplusログイン画面を開きます。
-    /// Studyplusアプリがインストールされていない場合、AppStore を起動して Studyplus を開きます。
-    /// Studyplusアプリから操作が戻ってきた後、delegateオブジェクトのコールバックメソッドを呼び出します。
+    /// Studyplusアプリを経由して、Studyplusアカウントにログインします。
+    /// Studyplusアプリがインストールされていない場合、AppStoreへ遷移します。
+    /// ログイン処理の完了後にStudyplusLoginDelegateを呼び出します。
     public func login() {
-        openStudyplus(command: "auth")
+        let customScheme = URL(string: "studyplus://")!
+        guard UIApplication.shared.canOpenURL(customScheme) else {
+            if let store = URL(string: "https://apps.apple.com/jp/app/id505410049?mt=8") {
+                UIApplication.shared.open(store)
+            }
+
+            return
+        }
+
+        if let url = URL(string: "\(customScheme)external_app/auth/\(consumerKey)/\(consumerSecret)") {
+            UIApplication.shared.open(url)
+        }
     }
 
-    /// Cancels the cooperation with Studyplus application.
-    ///
     /// Studyplusアプリとの連携を解除します。
     public func logout() {
         StudyplusKeychain.deleteAll(serviceName: serviceName)
     }
 
-    /// Returns to whether or not it is connected with Studyplus application.
-    ///
     /// Studyplusアプリと連携されているか否かを返します。
-    ///
-    /// - Returns: true is connected, false is not connected
     public func isConnected() -> Bool {
-        return self.accessToken() != nil
-    }
-
-    /// Access token of Studyplus API. It is set when the auth or login is successful.
-    ///
-    /// StudyplusAPIのアクセストークンです。login または authが成功したとき設定されます。
-    ///
-    /// - Returns: accessToken
-    public func accessToken() -> String? {
-        return StudyplusKeychain.accessToken(serviceName: serviceName)
-    }
-
-    /// Username of Studyplus account. It is set when the auth or login is successful.
-    ///
-    /// Studyplusアカウントのユーザ名です。login または authが成功したとき設定されます。
-    ///
-    /// - Returns: username
-    public func username() -> String? {
-        return StudyplusKeychain.username(serviceName: serviceName)
+        return StudyplusKeychain.accessToken(serviceName: serviceName) != nil
     }
 
     /// Studyplusに学習記録を投稿
@@ -116,7 +95,7 @@ final public class Studyplus {
     ///   - record: 学習記録
     ///   - completion: 投稿完了後のコールバック
     public func post(_ record: StudyplusRecord, completion: @escaping (Result<Void, StudyplusPostError>) -> Void) {
-        guard let accessToken = self.accessToken() else {
+        guard let accessToken = StudyplusKeychain.accessToken(serviceName: serviceName) else {
             completion(.failure(.loginRequired))
             return
         }
@@ -143,21 +122,13 @@ final public class Studyplus {
         })
     }
 
-    /// It is responsible for processing custom URL scheme
-    /// when it came back from the authorization / login screen of Stuudyplus app.
-    /// After handling openURL method in AppDelegate, pass the url parameter to this method.
-    /// If the URL is passed by Studyplus application, calls the callback method of the delegate object.
-    ///
     /// Studyplusアプリの認可・ログイン画面から戻ってきた時のカスタムURLスキーム処理を担当します。
     /// AppDelegateでopenURLをハンドリングしてから、このメソッドにurlを渡して委譲してください。
     /// Studyplusアプリ関連のURLであれば、delegateオブジェクトのコールバックメソッドを呼び出します。
     ///
-    /// - Parameter appDelegateUrl:
-    ///     The parameter of AppDelegate#openURL method.
+    /// - Parameter url:
     ///     AppDelegate#openURLメソッドで受け取ったurlパラメータをそのまま渡して下さい。
     /// - Returns:
-    ///     If the url is supported by StudyplusSDK, returns true.
-    ///     The valid URL has a __[studyplus-{consumerKey}]__ scheme, and right pathComponents and host.
     ///     渡されたurlがStudyplusSDKで対応すべきURLであれば true、それ以外は false を返します。
     ///     __[studyplus-{consumerKey}]__と正しいpathComponentsを持つことを確認してください。
     public func handle(_ url: URL) -> Bool {
@@ -172,14 +143,8 @@ final public class Studyplus {
                 .pathComponents[2]
                 .trimmingCharacters(in: .whitespacesAndNewlines)
                 .data(using: .utf8, allowLossyConversion: false)!
-            let username: Data = url
-                .pathComponents[3]
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-                .data(using: .utf8, allowLossyConversion: false)!
 
-            StudyplusKeychain.set(serviceName: serviceName,
-                                  accessToken: accessToken,
-                                  username: username) { result in
+            StudyplusKeychain.set(serviceName: serviceName, accessToken: accessToken) { result in
                 switch result {
                 case .failure(let error):
                     self.delegate?.studyplusLoginFail(error: error)
@@ -198,13 +163,6 @@ final public class Studyplus {
         return true
     }
 
-    /// Change the consumer key and secret.
-    /// Calling this method allows you to switch to another consumer key and secret.
-    /// For example, you log in to Studyplus, log out, and post a study record.
-    /// If multiple applications are connected with Studyplus, you need to call this method.
-    /// If there is only one connected application, you do not need to call this method.
-    /// If multiple applications are connected with Studyplus, do not forget to set up custom URL schemes.
-    ///
     /// StudyplusAPI用のConsumer Key と Secret を変更します。
     /// このメソッドを呼ぶとStudyplusにログイン、ログアウト、勉強記録を投稿するときなどに、別の Consumer Key と Secret に切り替えることができます。
     /// 複数のアプリケーションがStudyplusと連携している場合は、このメソッドを呼ぶ必要があります。
@@ -219,61 +177,6 @@ final public class Studyplus {
         self.consumerSecret = consumerSecret
     }
 
-    // MARK: - private method
-
-    private init() {
-        guard let data = Bundle.main.infoDictionary?["StudyplusSDK"] as? [String: String],
-              let consumerKey = data["consumerKey"],
-              let consumerSecret = data["consumerSecret"] else {
-
-            assert(false, "StudyplusSDK: *** Please set consumerKey and consumerSecret in your Info.plist. ***")
-            print("StudyplusSDK: *** Please set consumerKey and consumerSecret in your Info.plist. ***")
-
-            self.consumerKey = ""
-            self.consumerSecret = ""
-            return
-        }
-
-        if consumerKey == "set_your_consumerKey" || consumerSecret == "set_your_consumerSecret" {
-
-            assert(false, "StudyplusSDK: *** Please set consumerKey and consumerSecret in Info.plist. ***")
-            print("StudyplusSDK: *** Please set consumerKey and consumerSecret in your Info.plist. ***")
-
-            self.consumerKey = ""
-            self.consumerSecret = ""
-            return
-        }
-
-        self.consumerKey = consumerKey
-        self.consumerSecret = consumerSecret
-    }
-
-    private func openStudyplus(command: String) {
-
-        guard UIApplication.shared.canOpenURL(URL(string: "studyplus://")!) else {
-            let appStoreURLString: String = "https://apps.apple.com/jp/app/id505410049?mt=8"
-            guard let appStoreURL = URL(string: appStoreURLString) else { return }
-            applicationOpen(appStoreURL)
-            return
-        }
-
-        let urlString: String = "studyplus://external_app/" + command + "/" + consumerKey + "/" + consumerSecret
-
-        if let url = URL(string: urlString) {
-
-            applicationOpen(url)
-        }
-    }
-
-    private func applicationOpen(_ url: URL) {
-
-        if #available(iOS 10.0, *) {
-            UIApplication.shared.open(url)
-        } else {
-            _ = UIApplication.shared.openURL(url)
-        }
-    }
-
     private func isAcceptableURL(url: URL) -> Bool {
         guard let host = url.host else { return false }
         guard host == "auth-result" || host == "login-result" else { return false }
diff --git a/Lib/StudyplusSDK/internal/StudyplusKeychain.swift b/Lib/StudyplusSDK/internal/StudyplusKeychain.swift
@@ -28,7 +28,6 @@ import Foundation
 
 internal struct StudyplusKeychain {
     private static let accessTokenStoreKey: String = "accessToken"
-    private static let usernameStoreKey: String = "username"
 
     static internal func accessToken(serviceName: String) -> String? {
         let query = [
@@ -49,28 +48,8 @@ internal struct StudyplusKeychain {
         return String(data: data, encoding: .utf8)
     }
 
-    static internal func username(serviceName: String) -> String? {
-        let query = [
-            kSecClass: kSecClassGenericPassword,
-            kSecAttrService: serviceName,
-            kSecAttrSynchronizable: kSecAttrSynchronizableAny,
-            kSecMatchLimit: kSecMatchLimitOne,
-            kSecReturnData: true,
-            kSecAttrAccount: usernameStoreKey
-        ] as CFDictionary
-
-        var item: CFTypeRef?
-        let status = SecItemCopyMatching(query, &item)
-        guard status == errSecSuccess, let data = item as? Data else {
-            return nil
-        }
-
-        return String(data: data, encoding: .utf8)
-    }
-
     static internal func set(serviceName: String,
                              accessToken: Data,
-                             username: Data,
                              completion: (Result<Void, StudyplusLoginError>) -> Void) {
         // delete previous keys
         deleteAll(serviceName: serviceName)
@@ -83,15 +62,8 @@ internal struct StudyplusKeychain {
             kSecAttrAccount: accessTokenStoreKey,
             kSecValueData: accessToken
         ] as CFDictionary, nil)
-        let statusUsername = SecItemAdd([
-            kSecClass: kSecClassGenericPassword,
-            kSecAttrService: serviceName,
-            kSecAttrSynchronizable: kSecAttrSynchronizableAny,
-            kSecAttrAccount: usernameStoreKey,
-            kSecValueData: username
-        ] as CFDictionary, nil)
 
-        if statusAccessToken != noErr || statusUsername != noErr {
+        if statusAccessToken != noErr {
             completion(.failure(.keychainError))
             return
         }
