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

Push bad credentials state if session isn't valid in start()

Browse Source
This commit is contained in:
Tulir Asokan
2021-10-20 20:12:23 +03:00
parent e4a2bd2f69
commit 8865dab6b0
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/user.py
+4 -1
View File
@@ -58,6 +58,7 @@ METRIC_CONNECTED = Gauge('bridge_connected', 'Users connected to Telegram')
BridgeState.human_readable_errors.update({ BridgeState.human_readable_errors.update({
"tg-not-connected": "Your Telegram connection failed", "tg-not-connected": "Your Telegram connection failed",
"tg-auth-key-duplicated": "The bridge accidentally logged you out", "tg-auth-key-duplicated": "The bridge accidentally logged you out",
"tg-not-authenticated": "The stored auth token did not work",
}) })
@@ -228,6 +229,9 @@ class User(AbstractUser, BaseUser):
elif delete_unless_authenticated: elif delete_unless_authenticated:
self.log.debug(f"Unauthenticated user {self.name} start()ed, deleting session...") self.log.debug(f"Unauthenticated user {self.name} start()ed, deleting session...")
await self.client.disconnect() await self.client.disconnect()
if self.tgid:
await self.push_bridge_state(BridgeStateEvent.BAD_CREDENTIALS,
error="tg-not-authenticated")
self.client.session.delete() self.client.session.delete()
return self return self
@@ -366,7 +370,6 @@ class User(AbstractUser, BaseUser):
self.by_tgid[self.tgid] = self self.by_tgid[self.tgid] = self
if changed: if changed:
await self.save() await self.save()
return info
async def log_out(self) -> bool: async def log_out(self) -> bool:
puppet = pu.Puppet.get(self.tgid) puppet = pu.Puppet.get(self.tgid)