Merge pull request #2111 from RocketChat/v3.0.4

[RELEASE] Merge release 3.0.4 into MASTER
RocketChat · Aug 6, 2018 · 962b677 · 962b677
2 parents 6ce3162 + 496c343
commit 962b677
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 9 deletions.
diff --git a/Rocket.Chat.ShareExtension/Info.plist b/Rocket.Chat.ShareExtension/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.3</string>
+	<string>3.0.4</string>
 	<key>CFBundleVersion</key>
-	<string>203</string>
+	<string>206</string>
 	<key>ITSEncryptionExportComplianceCode</key>
 	<string></string>
 	<key>NSExtension</key>

diff --git a/Rocket.Chat/Controllers/Auth/ConnectServerViewController.swift b/Rocket.Chat/Controllers/Auth/ConnectServerViewController.swift
@@ -183,6 +183,12 @@ final class ConnectServerViewController: BaseViewController {
             controller.serverVersion = infoRequestHandler.version
             controller.serverURL = url
             controller.serverPublicSettings = serverPublicSettings
+
+            if let credentials = deepLinkCredentials {
+                _ = controller.view
+                controller.authenticateWithDeepLinkCredentials(credentials)
+                deepLinkCredentials = nil
+            }
         }
 
         if let controller = segue.destination as? AuthTableViewController, segue.identifier == "Auth" {

diff --git a/Rocket.Chat/Controllers/Auth/LoginTableViewController.swift b/Rocket.Chat/Controllers/Auth/LoginTableViewController.swift
@@ -164,6 +164,12 @@ class LoginTableViewController: BaseTableViewController {
 
     // MARK: Actions
 
+    func authenticateWithDeepLinkCredentials(_ credentials: DeepLinkCredentials) {
+        view.layoutIfNeeded()
+        startLoading()
+        AuthManager.auth(token: credentials.token, completion: self.handleAuthenticationResponse)
+    }
+
     @IBAction func buttonOnePasswordDidPressed(_ sender: Any) {
         let siteURL = serverPublicSettings?.siteURL ?? ""
         OnePasswordExtension.shared().findLogin(forURLString: siteURL, for: self, sender: sender) { [weak self] (login, _) in

diff --git a/Rocket.Chat/Info.plist b/Rocket.Chat/Info.plist
@@ -206,7 +206,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.3</string>
+	<string>3.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -222,7 +222,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>203</string>
+	<string>206</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>

diff --git a/Rocket.Chat/Models/User/UserPermissions.swift b/Rocket.Chat/Models/User/UserPermissions.swift
@@ -5,7 +5,6 @@
 //  Created by Matheus Cardoso on 5/16/18.
 //  Copyright © 2018 Rocket.Chat. All rights reserved.
 //
-
 import RealmSwift
 
 extension User {
@@ -20,11 +19,9 @@ extension User {
     func hasPermission(_ permission: PermissionType, subscription: Subscription? = nil, realm: Realm? = Realm.current) -> Bool {
         guard let permissionRoles = PermissionManager.roles(for: permission, realm: realm) else { return false }
 
-        let roles: [String]
+        var roles: [String] = Array(self.roles)
         if let subscription = subscription {
-            roles = rolesInSubscription(subscription)
-        } else {
-            roles = Array(self.roles)
+            roles += rolesInSubscription(subscription)
         }
 
         for userRole in roles {