Merge pull request #2620 from RocketChat/bug/avatar_url_channel_authenticated

rafaelks · web-flow · commit e1194091364a · 2019-04-01T08:17:36.000-03:00
[FIX] Auth params into channel avatar URL
diff --git a/Rocket.Chat/Models/Subscription/Subscription.swift b/Rocket.Chat/Models/Subscription/Subscription.swift
@@ -151,12 +151,14 @@ extension Subscription {
         guard
             let auth = auth ?? AuthManager.isAuthenticated(),
             let baseURL = auth.baseURL(),
+            let userId = auth.userId,
+            let token = auth.token,
             let encodedName = name.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
         else {
             return nil
         }
 
-        return URL(string: "\(baseURL)/avatar/%22\(encodedName)?format=jpeg")
+        return URL(string: "\(baseURL)/avatar/%22\(encodedName)?format=jpeg&rc_uid=\(userId)&rc_token=\(token)")
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -151,12 +151,14 @@ extension Subscription {`
`151`	`151`	`guard`
`152`	`152`	`let auth = auth ?? AuthManager.isAuthenticated(),`
`153`	`153`	`let baseURL = auth.baseURL(),`
	`154`	`+ let userId = auth.userId,`
	`155`	`+ let token = auth.token,`
`154`	`156`	`let encodedName = name.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)`
`155`	`157`	`else {`
`156`	`158`	`return nil`
`157`	`159`	`}`
`158`	`160`
`159`		`- return URL(string: "\(baseURL)/avatar/%22\(encodedName)?format=jpeg")`
	`161`	`+ return URL(string: "\(baseURL)/avatar/%22\(encodedName)?format=jpeg&rc_uid=\(userId)&rc_token=\(token)")`
`160`	`162`	`}`
`161`	`163`	`}`
`162`	`164`