iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Actually use bridge.allow_matrix_login

Browse Source
This commit is contained in:
Tulir Asokan
2018-02-24 12:06:19 +02:00
parent 566a2b3892
commit fed8adae97
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/commands/auth.py
+22 -8
View File
@@ -55,10 +55,14 @@ def register(evt):
async def login(evt): async def login(evt):
if evt.sender.logged_in: if evt.sender.logged_in:
return await evt.reply("You are already logged in.") return await evt.reply("You are already logged in.")
evt.sender.command_status = {
"next": enter_phone, allow_matrix_login = evt.config.get("bridge.allow_matrix_login", True)
"action": "Login", if allow_matrix_login:
} evt.sender.command_status = {
"next": enter_phone,
"action": "Login",
}
if evt.config["appservice.public.enabled"]: if evt.config["appservice.public.enabled"]:
prefix = evt.config["appservice.public.external"] prefix = evt.config["appservice.public.external"]
url = f"{prefix}/login?mxid={evt.sender.mxid}" url = f"{prefix}/login?mxid={evt.sender.mxid}"
@@ -69,15 +73,20 @@ async def login(evt):
f"If you would like to log in outside of Matrix, [click here]({url})."))) f"If you would like to log in outside of Matrix, [click here]({url}).")))
return await evt.reply("This bridge instance does not allow logging in inside Matrix.\n\n" return await evt.reply("This bridge instance does not allow logging in inside Matrix.\n\n"
f"Please visit [the login page]({url}) to log in.") f"Please visit [the login page]({url}) to log in.")
return await evt.reply( elif allow_matrix_login:
"This bridge instance does not allow you to log in outside of Matrix.\n\n" return await evt.reply(
"Please send your phone number here to start the login process.") "This bridge instance does not allow you to log in outside of Matrix.\n\n"
"Please send your phone number here to start the login process.")
return await evt.reply("This bridge instance has been configured to not allow logging in.")
@command_handler(needs_auth=False) @command_handler(needs_auth=False)
async def enter_phone(evt): async def enter_phone(evt):
if len(evt.args) == 0: if len(evt.args) == 0:
return await evt.reply("**Usage:** `$cmdprefix+sp enter-phone <phone>`") return await evt.reply("**Usage:** `$cmdprefix+sp enter-phone <phone>`")
elif not evt.config.get("bridge.allow_matrix_login", True):
return await evt.reply("This bridge instance does not allow in-Matrix login. "
"Please use `$cmdprefix+sp login` to get login instructions")
phone_number = evt.args[0] phone_number = evt.args[0]
try: try:
@@ -117,7 +126,9 @@ async def enter_phone(evt):
async def enter_code(evt): async def enter_code(evt):
if len(evt.args) == 0: if len(evt.args) == 0:
return await evt.reply("**Usage:** `$cmdprefix+sp enter-code <code>`") return await evt.reply("**Usage:** `$cmdprefix+sp enter-code <code>`")
elif not evt.config.get("bridge.allow_matrix_login", True):
return await evt.reply("This bridge instance does not allow in-Matrix login. "
"Please use `$cmdprefix+sp login` to get login instructions")
try: try:
await evt.sender.ensure_started(even_if_no_session=True) await evt.sender.ensure_started(even_if_no_session=True)
user = await evt.sender.client.sign_in(code=evt.args[0]) user = await evt.sender.client.sign_in(code=evt.args[0])
@@ -146,6 +157,9 @@ async def enter_code(evt):
async def enter_password(evt): async def enter_password(evt):
if len(evt.args) == 0: if len(evt.args) == 0:
return await evt.reply("**Usage:** `$cmdprefix+sp enter-password <password>`") return await evt.reply("**Usage:** `$cmdprefix+sp enter-password <password>`")
elif not evt.config.get("bridge.allow_matrix_login", True):
return await evt.reply("This bridge instance does not allow in-Matrix login. "
"Please use `$cmdprefix+sp login` to get login instructions")
try: try:
await evt.sender.ensure_started(even_if_no_session=True) await evt.sender.ensure_started(even_if_no_session=True)