#40: Add login screen from EI.

- Remove SSO and replace fallback with OIDC.

ElementX/Resources/Localizations/en.lproj/Untranslated.strings

@@ -1,3 +1,11 @@
 "untranslated" = "Untranslated";
 "screenshot_detected_title" = "You took a screenshot";
 "screenshot_detected_message" = "Would you like to submit a bug report?";
+
+// MARK: - Authentication
+
+"authentication_login_title" = "Welcome back!";
+"authentication_login_forgot_password" = "Forgot password";
+
+"authentication_server_info_title" = "Choose your server to store your data";
+"authentication_server_info_matrix_description" = "Join millions for free on the largest public server";

ElementX/Sources/BuildSettings.swift

@@ -9,6 +9,9 @@
 import Foundation
 
 final class BuildSettings {
+
+    // MARK: - Servers
+    static let defaultHomeserverURLString = "https://matrix.org"
 
     // MARK: - Bug report
     static let bugReportServiceBaseUrlString = "https://riot.im/bugreports"

ElementX/Sources/Generated/Strings+Untranslated.swift

@@ -10,6 +10,14 @@ import Foundation
 // swiftlint:disable explicit_type_interface function_parameter_count identifier_name line_length
 // swiftlint:disable nesting type_body_length type_name vertical_whitespace_opening_braces
 extension ElementL10n {
+  /// Forgot password
+  public static let authenticationLoginForgotPassword = ElementL10n.tr("Untranslated", "authentication_login_forgot_password")
+  /// Welcome back!
+  public static let authenticationLoginTitle = ElementL10n.tr("Untranslated", "authentication_login_title")
+  /// Join millions for free on the largest public server
+  public static let authenticationServerInfoMatrixDescription = ElementL10n.tr("Untranslated", "authentication_server_info_matrix_description")
+  /// Choose your server to store your data
+  public static let authenticationServerInfoTitle = ElementL10n.tr("Untranslated", "authentication_server_info_title")
   /// Would you like to submit a bug report?
   public static let screenshotDetectedMessage = ElementL10n.tr("Untranslated", "screenshot_detected_message")
   /// You took a screenshot

ElementX/Sources/Other/Logging/MXLog.swift

@@ -133,6 +133,25 @@ private var logger: SwiftyBeaver.Type = {
         logger.error(message, file, function, line: line)
     }
 
+    public static func failure(_ message: @autoclosure () -> Any, _
+                               file: String = #file,
+                               _ function: String = #function,
+                               line: Int = #line,
+                               context: Any? = nil) {
+        logger.error(message(), file, function, line: line, context: context)
+        #if DEBUG
+        assertionFailure("\(message())")
+        #endif
+    }
+
+    @available(swift, obsoleted: 5.4)
+    @objc public static func logFailure(_ message: String, file: String, function: String, line: Int) {
+        logger.error(message, file, function, line: line)
+        #if DEBUG
+        assertionFailure(message)
+        #endif
+    }
+
     // MARK: - Private
 
     fileprivate static func configureLogger(_ logger: SwiftyBeaver.Type, withConfiguration configuration: MXLogConfiguration) {

ElementX/Sources/Other/SwiftUI/ErrorHandling/AlertInfo.swift

@@ -0,0 +1,87 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+/// A type that describes an alert to be shown to the user.
+///
+/// The alert info can be added to the view state bindings and used as an alert's `item`:
+/// ```
+/// MyView
+///     .alert(item: $viewModel.alertInfo) { $0.alert }
+/// ```
+struct AlertInfo<T: Hashable>: Identifiable {
+    /// An identifier that can be used to distinguish one error from another.
+    let id: T
+    /// The alert's title.
+    let title: String
+    /// The alert's message (optional).
+    var message: String?
+    /// The alert's primary button title and action. Defaults to an Ok button with no action.
+    var primaryButton: (title: String, action: (() -> Void)?) = (ElementL10n.ok, nil)
+    /// The alert's secondary button title and action.
+    var secondaryButton: (title: String, action: (() -> Void)?)?
+}
+
+#warning("Remove the NSError extensions?")
+extension AlertInfo {
+    /// Initialises the type with the title and message from an `NSError` along with the default Ok button.
+    init?(error: NSError? = nil) where T == Int {
+        self.init(id: error?.code ?? -1, error: error)
+    }
+
+    /// Initialises the type with the title and message from an `NSError` along with the default Ok button.
+    /// - Parameters:
+    ///   - id: An ID that identifies the error.
+    ///   - error: The Error that occurred.
+    init?(id: T, error: NSError? = nil) {
+        guard error?.domain != NSURLErrorDomain && error?.code != NSURLErrorCancelled else { return nil }
+
+        self.id = id
+        title = error?.userInfo[NSLocalizedFailureReasonErrorKey] as? String ?? ElementL10n.dialogTitleError
+        message = error?.userInfo[NSLocalizedDescriptionKey] as? String ?? ElementL10n.unknownError
+    }
+}
+
+extension AlertInfo {
+    private var messageText: Text? {
+        guard let message = message else { return nil }
+        return Text(message)
+    }
+
+    /// Returns a SwiftUI `Alert` created from this alert info, using default button
+    /// styles for both primary and (if set) secondary buttons.
+    var alert: Alert {
+        if let secondaryButton = secondaryButton {
+            return Alert(title: Text(title),
+                         message: messageText,
+                         primaryButton: alertButton(for: primaryButton),
+                         secondaryButton: alertButton(for: secondaryButton))
+        } else {
+            return Alert(title: Text(title),
+                         message: messageText,
+                         dismissButton: alertButton(for: primaryButton))
+        }
+    }
+
+    private func alertButton(for buttonParameters: (title: String, action: (() -> Void)?)) -> Alert.Button {
+        guard let action = buttonParameters.action else {
+            return .default(Text(buttonParameters.title))
+        }
+
+        return .default(Text(buttonParameters.title), action: action)
+    }
+}

ElementX/Sources/Other/UserIndicators/LabelledActivityIndicatorView.swift

@@ -22,16 +22,14 @@ final class LabelledActivityIndicatorView: UIView {
         static let padding = UIEdgeInsets(top: 20, left: 40, bottom: 15, right: 40)
         static let activityIndicatorScale = CGFloat(1.5)
         static let cornerRadius: CGFloat = 12.0
-        static let stackBackgroundOpacity: CGFloat = 0.9
         static let stackSpacing: CGFloat = 15
         static let backgroundOpacity: CGFloat = 0.5
     }
 
     private let stackBackgroundView: UIView = {
-        let view = UIView()
+        let view = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
         view.layer.cornerRadius = Constants.cornerRadius
-        view.alpha = Constants.stackBackgroundOpacity
-        view.backgroundColor = .gray.withAlphaComponent(0.75)
+        view.clipsToBounds = true
         return view
     }()
 
@@ -67,6 +65,7 @@ final class LabelledActivityIndicatorView: UIView {
     private func setup(text: String) {
         setupStackView()
         label.text = text
+        label.textColor = .element.primaryContent
     }
 
     private func setupStackView() {

ElementX/Sources/Other/UserIndicators/RoundedToastView.swift

@@ -72,12 +72,27 @@ class RoundedToastView: UIView {
 
     private func setup(viewState: ToastViewState) {
 
-        backgroundColor = .gray.withAlphaComponent(0.75)
+        backgroundColor = .clear
+        clipsToBounds = true
 
+        setupBackgroundMaterial()
         setupStackView()
         stackView.addArrangedSubview(toastView(for: viewState.style))
         stackView.addArrangedSubview(label)
         label.text = viewState.label
+        label.textColor = .element.primaryContent
+    }
+
+    private func setupBackgroundMaterial() {
+        let material = UIVisualEffectView(effect: UIBlurEffect(style: .systemMaterial))
+        addSubview(material)
+        material.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            material.topAnchor.constraint(equalTo: topAnchor),
+            material.bottomAnchor.constraint(equalTo: bottomAnchor),
+            material.leadingAnchor.constraint(equalTo: leadingAnchor),
+            material.trailingAnchor.constraint(equalTo: trailingAnchor)
+        ])
     }
 
     private func setupStackView() {
@@ -101,10 +116,10 @@ class RoundedToastView: UIView {
         case .loading:
             return activityIndicator
         case .success:
-            imageView.image = UIImage(systemName: "checkmark.circle")
+            imageView.image = UIImage(systemName: "checkmark")
             return imageView
         case .error:
-            imageView.image = UIImage(systemName: "x.circle")
+            imageView.image = UIImage(systemName: "xmark")
             return imageView
         }
     }

ElementX/Sources/Screens/Authentication/AuthenticationCoordinator.swift

@@ -55,8 +55,6 @@ class AuthenticationCoordinator: Coordinator {
             switch action {
             case .login:
                 self.showLoginScreen()
-            case .register:
-                fatalError("Not implemented")
             }
         }
 
@@ -69,18 +67,19 @@ class AuthenticationCoordinator: Coordinator {
     }
 
     private func showLoginScreen() {
-        let parameters = LoginScreenCoordinatorParameters()
-        let coordinator = LoginScreenCoordinator(parameters: parameters)
+        let homeserver = AuthenticationHomeserverViewData(address: BuildSettings.defaultHomeserverURLString)
+        let parameters = AuthenticationLoginCoordinatorParameters(navigationRouter: navigationRouter, homeserver: homeserver)
+        let coordinator = AuthenticationLoginCoordinator(parameters: parameters)
 
         coordinator.callback = { [weak self, weak coordinator] action in
             guard let self = self, let coordinator = coordinator else {
                 return
             }
 
             switch action {
-            case .login(let result):
+            case .login(let username, let password):
                 Task {
-                    switch await self.login(username: result.username, password: result.password) {
+                    switch await self.login(username: username, password: password) {
                     case .success(let userSession):
                         self.delegate?.authenticationCoordinator(self, didLoginWithSession: userSession)
                         self.remove(childCoordinator: coordinator)
@@ -90,6 +89,8 @@ class AuthenticationCoordinator: Coordinator {
                         MXLog.error("Failed logging in user with error: \(error)")
                     }
                 }
+            case .continueWithOIDC:
+                break
             }
         }
 

ElementX/Sources/Screens/Authentication/AuthenticationHomeserverViewData.swift

@@ -0,0 +1,63 @@
+// 
+// Copyright 2022 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import Foundation
+
+/// Information about a homeserver that is ready for display in the authentication flow.
+struct AuthenticationHomeserverViewData: Equatable {
+    /// The homeserver string to be shown to the user.
+    let address: String
+    /// Whether or not the homeserver is matrix.org.
+    let isMatrixDotOrg: Bool
+    /// The types login supported by the homeserver.
+    let loginMode: LoginMode
+}
+
+extension AuthenticationHomeserverViewData {
+    /// Temporary initialiser for use until the FFI has homeserver discovery etc.
+    init(address: String) {
+        self.address = HomeserverAddress.sanitized(address).components(separatedBy: "://").last ?? address
+        isMatrixDotOrg = address == "matrix.org"
+        loginMode = .password
+    }
+}
+
+// MARK: - Mocks
+
+extension AuthenticationHomeserverViewData {
+    /// A mock homeserver that is configured just like matrix.org.
+    static var mockMatrixDotOrg: AuthenticationHomeserverViewData {
+        AuthenticationHomeserverViewData(address: "matrix.org",
+                                         isMatrixDotOrg: true,
+                                         loginMode: .password)
+    }
+
+    /// A mock homeserver that supports login and registration via a password but has no SSO providers.
+    static var mockBasicServer: AuthenticationHomeserverViewData {
+        AuthenticationHomeserverViewData(address: "example.com",
+                                         isMatrixDotOrg: false,
+                                         loginMode: .password)
+    }
+
+    /// A mock homeserver that supports only supports authentication via a single SSO provider.
+    static var mockOIDC: AuthenticationHomeserverViewData {
+        AuthenticationHomeserverViewData(address: "company.com",
+                                         isMatrixDotOrg: false,
+                                         // swiftlint:disable:next force_unwrapping
+                                         loginMode: .oidc(URL(string: "https://auth.company.com")!))
+    }
+
+}