Merge pull request #3 from tinkoff-mobile-tech/configuration

Рефакторинг конфигурирования SDK

Development/Source/Extensions/Environment+EnvironmentConfiguration.swift

@@ -0,0 +1,17 @@
+//
+//  Environment+EnvironmentConfiguration.swift
+//  TinkoffID
+//
+//  Created by Dmitry on 20.01.2021.
+//
+
+import Foundation
+
+extension TinkoffEnvironment: EnvironmentConfiguration {
+    public var apiBaseUrl: String {
+        switch self {
+        case .production:
+            return "https://id.tinkoff.ru"
+        }
+    }
+}

Development/Source/Extensions/TinkoffApp+TargetAppConfiguration.swift

@@ -0,0 +1,24 @@
+//
+//  TinkoffApp+TargetAppConfiguration.swift
+//  TinkoffID
+//
+//  Created by Dmitry on 21.12.2020.
+//
+
+import Foundation
+
+extension TinkoffApp: TargetAppConfiguration {
+    public var urlScheme: String {
+        switch self {
+        case .bank:
+            return "tinkoffbank://"
+        }
+    }
+
+    public var authUrl: String {
+        switch self {
+        case .bank:
+            return "https://tinkoff.ru/partner_auth"
+        }
+    }
+}

Development/Source/Models/Public/TinkoffEnvironment.swift

@@ -0,0 +1,13 @@
+//
+//  TinkoffEnvironment.swift
+//  TinkoffID
+//
+//  Created by Dmitry on 20.01.2021.
+//
+
+import Foundation
+
+/// Окружение Тинькофф
+public enum TinkoffEnvironment {
+    case production
+}

Development/Source/SDK/Builder/TinkoffIDBuilder.swift

@@ -11,23 +11,36 @@ public final class TinkoffIDBuilder {
 
     private let clientId: String
     private let callbackUrl: String
-    private let app: TinkoffApp
+    private let appConfiguration: TargetAppConfiguration
+    private let environmentConfiguration: EnvironmentConfiguration
+
+    public convenience init(clientId: String,
+                            callbackUrl: String,
+                            app: TinkoffApp = .bank,
+                            environment: TinkoffEnvironment = .production) {
+        self.init(clientId: clientId,
+                  callbackUrl: callbackUrl,
+                  appConfiguration: app,
+                  environmentConfiguration: environment)
+    }
 
     public init(clientId: String,
                 callbackUrl: String,
-                app: TinkoffApp) {
+                appConfiguration: TargetAppConfiguration,
+                environmentConfiguration: EnvironmentConfiguration) {
         self.clientId = clientId
         self.callbackUrl = callbackUrl
-        self.app = app
+        self.environmentConfiguration = environmentConfiguration
+        self.appConfiguration = appConfiguration
     }
 
     public func build() -> ITinkoffID {
-        let urlSchemeBuilder = URLSchemeBuilder(baseUrlString: app.authUrl)
-        let appLauncher = URLSchemeAppLauncher(appUrlScheme: app.urlScheme,
+        let urlSchemeBuilder = URLSchemeBuilder(baseUrlString: appConfiguration.authUrl)
+        let appLauncher = URLSchemeAppLauncher(appUrlScheme: appConfiguration.urlScheme,
                                                builder: urlSchemeBuilder,
                                                router: UIApplication.shared)
 
-        let requestBuilder = RequestBuilder(baseUrl: app.apiBaseUrl)
+        let requestBuilder = RequestBuilder(baseUrl: environmentConfiguration.apiBaseUrl)
         let api = API(requestBuilder: requestBuilder,
                       requestProcessor: URLSession.shared,
                       responseDispatcher: DispatchQueue.main)

Development/Source/SDK/Configuration/EnvironmentConfiguration.swift

@@ -0,0 +1,14 @@
+//
+//  EnvironmentConfiguration.swift
+//  TinkoffID
+//
+//  Created by Dmitry on 20.01.2021.
+//
+
+import Foundation
+
+/// Описывает окружение для работы SDK
+public protocol EnvironmentConfiguration {
+    /// Базовый URL API
+    var apiBaseUrl: String { get }
+}

Development/Source/SDK/Configuration/TargetAppConfiguration.swift

@@ -0,0 +1,17 @@
+//
+//  TargetAppConfiguration.swift
+//  TinkoffID
+//
+//  Created by Dmitry on 20.01.2021.
+//
+
+import Foundation
+
+/// Описывает приложение через которое выполняется авторизация
+public protocol TargetAppConfiguration {
+    /// URL-схема, используемая для определения установлено ли заданное приложение
+    var urlScheme: String { get }
+
+    /// Ссылка для проведения авторизации
+    var authUrl: String { get }
+}

Development/Source/UI/Button/TinkoffIDButton.swift

@@ -63,6 +63,7 @@ final class TinkoffIDButton: UIButton {
                                          left: style.contentHorizontalPadding + style.imageRightPadding,
                                          bottom: style.contentVerticalPadding,
                                          right: style.contentHorizontalPadding)
+        setContentHuggingPriority(.required, for: .vertical)
 
         // Appearance
         layer.cornerRadius = style.cornerRadius