Merge pull request #2591 from RocketChat/feature/avatar_authenticated_users.2540

rafaelks · web-flow · commit fc73fbea8d9e · 2019-03-20T09:19:58.000-03:00
[IMPROVEMENT] Support authentication parameters on avatars
diff --git a/Rocket.Chat/Models/User/User.swift b/Rocket.Chat/Models/User/User.swift
@@ -105,12 +105,14 @@ extension User {
         guard
             let auth = auth ?? AuthManager.isAuthenticated(),
             let baseURL = auth.baseURL(),
+            let userId = auth.userId,
+            let token = auth.token,
             let encodedUsername = username.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)
         else {
             return nil
         }
 
-        return URL(string: "\(baseURL)/avatar/\(encodedUsername)?format=jpeg")
+        return URL(string: "\(baseURL)/avatar/\(encodedUsername)?format=jpeg&rc_uid=\(userId)&rc_token=\(token)")
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -105,12 +105,14 @@ extension User {`
`105`	`105`	`guard`
`106`	`106`	`let auth = auth ?? AuthManager.isAuthenticated(),`
`107`	`107`	`let baseURL = auth.baseURL(),`
	`108`	`+ let userId = auth.userId,`
	`109`	`+ let token = auth.token,`
`108`	`110`	`let encodedUsername = username.addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)`
`109`	`111`	`else {`
`110`	`112`	`return nil`
`111`	`113`	`}`
`112`	`114`
`113`		`- return URL(string: "\(baseURL)/avatar/\(encodedUsername)?format=jpeg")`
	`115`	`+ return URL(string: "\(baseURL)/avatar/\(encodedUsername)?format=jpeg&rc_uid=\(userId)&rc_token=\(token)")`
`114`	`116`	`}`
`115`	`117`
`116`	`118`	`}`