Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matrix Long Lived Token: Don't logout, and use UUIDv4 for transactionIds #1249

Merged
merged 16 commits into from
Nov 30, 2024
Merged

Matrix Long Lived Token: Don't logout, and use UUIDv4 for transactionIds #1249

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
46351d0
Matrix: Allow token only for V2 API with ?token.
Nov 11, 2024
2b9d94e
Matrix: client API Token use template variable fix.
Nov 15, 2024
cb074ca
Matrix: client API Token use template variable fix.
Nov 20, 2024
1cd6f6a
Matrix V3+ Client/API Token support added.
Nov 21, 2024
ebe7699
Matrix: Allow token only client API authorization with token paramete…
voc0der Nov 22, 2024
77cc81a
Merge branch 'caronc:master' into master
voc0der Nov 29, 2024
797452d
Matrix: Use UUID for transaction (demo).
voc0der Nov 29, 2024
72bfcb4
Matrix: Use UUID for transaction (demo).
voc0der Nov 29, 2024
3db2e80
Try 2
voc0der Nov 29, 2024
2f8fa5c
Matrix: Use UUID for long lived tokens and prevent logout.
voc0der Nov 29, 2024
42b8d28
Matrix: Use UUID for long lived tokens and prevent logout.
voc0der Nov 29, 2024
906248a
Matrix: Use UUID for long lived tokens and prevent logout.
voc0der Nov 29, 2024
e3e2357
Matrix: Do not increment cache in long stored tokens.
voc0der Nov 29, 2024
8463452
Matrix: Do not increment cache in long stored tokens.
voc0der Nov 29, 2024
963a09d
Matrix: Regression test without UUID
voc0der Nov 29, 2024
d1c806d
Matrix: No cache in long lived; use UUID.
voc0der Nov 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion apprise/plugins/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#
import re
import requests
import uuid
from markdown import markdown
from json import dumps
from json import loads
Expand Down Expand Up @@ -616,6 +617,7 @@ def _send_server_notification(self, body, title='',

if self.access_token is None and self.password and not self.user:
self.access_token = self.password
self.transaction_id = uuid.uuid4()

if self.access_token is None:
# We need to register
Expand Down Expand Up @@ -746,7 +748,8 @@ def _send_server_notification(self, body, title='',

# Increment the transaction ID to avoid future messages being
# recognized as retransmissions and ignored
if self.version == MatrixVersion.V3:
if self.version == MatrixVersion.V3 \
and self.access_token != self.password:
self.transaction_id += 1
self.store.set(
'transaction_id', self.transaction_id,
Expand Down Expand Up @@ -1401,6 +1404,10 @@ def __del__(self):
# re-use our credentials with
return

if self.access_token is not None \
and self.access_token == self.password and not self.user:
return

try:
self._logout()

Expand Down
Loading