Drop fallback to email when user is empty (#537)

This commit is contained in:
Joel Speed
2020-05-12 16:04:51 +01:00
committed by GitHub
parent 7cf685140b
commit 4e3dd09cf2
5 changed files with 18 additions and 9 deletions
-3
View File
@@ -193,8 +193,5 @@ func DecodeSessionState(v string, c *encryption.Cipher) (*SessionState, error) {
}
}
}
if ss.User == "" {
ss.User = ss.Email
}
return ss, nil
}
+3 -3
View File
@@ -33,7 +33,7 @@ func TestSessionStateSerialization(t *testing.T) {
ss, err := sessions.DecodeSessionState(encoded, c)
t.Logf("%#v", ss)
assert.Equal(t, nil, err)
assert.Equal(t, "user@domain.com", ss.User)
assert.Equal(t, "", ss.User)
assert.Equal(t, s.Email, ss.Email)
assert.Equal(t, s.PreferredUsername, ss.PreferredUsername)
assert.Equal(t, s.AccessToken, ss.AccessToken)
@@ -112,7 +112,7 @@ func TestSessionStateSerializationNoCipher(t *testing.T) {
// only email should have been serialized
ss, err := sessions.DecodeSessionState(encoded, nil)
assert.Equal(t, nil, err)
assert.Equal(t, "user@domain.com", ss.User)
assert.Equal(t, "", ss.User)
assert.Equal(t, s.Email, ss.Email)
assert.Equal(t, s.PreferredUsername, ss.PreferredUsername)
assert.Equal(t, "", ss.AccessToken)
@@ -226,7 +226,7 @@ func TestDecodeSessionState(t *testing.T) {
{
SessionState: sessions.SessionState{
Email: "user@domain.com",
User: "user@domain.com",
User: "",
},
Encoded: `{"Email":"user@domain.com"}`,
},