From 66e60357dc1c03153d35668c5b966b7f7a41e43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Sat, 13 Jun 2015 20:14:44 +0200 Subject: [PATCH] Set email when creating user from auth_proxy header, Fixes #2156 --- pkg/middleware/auth_proxy.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/middleware/auth_proxy.go b/pkg/middleware/auth_proxy.go index 42cd91a3ad1..2529fef67a9 100644 --- a/pkg/middleware/auth_proxy.go +++ b/pkg/middleware/auth_proxy.go @@ -60,8 +60,10 @@ func getCreateUserCommandForProxyAuth(headerVal string) *m.CreateUserCommand { cmd := m.CreateUserCommand{} if setting.AuthProxyHeaderProperty == "username" { cmd.Login = headerVal + cmd.Email = headerVal } else if setting.AuthProxyHeaderProperty == "email" { cmd.Email = headerVal + cmd.Login = headerVal } else { panic("Auth proxy header property invalid") }