Skip to content

fix key error client['id'] in line 43 #17

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

Open
moradpoor wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix key error client['id'] in line 43 #17

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab20080
fix key error client['id'] in line 43
moradpoor Sep 29, 2023
cf42e9e
some changes for find_client
moradpoor Sep 29, 2023
1275154
add uuid_key variable line 258
moradpoor Oct 2, 2023
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
25 changes: 13 additions & 12 deletions pyxui/methods/clients.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@ def get_client(
continue

settings = json.loads(inbound['settings'])

protocol = inbound['protocol']
for client in settings['clients']:
if client['email'] != email and client['id'] != uuid:
clientid = client['id'] if protocol in ['vless','vmess'] else client['password']
if client['email'] != email and clientid != uuid:
continue

return client
return client , protocol

raise errors.NotFound()

Expand Down Expand Up @@ -186,14 +187,14 @@ def delete_client(
`~Dict`: On success, a dict is returned else 404 error will be raised
"""

find_client = self.get_client(
find_client , protocol = self.get_client(
inbound_id=inbound_id,
email=email,
uuid=uuid
)

clientid = find_client['id'] if protocol in ['vless','vmess'] else find_client['password']
response = self.request(
path=f"{inbound_id}/delClient/{find_client['id']}",
path=f"{inbound_id}/delClient/{clientid}",
method="POST"
)

Expand Down Expand Up @@ -249,16 +250,16 @@ def update_client(
`~Dict`: On success, a dict is returned else 404 error will be raised
"""

find_client = self.get_client(
find_client , protocol = self.get_client(
inbound_id=inbound_id,
email=email,
uuid=uuid
)

uuid_key = "password" if protocol == 'trojan' else "id"
settings = {
"clients": [
{
"id": uuid,
uuid_key: uuid,
"email": email,
"enable": enable,
"flow": flow,
Expand All @@ -272,14 +273,14 @@ def update_client(
"decryption": "none",
"fallbacks": []
}

params = {
"id": inbound_id,
"settings": json.dumps(settings)
}

clientid = find_client['id'] if protocol in ['vless','vmess'] else find_client['password']
response = self.request(
path=f"updateClient/{find_client['id']}",
path=f"updateClient/{clientid}",
method="POST",
params=params
)
Expand Down