Attaching device ID and system console now work properly

goodforever · Apr 12, 2016 · 0855014 · 0855014
1 parent 9cbba3a
commit 0855014
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/context.go b/api/context.go
@@ -161,7 +161,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			}
 
 			if len(token) != 0 {
-				if (h.requireSystemAdmin || h.requireUser) && !h.trustRequester {
+				if (h.requireSystemAdmin || h.requireUser) && !h.trustRequester && h.isApi {
 					if r.Header.Get(model.HEADER_REQUESTED_WITH) != model.HEADER_REQUESTED_WITH_XML {
 						c.Err = model.NewLocAppError("ServeHTTP", "api.context.session_expired.app_error", nil, "token="+token)
 						token = ""

diff --git a/api/user.go b/api/user.go
@@ -50,7 +50,7 @@ func InitUser(r *mux.Router) {
 	sr.Handle("/logout", ApiUserRequired(logout)).Methods("POST")
 	sr.Handle("/login_ldap", ApiAppHandler(loginLdap)).Methods("POST")
 	sr.Handle("/revoke_session", ApiUserRequired(revokeSession)).Methods("POST")
-	sr.Handle("/attach_device", ApiUserRequired(attachDeviceId)).Methods("POST")
+	sr.Handle("/attach_device", ApiUserRequiredTrustRequester(attachDeviceId)).Methods("POST")
 	sr.Handle("/switch_to_sso", ApiAppHandler(switchToSSO)).Methods("POST")
 	sr.Handle("/switch_to_email", ApiUserRequired(switchToEmail)).Methods("POST")