mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 11:23:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

add identifier field to login

Browse source 
Signed-off-by: mohitks <mohitkumarsingh907@gmail.com>
This commit is contained in:
mohitks 2019-12-15 10:11:42 +05:30
parent 145921f207
commit b7c676cdf3
1 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
clientapi/routing/login.go
View file

@ -40,9 +40,14 @@ type flow struct {
Stages []string `json:"stages"` Stages []string `json:"stages"`
} }
type identifier struct {
Type string `json:"type"`
User string `json:"user"`
}
type passwordRequest struct { type passwordRequest struct {
User string `json:"user"` User string `json:"user"`
Password string `json:"password"` Password string `json:"password"`
Identifier *identifier `json:"identifier"`
// Both DeviceID and InitialDisplayName can be omitted, or empty strings ("") // Both DeviceID and InitialDisplayName can be omitted, or empty strings ("")
// Thus a pointer is needed to differentiate between the two // Thus a pointer is needed to differentiate between the two
InitialDisplayName *string `json:"initial_device_display_name"` InitialDisplayName *string `json:"initial_device_display_name"`
@ -79,6 +84,22 @@ func Login(
if resErr != nil { if resErr != nil {
return *resErr return *resErr
} }
if r.Identifier != nil {
// go over identifier types
switch r.Identifier.Type {
case "m.type.user":
// depreciate user in favor of identifier field
// https://matrix.org/docs/spec/client_server/unstable#post-matrix-client-r0-login
r.User = r.Identifier.User
default:
return util.JSONResponse{
Code: http.StatusNotImplemented,
JSON: jsonerror.Unknown("unknown/unimplemented identifier type"),
}
}
}
if r.User == "" { if r.User == "" {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,