This commit is contained in:
baiqwerdvd 2024-10-13 14:02:22 +08:00
parent e551201e63
commit 38ae22225d
No known key found for this signature in database
GPG Key ID: 7717E46E1797411A
2 changed files with 19 additions and 3 deletions

View File

@ -40,8 +40,8 @@ async def get_resp_msg(bot: Bot, ev: Event):
login.post_account_info_hg()
login.user_oauth2_v2_grant()
(skland_cred, skland_token, skland_userId) = login.generate_cred_by_code()
uid = login.uid
skd_uid = skland_userId
uid = login.ark_uid
skd_uid = login.skland_userId
# check_cred = await ark_skd_api.check_cred_valid(
# cred=skland_cred,

View File

@ -172,6 +172,8 @@ class SklandLogin:
result = convert(response.json(), AccountInfoHGResponse)
if result.code != 0:
raise SklandLoginError(ARK_ACCONUT_INFO_HG, result.msg)
self.hg_token = result.data["content"]
self.get_ark_uid()
def user_oauth2_v2_grant(self):
# data = Oauth2V2GrantRequest(
@ -198,9 +200,23 @@ class SklandLogin:
code = transUnset(result_data.code)
if not code:
raise SklandLoginError(ARK_USER_OAUTH2_V2_GRANT, "result.data.code is None")
self.uid = uid
# self.uid = uid
self.code = code
def get_ark_uid(self):
url = "https://as.hypergryph.com/u8/user/info/v1/basic"
response = self.client.post(
url,
json={
"appId": 1,
"channelMasterId": 1,
"channelToken": {"token": self.hg_token},
},
)
response.raise_for_status()
result_data = response.json()
self.ark_uid = result_data["data"]["uid"]
def generate_cred_by_code(self):
self.client.headers["platform"] = "3"
self.client.headers["vName"] = "1.0.0"