[NEW] Allow user with required permissions to remove member from room

Rocket.Chat/API/API.swift

@@ -47,6 +47,7 @@ final class API: APIFetcher {
 
     var authToken: String?
     var userId: String?
+    var language: String?
 
     static let userAgent: String = {
         let info = Bundle.main.infoDictionary

Rocket.Chat/API/APIRequest.swift

@@ -64,13 +64,14 @@ extension APIRequest {
         request.addValue(contentType, forHTTPHeaderField: "Content-Type")
         request.addValue(API.userAgent, forHTTPHeaderField: "User-Agent")
 
-        if let token = api.authToken {
-            request.addValue(token, forHTTPHeaderField: "X-Auth-Token")
+        func addValueIfSome(_ value: String?, forHTTPHeaderField field: String) {
+            guard let value = value else { return }
+            request.addValue(value, forHTTPHeaderField: field)
         }
 
-        if let userId = api.userId {
-            request.addValue(userId, forHTTPHeaderField: "X-User-Id")
-        }
+        addValueIfSome(api.authToken, forHTTPHeaderField: "X-Auth-Token")
+        addValueIfSome(api.userId, forHTTPHeaderField: "X-User-Id")
+        addValueIfSome(api.language, forHTTPHeaderField: "Accept-Language")
 
         return request
     }

Rocket.Chat/API/Clients/SubscriptionsClient.swift

@@ -125,6 +125,37 @@ struct SubscriptionsClient: APIClient {
         }
     }
 
+    func fetchRoles(subscription: Subscription, realm: Realm? = Realm.current, completion: (() -> Void)? = nil) {
+        let rid = subscription.rid
+        let rolesRequest = RoomRolesRequest(roomName: subscription.name, subscriptionType: subscription.type)
+
+        let currentRealm = realm
+
+        api.fetch(rolesRequest) { result in
+            switch result {
+            case .resource(let resource):
+                if let subscription = Subscription.find(rid: rid, realm: currentRealm) {
+                    try? currentRealm?.write {
+                        let subscriptionCopy = Subscription(value: subscription)
+
+                        subscriptionCopy.usersRoles.removeAll()
+                        resource.roomRoles?.forEach { role in
+                            subscriptionCopy.usersRoles.append(role)
+                        }
+
+                        currentRealm?.add(subscriptionCopy, update: true)
+                    }
+
+                    completion?()
+                }
+
+            // Fail silently
+            case .error(let error):
+                print(error)
+            }
+        }
+    }
+
     // fallback for servers < 0.60.0
     func fetchSubscriptionsFallback(updatedSince: Date?, realm: Realm? = Realm.current, completion: (() -> Void)?) {
         var params: [[String: Any]] = []

Rocket.Chat/API/Requests/Base/ResourceWithError.swift

@@ -0,0 +1,24 @@
+//
+//  ResourceWithError.swift
+//  Rocket.Chat
+//
+//  Created by Matheus Cardoso on 5/18/18.
+//  Copyright © 2018 Rocket.Chat. All rights reserved.
+//
+
+import Foundation
+
+protocol ResourceWithError {
+    var error: String? { get }
+    var errorType: String? { get }
+}
+
+extension ResourceWithError where Self: APIResource {
+    var error: String? {
+        return raw?["error"].string
+    }
+
+    var errorType: String? {
+        return raw?["errorType"].string
+    }
+}

Rocket.Chat/API/Requests/Subscription/SubscriptionCreateRequest.swift → Rocket.Chat/API/Requests/Room/RoomCreateRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionCreateRequest.swift
+//  RoomCreateRequest.swift
 //  Rocket.Chat
 //
 //  Created by Bruno Macabeus Aquino on 28/09/17.
@@ -11,7 +11,7 @@
 
 import Foundation
 
-enum SubscriptionCreateType {
+enum RoomCreateType {
     case channel
     case group
 
@@ -25,20 +25,20 @@ enum SubscriptionCreateType {
     }
 }
 
-final class SubscriptionCreateRequest: APIRequest {
-    typealias APIResourceType = SubscriptionCreateResource
+final class RoomCreateRequest: APIRequest {
+    typealias APIResourceType = RoomCreateResource
 
     let method: HTTPMethod = .post
     var path: String {
         return type.path
     }
 
     let name: String
-    let type: SubscriptionCreateType
+    let type: RoomCreateType
     let members: [String]
     let readOnly: Bool
 
-    init(name: String, type: SubscriptionCreateType, members: [String] = [], readOnly: Bool = false) {
+    init(name: String, type: RoomCreateType, members: [String] = [], readOnly: Bool = false) {
         self.name = name
         self.type = type
         self.members = members
@@ -56,7 +56,7 @@ final class SubscriptionCreateRequest: APIRequest {
     }
 }
 
-class SubscriptionCreateResource: APIResource {
+class RoomCreateResource: APIResource {
     var success: Bool? {
         return raw?["success"].boolValue
     }

Rocket.Chat/API/Requests/Subscription/SubscriptionFilesRequest.swift → Rocket.Chat/API/Requests/Room/RoomFilesRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionFilesRequest.swift
+//  RoomFilesRequest.swift
 //  Rocket.Chat
 //
 //  Created by Filipe Alvarenga on 11/04/18.
@@ -23,8 +23,8 @@ fileprivate extension SubscriptionType {
     }
 }
 
-final class SubscriptionFilesRequest: APIRequest {
-    typealias APIResourceType = SubscriptionFilesResource
+final class RoomFilesRequest: APIRequest {
+    typealias APIResourceType = RoomFilesResource
 
     var path: String {
         return type.path
@@ -41,7 +41,7 @@ final class SubscriptionFilesRequest: APIRequest {
     }
 }
 
-final class SubscriptionFilesResource: APIResource {
+final class RoomFilesResource: APIResource {
     var files: [File]? {
         let realm = Realm.current
         return raw?["files"].arrayValue.map {

Rocket.Chat/API/Requests/Subscription/SubscriptionInfoRequest.swift → Rocket.Chat/API/Requests/Room/RoomInfoRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionInfoRequest.swift
+//  RoomInfoRequest.swift
 //  Rocket.Chat
 //
 //  Created by Matheus Cardoso on 9/19/17.
@@ -22,8 +22,8 @@ fileprivate extension SubscriptionType {
     }
 }
 
-final class SubscriptionInfoRequest: APIRequest {
-    typealias APIResourceType = SubscriptionInfoResource
+final class RoomInfoRequest: APIRequest {
+    typealias APIResourceType = RoomInfoResource
 
     var path: String {
         return type.path
@@ -50,7 +50,7 @@ final class SubscriptionInfoRequest: APIRequest {
     }
 }
 
-final class SubscriptionInfoResource: APIResource {
+final class RoomInfoResource: APIResource {
     var channel: JSON? {
         return raw?["channel"]
     }

Rocket.Chat/API/Requests/Room/RoomKickRequest.swift

@@ -0,0 +1,57 @@
+//
+//  RoomKickRequest.swift
+//  Rocket.Chat
+//
+//  Created by Matheus Cardoso on 5/18/18.
+//  Copyright © 2018 Rocket.Chat. All rights reserved.
+//
+
+import SwiftyJSON
+
+fileprivate extension RoomType {
+    var path: String {
+        switch self {
+        case .channel:
+            return "/api/v1/channels.kick"
+        case .group:
+            return "/api/v1/groups.kick"
+        case .directMessage:
+            return ""
+        }
+    }
+}
+
+final class RoomKickRequest: APIRequest {
+    typealias APIResourceType = RoomKickResource
+    let requiredVersion = Version(0, 48, 0)
+
+    let method: HTTPMethod = .post
+    var path: String {
+        return roomType.path
+    }
+
+    let roomId: String
+    let roomType: RoomType
+    let userId: String
+
+    init(roomId: String, roomType: RoomType, userId: String) {
+        self.roomId = roomId
+        self.roomType = roomType
+        self.userId = userId
+    }
+
+    func body() -> Data? {
+        let body = JSON([
+            "roomId": roomId,
+            "userId": userId
+        ])
+
+        return body.rawString()?.data(using: .utf8)
+    }
+}
+
+final class RoomKickResource: APIResource, ResourceWithError {
+    var success: Bool? {
+        return raw?["success"].boolValue
+    }
+}

Rocket.Chat/API/Requests/Subscription/SubscriptionMembersRequest.swift → Rocket.Chat/API/Requests/Room/RoomMembersRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionMembersRequest.swift
+//  RoomMembersRequest.swift
 //  Rocket.Chat
 //
 //  Created by Matheus Cardoso on 9/21/17.
@@ -22,8 +22,8 @@ fileprivate extension SubscriptionType {
     }
 }
 
-final class SubscriptionMembersRequest: APIRequest {
-    typealias APIResourceType = SubscriptionMembersResource
+final class RoomMembersRequest: APIRequest {
+    typealias APIResourceType = RoomMembersResource
 
     let requiredVersion = Version(0, 59, 0)
 
@@ -52,7 +52,7 @@ final class SubscriptionMembersRequest: APIRequest {
     }
 }
 
-class SubscriptionMembersResource: APIResource {
+class RoomMembersResource: APIResource {
     var members: [User?]? {
         return raw?["members"].arrayValue.map {
             let user = User()

Rocket.Chat/API/Requests/Subscription/SubscriptionMentionsRequest.swift → Rocket.Chat/API/Requests/Room/RoomMentionsRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionMentionsRequest.swift
+//  RoomMentionsRequest.swift
 //  Rocket.Chat
 //
 //  Created by Filipe Alvarenga on 03/04/18.
@@ -9,8 +9,8 @@
 import SwiftyJSON
 import Foundation
 
-final class SubscriptionMentionsRequest: APIRequest {
-    typealias APIResourceType = SubscriptionMentionsResource
+final class RoomMentionsRequest: APIRequest {
+    typealias APIResourceType = RoomMentionsResource
 
     let requiredVersion = Version(0, 63, 0)
     let path = "/api/v1/channels.getAllUserMentionsByChannel"
@@ -24,7 +24,7 @@ final class SubscriptionMentionsRequest: APIRequest {
     }
 }
 
-final class SubscriptionMentionsResource: APIResource {
+final class RoomMentionsResource: APIResource {
     var messages: [Message]? {
         return raw?["mentions"].arrayValue.map {
             let message = Message()

Rocket.Chat/API/Requests/Subscription/SubscriptionMessagesRequest.swift → Rocket.Chat/API/Requests/Room/RoomMessagesRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionMessagesRequest.swift
+//  RoomMessagesRequest.swift
 //  Rocket.Chat
 //
 //  Created by Matheus Cardoso on 9/21/17.
@@ -22,8 +22,8 @@ fileprivate extension SubscriptionType {
     }
 }
 
-final class SubscriptionMessagesRequest: APIRequest {
-    typealias APIResourceType = SubscriptionMessagesResource
+final class RoomMessagesRequest: APIRequest {
+    typealias APIResourceType = RoomMessagesResource
 
     var path: String {
         return type.path
@@ -60,7 +60,7 @@ final class SubscriptionMessagesRequest: APIRequest {
     }
 }
 
-final class SubscriptionMessagesResource: APIResource {
+final class RoomMessagesResource: APIResource {
     var messages: [Message?]? {
         return raw?["messages"].arrayValue.map {
             let message = Message()

Rocket.Chat/API/Requests/Subscription/SubscriptionRolesRequest.swift → Rocket.Chat/API/Requests/Room/RoomRolesRequest.swift

@@ -1,5 +1,5 @@
 //
-//  SubscriptionRolesRequest.swift
+//  RoomRolesRequest.swift
 //  Rocket.Chat
 //
 //  Created by Rafael Kellermann Streit on 11/05/18.
@@ -22,8 +22,8 @@ fileprivate extension SubscriptionType {
     }
 }
 
-final class SubscriptionRolesRequest: APIRequest {
-    typealias APIResourceType = SubscriptionRolesResource
+final class RoomRolesRequest: APIRequest {
+    typealias APIResourceType = RoomRolesResource
 
     let requiredVersion = Version(0, 64, 2)
 
@@ -42,11 +42,11 @@ final class SubscriptionRolesRequest: APIRequest {
     }
 }
 
-final class SubscriptionRolesResource: APIResource {
-    var subscriptionRoles: [SubscriptionRoles]? {
+final class RoomRolesResource: APIResource {
+    var roomRoles: [RoomRoles]? {
         guard let realm = Realm.current else { return nil }
         return raw?["roles"].arrayValue.map {
-            let object = SubscriptionRoles()
+            let object = RoomRoles()
             object.user = User.getOrCreate(realm: realm, values: $0["u"], updates: nil)
             object.roles.append(contentsOf: $0["roles"].arrayValue.compactMap({ $0.string }))
             return object

Rocket.Chat/Controllers/Chat/ChatControllerMessageCellProtocol.swift

@@ -57,12 +57,12 @@ extension ChatViewController: ChatMessageCellProtocol, UserActionSheetPresenter
 
         // on select reactor
 
-        controller.reactorListView.selectedReactor = { username, rect in
+        controller.reactorListView.selectedReactor = { [weak self] username, rect in
             guard let user = User.find(username: username) else {
                 return
             }
 
-            controller.presentActionSheetForUser(user, source: (controller.view, rect))
+            controller.presentActionSheetForUser(user, subscription: self?.subscription, source: (controller.view, rect))
         }
     }
 
@@ -74,7 +74,7 @@ extension ChatViewController: ChatMessageCellProtocol, UserActionSheetPresenter
 
     func handleUsernameTapMessageCell(_ message: Message, view: UIView, recognizer: UIGestureRecognizer) {
         guard let user = message.user else { return }
-        presentActionSheetForUser(user, source: (view, nil))
+        presentActionSheetForUser(user, subscription: subscription, source: (view, nil))
     }
 
     func openURL(url: URL) {