diff --git a/oauth-curlsp.py b/oauth-curlsp.py index e9b9fe5..74372a2 100644 --- a/oauth-curlsp.py +++ b/oauth-curlsp.py @@ -1,38 +1,38 @@ import http.server from oauthlib.oauth2 import WebApplicationClient import webbrowser -import urllib3 import re import subprocess import ast -urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) - -CLIENT_ID = "a79bae348867427690ca6df9903e4af0" -CLIENT_SECRET = "VfFc4JRxn4MpA5zRVut1gPIh6E5WrEC5" -AUTH_URL = "https://oauth.battle.net/authorize" -REDIRECT_URI = 'http://localhost:5635/login_success' - token_file = open(".oauthtoken", "r") oauth_token = token_file.readline() - -command = ["curl", "-sH", "Authorization: Bearer {}".format(oauth_token), "https://us.api.blizzard.com/profile/user/wow?namespace=profile-us&locale=en_US"] -# | jq -r '[ .wow_accounts[0].characters[].level | select(.) ] | add / length' -# Run the command -result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) +def oauth_api_curl(url): + command = ["curl", "-sH", "Authorization: Bearer {}".format(oauth_token), "https://us.api.blizzard.com/profile/user/wow?namespace=profile-us&locale=en_US"] + result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) # Get the output and error message (if any) -output = ast.literal_eval(result.stdout) +output = result.stdout +output_dict = ast.literal_eval(output) error = result.stderr -characters = output['wow_accounts'][0]['characters'] +characters = output_dict['wow_accounts'][0]['characters'] +char_dicts = [] # Check if it was successful if result.returncode == 0: print("Success:") for char in characters: - print(char['name'], char['level']) + # TODO: API call for char['protected_character'] url via curl for more info + char_dict = {'id': char['id'], + 'name': char['name'], + 'level': char['level'], + 'realm': char['realm']['name'], + 'class': char['playable_class']['name']} + char_dicts.append(char_dict) + print(char_dict) + print(char) else: print("Error:") print(error) diff --git a/oauth-token.py b/oauth-token.py index dcd5d69..895a0d8 100644 --- a/oauth-token.py +++ b/oauth-token.py @@ -1,9 +1,13 @@ import http.server from oauthlib.oauth2 import WebApplicationClient import webbrowser +import urllib3 import re import requests + +urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning) + CLIENT_ID = "a79bae348867427690ca6df9903e4af0" CLIENT_SECRET = "VfFc4JRxn4MpA5zRVut1gPIh6E5WrEC5" AUTH_URL = "https://oauth.battle.net/authorize"