From 14ad52e2f8e5db474decbeca49a638e9f3c82995 Mon Sep 17 00:00:00 2001 From: Fox Danger Piacenti Date: Fri, 15 Dec 2023 16:57:39 -0600 Subject: [PATCH] fix: Post-rebase fixes. --- .../Authorization/Presentation/Login/SignInViewModel.swift | 2 -- Core/Core/Configuration/Config/Config.swift | 6 ++++++ Core/Core/SwiftGen/Assets.swift | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Authorization/Authorization/Presentation/Login/SignInViewModel.swift b/Authorization/Authorization/Presentation/Login/SignInViewModel.swift index 8da921fe0..6fedd6c1d 100644 --- a/Authorization/Authorization/Presentation/Login/SignInViewModel.swift +++ b/Authorization/Authorization/Presentation/Login/SignInViewModel.swift @@ -56,7 +56,6 @@ public class SignInViewModel: ObservableObject { } var oauthswift: OAuth2Swift? - let config: Config let router: AuthorizationRouter let config: ConfigProtocol private let interactor: AuthInteractorProtocol @@ -70,7 +69,6 @@ public class SignInViewModel: ObservableObject { router: AuthorizationRouter, config: ConfigProtocol, analytics: AuthorizationAnalytics, - config: Config, validator: Validator ) { self.interactor = interactor diff --git a/Core/Core/Configuration/Config/Config.swift b/Core/Core/Configuration/Config/Config.swift index a10438eb6..205af28bb 100644 --- a/Core/Core/Configuration/Config/Config.swift +++ b/Core/Core/Configuration/Config/Config.swift @@ -11,6 +11,7 @@ public protocol ConfigProtocol { var baseURL: URL { get } var oAuthClientId: String { get } var tokenType: TokenType { get } + var webLogin: Bool { get } var feedbackEmail: String { get } var appStoreLink: String { get } var platformName: String { get } @@ -33,6 +34,7 @@ private enum ConfigKeys: String { case baseURL = "API_HOST_URL" case oAuthClientID = "OAUTH_CLIENT_ID" case tokenType = "TOKEN_TYPE" + case webLogin = "false" case feedbackEmailAddress = "FEEDBACK_EMAIL_ADDRESS" case environmentDisplayName = "ENVIRONMENT_DISPLAY_NAME" case platformName = "PLATFORM_NAME" @@ -122,6 +124,10 @@ extension Config: ConfigProtocol { return tokenType } + public var webLogin: Bool { + return Bool(ConfigKeys.webLogin.rawValue) ?? false + } + public var feedbackEmail: String { return string(for: ConfigKeys.feedbackEmailAddress.rawValue) ?? "" } diff --git a/Core/Core/SwiftGen/Assets.swift b/Core/Core/SwiftGen/Assets.swift index 202ab2639..6c8074470 100644 --- a/Core/Core/SwiftGen/Assets.swift +++ b/Core/Core/SwiftGen/Assets.swift @@ -81,6 +81,7 @@ public enum CoreAssets { public static let rotateDevice = ImageAsset(name: "rotateDevice") public static let sub = ImageAsset(name: "sub") public static let alarm = ImageAsset(name: "alarm") + public static let appLogo = ImageAsset(name: "appLogo") public static let arrowLeft = ImageAsset(name: "arrowLeft") public static let arrowRight16 = ImageAsset(name: "arrowRight16") public static let certificate = ImageAsset(name: "certificate")