char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some linting errors

main
Erik Johnston 2017-12-06 13:55:51 +00:00
parent 75aa316a6a
commit 16f593f786
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/github.com/matrix-org/dendrite/clientapi/routing/register_test.go
View File

@ -22,15 +22,15 @@ import (
var ( var (
// Registration Flows that the server allows. // Registration Flows that the server allows.
allowedFlows []authtypes.Flow = []authtypes.Flow{ allowedFlows = []authtypes.Flow{
{ {
[]authtypes.LoginType{ Stages: []authtypes.LoginType{
authtypes.LoginType("stage1"), authtypes.LoginType("stage1"),
authtypes.LoginType("stage2"), authtypes.LoginType("stage2"),
}, },
}, },
{ {
[]authtypes.LoginType{ Stages: []authtypes.LoginType{
authtypes.LoginType("stage1"), authtypes.LoginType("stage1"),
authtypes.LoginType("stage3"), authtypes.LoginType("stage3"),
}, },

4
src/github.com/matrix-org/dendrite/common/config/config.go
View File

@ -355,10 +355,10 @@ func (config *Dendrite) derive() {
if config.Matrix.RecaptchaEnabled { if config.Matrix.RecaptchaEnabled {
config.Derived.Registration.Params[authtypes.LoginTypeRecaptcha] = map[string]string{"public_key": config.Matrix.RecaptchaPublicKey} config.Derived.Registration.Params[authtypes.LoginTypeRecaptcha] = map[string]string{"public_key": config.Matrix.RecaptchaPublicKey}
config.Derived.Registration.Flows = append(config.Derived.Registration.Flows, config.Derived.Registration.Flows = append(config.Derived.Registration.Flows,
authtypes.Flow{[]authtypes.LoginType{authtypes.LoginTypeRecaptcha}}) authtypes.Flow{Stages: []authtypes.LoginType{authtypes.LoginTypeRecaptcha}})
} else { } else {
config.Derived.Registration.Flows = append(config.Derived.Registration.Flows, config.Derived.Registration.Flows = append(config.Derived.Registration.Flows,
authtypes.Flow{[]authtypes.LoginType{authtypes.LoginTypeDummy}}) authtypes.Flow{Stages: []authtypes.LoginType{authtypes.LoginTypeDummy}})
} }
} }