Implement social login

CHANGES.rst

@@ -2,10 +2,10 @@ Changes to be released in next version
 =================================================
 
 ✨ Features
- * 
+ * AuthVC: Add social login (#3846).
 
 🙌 Improvements
- * 
+ * AuthVC: SSO authentication now use redirect URL instead of fallback page (#3846).
 
 🐛 Bugfix
  * 

Config/BuildSettings.swift

@@ -52,6 +52,17 @@ final class BuildSettings: NSObject {
         return keychainAccessGroup
     }
 
+    static var applicationURLScheme: String? {
+        guard let urlTypes = Bundle.app.object(forInfoDictionaryKey: "CFBundleURLTypes") as? [AnyObject],
+              let urlTypeDictionary = urlTypes.first as? [String: AnyObject],
+              let urlSchemes = urlTypeDictionary["CFBundleURLSchemes"] as? [AnyObject],
+              let externalURLScheme = urlSchemes.first as? String else {
+            return nil
+        }
+
+        return externalURLScheme
+    }
+
     static var pushKitAppIdProd: String {
         return baseBundleIdentifier + ".ios.voip.prod"
     }

Config/Common.xcconfig

@@ -27,3 +27,5 @@ KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain
 
 //Make Xcode 12 and fastlane(xcodebuild) happy while some pods are not updated
 EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64
+
+APPLICATION_SCHEME = element

Riot/Assets/Images.xcassets/Authentication/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Authentication/SocialLogin/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Authentication/SocialLogin/social_login_button_apple.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "social_login_button_apple.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "social_login_button_apple@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "social_login_button_apple@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Authentication/SocialLogin/social_login_button_facebook.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "social_login_button_facebook.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "social_login_button_facebook@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "social_login_button_facebook@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Authentication/SocialLogin/social_login_button_github.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "social_login_button_github.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "social_login_button_github@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "social_login_button_github@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Authentication/SocialLogin/social_login_button_google.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "social_login_button_google.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "social_login_button_google@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "social_login_button_google@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/Images.xcassets/Authentication/SocialLogin/social_login_button_twitter.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "social_login_button_twitter.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "social_login_button_twitter@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "social_login_button_twitter@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Riot/Assets/en.lproj/Vector.strings

@@ -139,6 +139,16 @@
 "auth_softlogout_clear_data_sign_out_msg" = "Are you sure you want to clear all data currently stored on this device? Sign in again to access your account data and messages.";
 "auth_softlogout_clear_data_sign_out" = "Sign out";
 
+// Social login
+
+"social_login_list_title_continue" = "Continue with";
+"social_login_list_title_sign_in" = "Or login with";
+"social_login_list_title_sign_up" = "Or register with";
+
+"social_login_button_title_continue" = "Continue with %@";
+"social_login_button_title_sign_in" = "Sign In with %@";
+"social_login_button_title_sign_up" = "Sign Up with %@";
+
 // Errors
 "error_user_already_logged_in" = "It looks like you’re trying to connect to another homeserver. Do you want to sign out?";
 

Riot/Categories/UIImage.swift

@@ -57,6 +57,31 @@ extension UIImage {
         return newImage
     }
 
+    // Based on https://stackoverflow.com/a/31314494
+    @objc func vc_resized(with targetSize: CGSize) -> UIImage? {
+        let size = self.size
+
+        let widthRatio  = targetSize.width/size.width
+        let heightRatio = targetSize.height/size.height
+
+        // Figure out what our orientation is, and use that to form the rectangle
+        let newSize: CGSize
+        if widthRatio > heightRatio {
+            newSize = CGSize(width: size.width * heightRatio, height: size.height * heightRatio)
+        } else {
+            newSize = CGSize(width: size.width * widthRatio, height: size.height * widthRatio)
+        }
+
+        let rect = CGRect(origin: .zero, size: newSize)
+
+        UIGraphicsBeginImageContextWithOptions(newSize, false, 0)
+        draw(in: rect)
+        let newImage = UIGraphicsGetImageFromCurrentImageContext()
+        UIGraphicsEndImageContext()
+
+        return newImage
+    }
+
     @objc func vc_notRenderedImage() -> UIImage {
         if let cgImage = cgImage {
             return NotRenderedImage(cgImage: cgImage, scale: UIScreen.main.scale, orientation: .up)

Riot/Categories/URLComponents.swift

@@ -0,0 +1,28 @@
+// 
+// Copyright 2020 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
+
+extension URLComponents {
+
+    func vc_getQueryItem(with name: String) -> URLQueryItem? {
+        return self.queryItems?.first(where: { $0.name == name })
+    }
+
+    func vc_getQueryItemValue(for name: String) -> String? {
+        return self.vc_getQueryItem(with: name)?.value
+    }
+}

Riot/Generated/Images.swift

@@ -20,6 +20,11 @@ internal typealias AssetImageTypeAlias = ImageAsset.Image
 // swiftlint:disable identifier_name line_length nesting type_body_length type_name
 internal enum Asset {
   internal enum Images {
+    internal static let socialLoginButtonApple = ImageAsset(name: "social_login_button_apple")
+    internal static let socialLoginButtonFacebook = ImageAsset(name: "social_login_button_facebook")
+    internal static let socialLoginButtonGithub = ImageAsset(name: "social_login_button_github")
+    internal static let socialLoginButtonGoogle = ImageAsset(name: "social_login_button_google")
+    internal static let socialLoginButtonTwitter = ImageAsset(name: "social_login_button_twitter")
     internal static let callAudioMuteOffIcon = ImageAsset(name: "call_audio_mute_off_icon")
     internal static let callAudioMuteOnIcon = ImageAsset(name: "call_audio_mute_on_icon")
     internal static let callChatIcon = ImageAsset(name: "call_chat_icon")

Riot/Generated/Strings.swift

@@ -4266,6 +4266,30 @@ internal enum VectorL10n {
   internal static var skip: String { 
     return VectorL10n.tr("Vector", "skip") 
   }
+  /// Continue with %@
+  internal static func socialLoginButtonTitleContinue(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "social_login_button_title_continue", p1)
+  }
+  /// Sign In with %@
+  internal static func socialLoginButtonTitleSignIn(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "social_login_button_title_sign_in", p1)
+  }
+  /// Sign Up with %@
+  internal static func socialLoginButtonTitleSignUp(_ p1: String) -> String {
+    return VectorL10n.tr("Vector", "social_login_button_title_sign_up", p1)
+  }
+  /// Continue with
+  internal static var socialLoginListTitleContinue: String { 
+    return VectorL10n.tr("Vector", "social_login_list_title_continue") 
+  }
+  /// Or login with
+  internal static var socialLoginListTitleSignIn: String { 
+    return VectorL10n.tr("Vector", "social_login_list_title_sign_in") 
+  }
+  /// Or register with
+  internal static var socialLoginListTitleSignUp: String { 
+    return VectorL10n.tr("Vector", "social_login_list_title_sign_up") 
+  }
   /// Start
   internal static var start: String { 
     return VectorL10n.tr("Vector", "start") 

Riot/Managers/Theme/ThemeIdentifier.swift

@@ -0,0 +1,36 @@
+// 
+// Copyright 2020 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
+
+enum ThemeIdentifier: String, RawRepresentable {
+    case light = "default"
+    case dark = "dark"
+    case black = "black"
+
+    init?(rawValue: String) {
+        switch rawValue {
+        case "default":
+            self = .light
+        case "dark":
+            self = .dark
+        case "black":
+            self = .black
+        default:
+            return nil
+        }
+    }
+}

Riot/Managers/Theme/ThemeService.swift

@@ -0,0 +1,27 @@
+// 
+// Copyright 2020 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
+
+extension ThemeService {
+
+    var themeIdentifier: ThemeIdentifier? {
+        guard let themeId = self.themeId else {
+            return nil
+        }        
+        return ThemeIdentifier(rawValue: themeId)
+    }    
+}

Riot/Managers/Theme/Themes/BlackTheme.swift

@@ -20,7 +20,7 @@ class BlackTheme: DarkTheme {
 
     override init() {
         super.init()
-        self.identifier = "black"
+        self.identifier = ThemeIdentifier.black.rawValue
         self.backgroundColor = UIColor(rgb: 0x000000)
         self.baseColor = UIColor(rgb: 0x000000)
         self.headerBackgroundColor = UIColor(rgb: 0x000000)

Riot/Managers/Theme/Themes/DarkTheme.swift

@@ -21,7 +21,7 @@ import UIKit
 @objcMembers
 class DarkTheme: NSObject, Theme {
 
-    var identifier: String = "dark"
+    var identifier: String = ThemeIdentifier.dark.rawValue
 
     var backgroundColor: UIColor = UIColor(rgb: 0x15191E)
 

Riot/Managers/Theme/Themes/DefaultTheme.swift

@@ -21,7 +21,7 @@ import UIKit
 @objcMembers
 class DefaultTheme: NSObject, Theme {
 
-    var identifier: String = "default"
+    var identifier: String = ThemeIdentifier.light.rawValue
 
     var backgroundColor: UIColor = UIColor(rgb: 0xFFFFFF)