From 2db487cdd38e44b202574c917549bcf1546eb288 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 4 Mar 2021 15:58:47 +0000 Subject: [PATCH] Enforce LoginTypeApplicationService after all --- clientapi/routing/register.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clientapi/routing/register.go b/clientapi/routing/register.go index 9e0ca51fa..cd19dec97 100644 --- a/clientapi/routing/register.go +++ b/clientapi/routing/register.go @@ -502,7 +502,7 @@ func Register( // Squash username to all lowercase letters r.Username = strings.ToLower(r.Username) - if r.Auth.Type == authtypes.LoginTypeApplicationService || accessTokenErr == nil { + if r.Auth.Type == authtypes.LoginTypeApplicationService { if resErr = validateApplicationServiceUsername(r.Username); resErr != nil { return *resErr } @@ -604,7 +604,7 @@ func handleRegistrationFlow( // registration or user exclusivity. We'll go onto the appservice // registration flow if a valid access token was provided or if // the login type specifically requests it. - if r.Auth.Type == authtypes.LoginTypeApplicationService || accessTokenErr == nil { + if r.Auth.Type == authtypes.LoginTypeApplicationService { return handleApplicationServiceRegistration( accessToken, accessTokenErr, req, r, cfg, userAPI, )