Lay groundwork for auth token use

Author: nickelpro

spockbot/mcp/yggdrasil.py

@@ -13,6 +13,9 @@
 
 
 class YggdrasilCore(object):
+    ygg_version = 1
+    ygg_url = 'https://authserver.mojang.com'
+
     def __init__(self, username='', password='', client_token='',
                  access_token=''):
         self.username = username
@@ -35,7 +38,7 @@ def logout(self):
     def _ygg_req(self, endpoint, payload):
         try:
             resp = urlopen(Request(
-                url='https://authserver.mojang.com' + endpoint,
+                url=self.ygg_url + endpoint,
                 data=json.dumps(payload).encode('utf-8'),
                 headers={'Content-Type': 'application/json'})
             )
@@ -57,7 +60,7 @@ def authenticate(self):
         payload = {
             'agent': {
                 'name': 'Minecraft',
-                'version': 1,
+                'version': self.ygg_version,
             },
             'username': self.username,
             'password': self.password,

spockbot/plugins/core/auth.py

@@ -52,6 +52,20 @@ def set_password(self, password):
 
     password = property(lambda x: bool(x.ygg.password), set_password)
 
+    def set_client_token(self, client_token):
+        self.ygg.client_token = client_token
+
+    client_token = property(
+        lambda x: bool(x.ygg.client_token), set_client_token
+    )
+
+    def set_auth_token(self, auth_token):
+        self.ygg.auth_token = auth_token
+
+    auth_token = property(
+        lambda x: bool(x.ygg.auth_token), set_auth_token
+    )
+
     def get_shared_secret(self):
         self._shared_secret = self._shared_secret or os.urandom(16)
         return self._shared_secret