OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Move constant to correct location

pull/8320/head
Will Hunt 2020-09-16 18:57:45 +01:00
parent c3c1cc7162
commit bcb63c8ef5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/api/constants.py
View File

@ -57,7 +57,6 @@ class JoinRules:
class LoginType: class LoginType:
PASSWORD = "m.login.password" PASSWORD = "m.login.password"
APPSERVICE = "uk.half-shot.msc2778.login.application_service"
EMAIL_IDENTITY = "m.login.email.identity" EMAIL_IDENTITY = "m.login.email.identity"
MSISDN = "m.login.msisdn" MSISDN = "m.login.msisdn"
RECAPTCHA = "m.login.recaptcha" RECAPTCHA = "m.login.recaptcha"

3
synapse/rest/client/v1/login.py
View File

@ -41,6 +41,7 @@ logger = logging.getLogger(__name__)
class LoginRestServlet(RestServlet): class LoginRestServlet(RestServlet):
PATTERNS = client_patterns("/login$", v1=True) PATTERNS = client_patterns("/login$", v1=True)
APPSERVICE_TYPE = "uk.half-shot.msc2778.login.application_service"
CAS_TYPE = "m.login.cas" CAS_TYPE = "m.login.cas"
SSO_TYPE = "m.login.sso" SSO_TYPE = "m.login.sso"
TOKEN_TYPE = "m.login.token" TOKEN_TYPE = "m.login.token"
@ -240,7 +241,7 @@ class LoginRestServlet(RestServlet):
else: else:
qualified_user_id = UserID(identifier["user"], self.hs.hostname).to_string() qualified_user_id = UserID(identifier["user"], self.hs.hostname).to_string()
if login_submission["type"] == LoginType.APPSERVICE: if login_submission["type"] == LoginRestServlet.APPSERVICE_TYPE:
if appservice is None or not appservice.is_interested_in_user( if appservice is None or not appservice.is_interested_in_user(
qualified_user_id qualified_user_id
): ):