important fix & projscale logger & auth tonconnect

app/api/routes/auth.py

@@ -2,19 +2,25 @@ from datetime import datetime
 
 from aiogram.utils.web_app import safe_parse_webapp_init_data
 from sanic import response
+from sqlalchemy import select, and_
+from tonsdk.utils import Address
 
 from app.core._config import TELEGRAM_API_KEY
+from app.core.logger import make_log
+from app.core.models import KnownKey, WalletConnection
 from app.core.models.user import User
+from pytonconnect.parsers import WalletInfo, Account, TonProof
 
 
 async def s_api_v1_auth_twa(request):
-    if not request.json:
-        return response.json({"error": "No data provided"}, status=400)
+    auth_data = {}
+    for req_key in ['twa_data', 'ton_proof', 'ref_id']:
+        try:
+            auth_data[req_key] = request.json[req_key]
+        except:
+            auth_data[req_key] = None
 
-    if not request.json.get('twa_data'):
-        return response.json({"error": "No TWA data provided"}, status=400)
-
-    twa_data = request.json['twa_data']
+    twa_data = auth_data['twa_data']
     twa_data = safe_parse_webapp_init_data(token=TELEGRAM_API_KEY, init_data=twa_data)
     assert twa_data
 
@@ -39,11 +45,62 @@ async def s_api_v1_auth_twa(request):
         assert known_user, "User not created"
 
     new_user_key = await known_user.create_api_token_v1(request.ctx.db_session, "USER_API_V1")
+    if auth_data['ton_proof']:
+        try:
+            wallet_info = WalletInfo()
+            auth_data['ton_proof']['account']['network'] = auth_data['ton_proof']['account']['chain']
+            wallet_info.account = Account.from_dict(auth_data['ton_proof']['account'])
+            wallet_info.ton_proof = TonProof.from_dict({'proof': auth_data['ton_proof']['ton_proof']})
+            connection_payload = auth_data['ton_proof']['ton_proof']['payload']
+            known_payload = (await request.ctx.db_session.execute(select(KnownKey).where(KnownKey.seed == connection_payload))).scalars().first()
+            assert known_payload, "Unknown payload"
+            assert known_payload.meta['I_user_id'] == known_user.id, "Invalid user_id"
+            assert wallet_info.check_proof(connection_payload), "Invalid proof"
 
-    connected_wallet_data = known_user.wallet_connection(request.ctx.db_session)
+            for known_connection in (await request.ctx.db_session.execute(select(WalletConnection).where(
+                    and_(
+                        WalletConnection.user_id == known_user.id,
+                        WalletConnection.network == 'ton'
+                    )
+            ))).scalars().all():
+                known_connection.invalidated = True
+
+            for other_connection in (await request.ctx.db_session.execute(select(WalletConnection).where(
+                    WalletConnection.wallet_address == Address(wallet_info.account.address).to_string(1, 1, 1)
+            ))).scalars().all():
+                other_connection.invalidated = True
+
+            new_connection = WalletConnection(
+                user_id=known_user.id,
+                network='ton',
+                wallet_key='web2-client==1',
+                connection_id=connection_payload,
+                wallet_address=Address(wallet_info.account.address).to_string(1, 1, 1),
+                keys={
+                    'ton_proof': auth_data['ton_proof']
+                },
+                meta={},
+                created=datetime.now(),
+                updated=datetime.now(),
+                invalidated=False,
+                without_pk=False
+            )
+            request.ctx.db_session.add(new_connection)
+            await request.ctx.db_session.commit()
+        except BaseException as e:
+            make_log("auth", f"Invalid ton_proof: {e}", level="warning")
+            return response.json({"error": "Invalid ton_proof"}, status=400)
+
+    ton_connection = (await request.ctx.db_session.execute(select(WalletConnection).where(
+        and_(
+            WalletConnection.user_id == known_user.id,
+            WalletConnection.network == 'ton',
+            WalletConnection.invalidated == False
+        )
+    ))).scalars().first()
 
     return response.json({
         'user': known_user.json_format(),
-        'connected_wallet': connected_wallet_data.json_format() if connected_wallet_data else None,
+        'connected_wallet': ton_connection.json_format() if ton_connection else None,
         'auth_v1_token': new_user_key['auth_v1_token']
     })