PaiGramTeam/SIMNet
3
0
Fork 0
mirror of https://github.com/PaiGramTeam/SIMNet.git synced 2024-11-16 12:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix token v2 parse

Browse Source
This commit is contained in:
omg-xtao 2024-04-06 16:23:19 +08:00 committed by GitHub
parent a2ec41d087
commit 517b31c157
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
simnet/client/components/auth.py
View File

@ -435,6 +435,7 @@ class AuthClient(BaseClient):
if self.region != Region.OVERSEAS:
raise RegionNotSupported()
self.check_stoken(stoken, account_id, mid)
account_id = account_id or self.account_id
url = AUTH_KEY_URL.get_url(self.region) / "../../../account/ma-passport/token/getBySToken"
headers = {"x-rpc-app_id": "c9oqaq3s3gu8"}
data_ = {"dst_token_types": [1, 2, 4]}
@ -445,11 +446,30 @@ class AuthClient(BaseClient):
token_type = token.get("token_type", 0)
token_map[token_type] = token.get("token", "")
mid = data.get("user_info", {}).get("mid", "")
model = CookiesModel(mid=mid, stoken=token_map[1], ltoken=token_map[2], cookie_token=token_map[4])
model = CookiesModel(stoken=token_map[1])
ltoken, cookie_token = token_map[2], token_map[4]
if ltoken.startswith("v2_"):
model.ltoken_v2 = ltoken
else:
model.ltoken = ltoken
if cookie_token.startswith("v2_"):
model.cookie_token_v2 = cookie_token
else:
model.cookie_token = cookie_token
model.set_mid(mid)
model.set_uid(account_id)
model.set_v2_uid(account_id)
self.cookies.set("mid", model.mid)
self.cookies.set("stoken", model.stoken)
self.cookies.set("ltoken", model.ltoken)
self.cookies.set("cookie_token", model.cookie_token)
if model.ltoken:
self.cookies.set("ltoken", model.ltoken)
if model.ltoken_v2:
self.cookies.set("ltoken_v2", model.ltoken_v2)
if model.cookie_token:
self.cookies.set("cookie_token", model.cookie_token)
if model.cookie_token_v2:
self.cookies.set("cookie_token_v2", model.cookie_token_v2)
return model
async def get_game_token_by_stoken(

9
simnet/client/cookies.py
View File

@ -168,3 +168,12 @@ class CookiesModel(BaseModel, frozen=False):
self.account_id = user_id
if self.ltuid is None and self.ltoken:
self.ltuid = user_id
def set_mid(self, mid: str):
"""Set the mid for the v1 cookies."""
if self.mid is None:
self.mid = mid
if self.account_mid_v2 is None:
self.account_mid_v2 = mid
if self.ltmid_v2 is None and self.ltoken_v2:
self.ltmid_v2 = mid