diff --git a/Core/Core/Configuration/Config/MicrosoftConfig.swift b/Core/Core/Configuration/Config/MicrosoftConfig.swift index 4175a53e2..30ca1df09 100644 --- a/Core/Core/Configuration/Config/MicrosoftConfig.swift +++ b/Core/Core/Configuration/Config/MicrosoftConfig.swift @@ -9,19 +9,19 @@ import Foundation private enum MicrosoftKeys: String { case enabled = "ENABLED" - case appID = "APP_ID" + case clientID = "CLIENT_ID" } public final class MicrosoftConfig: NSObject { public var enabled: Bool = false - private(set) var appID: String? + private(set) var clientID: String? private var requiredKeysAvailable: Bool { - return appID != nil + return clientID != nil } init(dictionary: [String: AnyObject]) { - appID = dictionary[MicrosoftKeys.appID.rawValue] as? String + clientID = dictionary[MicrosoftKeys.clientID.rawValue] as? String super.init() enabled = requiredKeysAvailable && dictionary[MicrosoftKeys.enabled.rawValue] as? Bool == true } diff --git a/Core/Core/Providers/SocialAuth/MicrosoftAuthProvider.swift b/Core/Core/Providers/SocialAuth/MicrosoftAuthProvider.swift index 2fd998579..8438e37c5 100644 --- a/Core/Core/Providers/SocialAuth/MicrosoftAuthProvider.swift +++ b/Core/Core/Providers/SocialAuth/MicrosoftAuthProvider.swift @@ -76,10 +76,10 @@ public final class MicrosoftAuthProvider { } private func createClientApplication() throws -> MSALPublicClientApplication { - guard let config = Container.shared.resolve(ConfigProtocol.self), let appID = config.microsoft.appID else { + guard let config = Container.shared.resolve(ConfigProtocol.self), let clientID = config.microsoft.clientID else { throw SocialAuthError.error(text: "Configuration error") } - let configuration = MSALPublicClientApplicationConfig(clientId: appID) + let configuration = MSALPublicClientApplicationConfig(clientId: clientID) do { return try MSALPublicClientApplication(configuration: configuration) diff --git a/Core/Core/SwiftGen/Assets.swift b/Core/Core/SwiftGen/Assets.swift index c52d9f811..2fe5e3636 100644 --- a/Core/Core/SwiftGen/Assets.swift +++ b/Core/Core/SwiftGen/Assets.swift @@ -93,6 +93,7 @@ public enum CoreAssets { public static let noAvatar = ImageAsset(name: "noAvatar") public static let removePhoto = ImageAsset(name: "removePhoto") public static let iconApple = ImageAsset(name: "icon_apple") + public static let iconFacebook = ImageAsset(name: "icon_facebook") public static let iconFacebookWhite = ImageAsset(name: "icon_facebook_white") public static let iconGoogleWhite = ImageAsset(name: "icon_google_white") public static let iconMicrosoftWhite = ImageAsset(name: "icon_microsoft_white") diff --git a/Core/CoreTests/Configuration/ConfigTests.swift b/Core/CoreTests/Configuration/ConfigTests.swift index 35a90c2b7..b7fc2ccf4 100644 --- a/Core/CoreTests/Configuration/ConfigTests.swift +++ b/Core/CoreTests/Configuration/ConfigTests.swift @@ -119,7 +119,7 @@ class ConfigTests: XCTestCase { let config = Config(properties: properties) XCTAssertTrue(config.microsoft.enabled) - XCTAssertEqual(config.microsoft.appID, "appId") + XCTAssertEqual(config.microsoft.clientID, "appId") } func testAppleConfigInitialization() {