feat: Start implementing XAL

Author: tuxuser

tests/conftest.py

@@ -11,6 +11,7 @@
     XAUResponse,
     XSTSResponse,
 )
+from xbox.webapi.authentication.xal import XALManager
 from xbox.webapi.common.request_signer import RequestSigner
 from xbox.webapi.common.signed_session import SignedSession
 
@@ -30,6 +31,14 @@ async def auth_mgr(event_loop):
     await session.aclose()
 
 
+@pytest_asyncio.fixture(scope="function")
+async def xal_mgr(event_loop):
+    session = SignedSession()
+    mgr = XALManager(session)
+    yield mgr
+    await session.aclose()
+
+
 @pytest.fixture(scope="function")
 def xbl_client(auth_mgr):
     return XboxLiveClient(auth_mgr)

tests/test_auth.py

@@ -1,5 +1,4 @@
 from datetime import datetime, timedelta, timezone
-import uuid
 
 from httpx import Response
 import pytest
@@ -99,17 +98,6 @@ async def test_get_title_endpoints(respx_mock, auth_mgr):
     assert route.called
 
 
-@pytest.mark.asyncio
-async def test_get_device_token(respx_mock, auth_mgr):
-    route = respx_mock.post(
-        "https://device.auth.xboxlive.com/device/authenticate"
-    ).mock(return_value=Response(200, json=get_response_json("auth_device_token")))
-    resp = await auth_mgr.request_device_token(
-        uuid.UUID("9c493431-5462-4a4a-a247-f6420396318d")
-    )
-    assert route.called
-
-
 @pytest.mark.asyncio
 async def test_xsts_properties(auth_mgr):
     assert auth_mgr.xsts_token.xuid == "2669321029139235"

tests/test_signed_session.py

@@ -34,6 +34,7 @@ async def test_sending_signed_request(synthetic_request_signer, respx_mock):
     assert route.called
     assert resp.request.headers.get("Signature") is not None
 
+
 @pytest.mark.asyncio
 async def test_sending_signed(synthetic_request_signer, respx_mock):
     route = respx_mock.post("https://xsts.auth.xboxlive.com").mock(
@@ -42,10 +43,10 @@ async def test_sending_signed(synthetic_request_signer, respx_mock):
 
     signed_session = SignedSession(synthetic_request_signer)
 
-    method="POST"
-    url="https://xsts.auth.xboxlive.com/xsts/authorize"
-    headers={"x-xbl-contract-version": "1"}
-    data={
+    method = "POST"
+    url = "https://xsts.auth.xboxlive.com/xsts/authorize"
+    headers = {"x-xbl-contract-version": "1"}
+    data = {
         "RelyingParty": "http://xboxlive.com",
         "TokenType": "JWT",
         "Properties": {
@@ -58,4 +59,4 @@ async def test_sending_signed(synthetic_request_signer, respx_mock):
         resp = await signed_session.send_signed(method, url, headers=headers, data=data)
 
     assert route.called
-    assert resp.request.headers.get("Signature") is not None
+    assert resp.request.headers.get("Signature") is not None

tests/test_xal.py

@@ -0,0 +1,18 @@
+from datetime import datetime, timedelta, timezone
+import uuid
+
+from httpx import Response
+import pytest
+
+from tests.common import get_response_json
+
+
+@pytest.mark.asyncio
+async def test_get_device_token(respx_mock, xal_mgr):
+    route = respx_mock.post(
+        "https://device.auth.xboxlive.com/device/authenticate"
+    ).mock(return_value=Response(200, json=get_response_json("auth_device_token")))
+    resp = await xal_mgr.request_device_token(
+        uuid.UUID("9c493431-5462-4a4a-a247-f6420396318d")
+    )
+    assert route.called

xbox/webapi/authentication/manager.py

@@ -5,14 +5,12 @@
 """
 import logging
 from typing import List, Optional
-import uuid
 
 import httpx
 
 from xbox.webapi.authentication.models import (
     OAuth2TokenResponse,
     TitleEndpointsResponse,
-    XADResponse,
     XAUResponse,
     XSTSResponse,
 )
@@ -170,23 +168,3 @@ async def request_xsts_token(
             raise AuthenticationException()
         resp.raise_for_status()
         return XSTSResponse(**resp.json())
-
-    async def request_device_token(self, device_id: uuid.UUID) -> XADResponse:
-        url = "https://device.auth.xboxlive.com/device/authenticate"
-        headers = {"x-xbl-contract-version": "1"}
-        data = {
-            "RelyingParty": "http://auth.xboxlive.com",
-            "TokenType": "JWT",
-            "Properties": {
-                "AuthMethod": "ProofOfPossession",
-                "Id": str(device_id).upper(),
-                "DeviceType": "Win32",
-                "Version": "10.0.22000.194",
-                "ProofKey": self.session.request_signer.proof_field,
-            },
-        }
-
-        request = httpx.Request("POST", url, headers=headers, json=data)
-        resp = await self.session.send_signed(request)
-        resp.raise_for_status()
-        return XADResponse(**resp.json())

xbox/webapi/authentication/xal.py

@@ -0,0 +1,33 @@
+"""
+Xbox Authentication Library
+
+Authenticate with Windows Live Server and Xbox Live (used by mobile Xbox Apps)
+"""
+import uuid
+
+from xbox.webapi.authentication.models import XADResponse
+from xbox.webapi.common.signed_session import SignedSession
+
+
+class XALManager:
+    def __init__(self, session: SignedSession):
+        self.session = session
+
+    async def request_device_token(self, device_id: uuid.UUID) -> XADResponse:
+        url = "https://device.auth.xboxlive.com/device/authenticate"
+        headers = {"x-xbl-contract-version": "1"}
+        data = {
+            "RelyingParty": "http://auth.xboxlive.com",
+            "TokenType": "JWT",
+            "Properties": {
+                "AuthMethod": "ProofOfPossession",
+                "Id": str(device_id).upper(),
+                "DeviceType": "Win32",
+                "Version": "10.0.22000.194",
+                "ProofKey": self.session.request_signer.proof_field,
+            },
+        }
+
+        resp = await self.session.send_signed("POST", url, headers=headers, json=data)
+        resp.raise_for_status()
+        return XADResponse(**resp.json())