diff --git a/auth/app/auth.py b/auth/app/auth.py index 15c1a83..895fbe0 100644 --- a/auth/app/auth.py +++ b/auth/app/auth.py @@ -1,3 +1,5 @@ +import base64 +import json from fastapi import HTTPException from .models import UserLogin, UserInDB, Session, UserCreate from .utils import ( @@ -61,10 +63,12 @@ class AuthService: } async def validate(self, access_token: str, client_token: str): + print(f"Searching for access_toke and client_token: '{access_token}', '{client_token}") session = await sessions_collection.find_one({ "access_token": access_token, "client_token": client_token, }) + print("Session from DB:", session) if not session or datetime.utcnow() > session["expires_at"]: return False return True @@ -80,3 +84,83 @@ class AuthService: {"$set": {"access_token": new_access_token}}, ) return {"accessToken": new_access_token, "clientToken": client_token} + + async def get_minecraft_profile(self, uuid: str): + formatted_uuid = f"{uuid[:8]}-{uuid[8:12]}-{uuid[12:16]}-{uuid[16:20]}-{uuid[20:]}" + user = await users_collection.find_one({"uuid": formatted_uuid}) + if not user: + raise HTTPException( + status_code=404, + detail=f"User not found (searched for UUID: {formatted_uuid})" + ) + + textures = { + "timestamp": int(datetime.now().timestamp()), + "profileId": formatted_uuid, + "profileName": user["username"], + "textures": { + "SKIN": {"url": user.get("skin_url", "")}, + "CAPE": {"url": user.get("cloak_url", "")} + } if user.get("skin_url") or user.get("cloak_url") else {} + } + + textures_json = json.dumps(textures).encode() + base64_textures = base64.b64encode(textures_json).decode() + + return { + "id": formatted_uuid, + "name": user["username"], + "properties": [ + { + "name": "textures", + "value": base64_textures + } + ] + } + + async def join_server(self, request_data: dict): + access_token = request_data.get("accessToken") + selected_profile = request_data.get("selectedProfile") + server_id = request_data.get("serverId") + + if not all([access_token, selected_profile, server_id]): + raise HTTPException(status_code=400, detail="Missing required parameters") + + decoded_token = decode_token(access_token) + if not decoded_token: + raise HTTPException(status_code=401, detail="Invalid access token") + + token_uuid = decoded_token.get("uuid", "").replace("-", "") + if token_uuid != selected_profile: + raise HTTPException(status_code=403, detail="Token doesn't match selected profile") + + return True + + async def has_joined(self, username: str, server_id: str): + user = await users_collection.find_one({"username": username}) + if not user: + raise HTTPException(status_code=404, detail="User not found") + + response_uuid = user["uuid"].replace("-", "") + + textures = {} + if user.get("skin_url"): + textures["SKIN"] = {"url": user["skin_url"]} + if user.get("cloak_url"): + textures["CAPE"] = {"url": user["cloak_url"]} + + textures_value = base64.b64encode(json.dumps({ + "timestamp": int(datetime.now().timestamp()), + "profileId": response_uuid, + "profileName": username, + "textures": textures + }).encode()).decode() + + return { + "id": response_uuid, + "name": username, + "properties": [{ + "name": "textures", + "value": textures_value + }] if textures else [] + } diff --git a/auth/app/main.py b/auth/app/main.py index a35f067..b358aef 100644 --- a/auth/app/main.py +++ b/auth/app/main.py @@ -1,11 +1,17 @@ -from fastapi import FastAPI, Depends, HTTPException, Body +import base64 +from datetime import datetime +import json +from fastapi import FastAPI, Depends, HTTPException, Body, Request, Response from fastapi.security import OAuth2PasswordBearer from .models import UserCreate, UserLogin, ValidateRequest from .auth import AuthService from .database import users_collection +from .utils import decode_token import os from typing import Union from fastapi.middleware.cors import CORSMiddleware +import logging +# logging.basicConfig(level=logging.DEBUG) app = FastAPI() auth_service = AuthService() @@ -51,23 +57,22 @@ async def refresh_token(access_token: str, client_token: str): raise HTTPException(status_code=401, detail="Invalid tokens") return result -# Эндпоинт для проверки скинов (Minecraft использует его) -@app.get("/session/hasJoined") -async def has_joined(username: str, serverId: str): - user = await users_collection.find_one({"username": username}) - if not user: - raise HTTPException(status_code=404, detail="User not found") +@app.get("/sessionserver/session/minecraft/profile/{uuid}") +async def get_minecraft_profile(uuid: str, unsigned: bool = False): + return await auth_service.get_minecraft_profile(uuid) - return { - "id": user["uuid"], - "name": username, - "properties": [ - { - "name": "textures", - "value": "base64_encoded_skin_data", # Здесь можно добавить скины - } - ], - } +@app.post("/sessionserver/session/minecraft/join") +async def join_server(request_data: dict = Body(...)): + try: + await auth_service.join_server(request_data) + return Response(status_code=204) + except Exception as e: + print("Error in join_server:", str(e)) + raise + +@app.get("/sessionserver/session/minecraft/hasJoined") +async def has_joined(username: str, serverId: str): + return await auth_service.has_joined(username, serverId) if __name__ == "__main__": import uvicorn