From 89635a4c2811374a9a9aa6c69b3fa6c1d67c3c9d Mon Sep 17 00:00:00 2001
From: alemidev <me@alemi.dev>
Date: Wed, 15 Dec 2021 11:28:53 +0100
Subject: [PATCH] improved token serialization/deserialization

---
 aiocraft/mc/__init__.py |  3 +++
 aiocraft/mc/token.py    | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/aiocraft/mc/__init__.py b/aiocraft/mc/__init__.py
index e69de29..b0e616a 100644
--- a/aiocraft/mc/__init__.py
+++ b/aiocraft/mc/__init__.py
@@ -0,0 +1,3 @@
+from .token import *
+from .packet import Packet
+from .definitions import *
diff --git a/aiocraft/mc/token.py b/aiocraft/mc/token.py
index bef3327..88bfe87 100644
--- a/aiocraft/mc/token.py
+++ b/aiocraft/mc/token.py
@@ -18,7 +18,7 @@ def _raise_from_json(endpoint:str, data:dict):
 	raise AuthException(f"[{action}] {err_type} : {err_msg}")
 
 @dataclass
-class Profile:
+class GameProfile:
 	id : str
 	name : str
 
@@ -33,7 +33,7 @@ class Token:
 	username : str
 	accessToken : str
 	clientToken : str
-	selectedProfile : Profile
+	selectedProfile : GameProfile
 
 	AGENT_NAME = "Minecraft"
 	AGENT_VERSION = 1
@@ -74,10 +74,10 @@ class Token:
 	@classmethod
 	def from_dict(cls, data:dict):
 		return cls(
-			username=data["selectedProfile"]["name"],
+			username=data["username"] if "username" in data else data["selectedProfile"]["name"],
 			accessToken=data["accessToken"],
 			clientToken=data["clientToken"],
-			selectedProfile=Profile(**data["selectedProfile"]),
+			selectedProfile=GameProfile(**data["selectedProfile"]),
 		)
 
 	@classmethod
@@ -100,7 +100,7 @@ class Token:
 			username=username,
 			accessToken=res["accessToken"],
 			clientToken=res["clientToken"],
-			selectedProfile=Profile(**res["selectedProfile"])
+			selectedProfile=GameProfile(**res["selectedProfile"])
 		)
 
 	@classmethod
@@ -118,7 +118,7 @@ class Token:
 
 		self.accessToken = res["accessToken"]
 		self.clientToken = res["clientToken"]
-		self.selectedProfile = Profile(**res["selectedProfile"])
+		self.selectedProfile = GameProfile(**res["selectedProfile"])
 
 		if "user" in res:
 			self.username = res["user"]["username"]