push user data

App/Users/UserRoutes.py

@@ -13,6 +13,7 @@ from .Model import User
 from jose import jwt
 from typing import List
 from datetime import datetime, timedelta
+from App.Subscriptions.Model import Subscription
 from App.Android.Android import AndroidClient
 from App.Android.Schema import RegisterUserRequest as AndroidRegister
 from App.Templates.Templates import MessageTemplate
@@ -60,16 +61,28 @@ async def register_user(request: RegisterUserRequest):
     "/user/login", response_model=AccessTokenResponse, status_code=status.HTTP_200_OK
 )
 async def login_user(request: LoginUserRequest):
+    # Find user by phone number
     db_user = await User.filter(phoneNumber=request.phoneNumber).first()
+
+    # Check if user exists and password is correct
     if db_user and db_user.verify_password(request.password):
+        # Fetch active subscription if it exists
+        subscription = await Subscription.filter(user=db_user, active=True).first()
+
+        # Handle case when no active subscription is found
+        subscription_end = subscription.expiration_time if subscription else None
+
         access_token = create_access_token(
             data={
                 "sub": db_user.phoneNumber,
                 "locked": db_user.account_locked,
                 "userId": db_user.id,
+                "subscription_end": subscription_end,
             }
         )
         return AccessTokenResponse(access_token=access_token, token_type="bearer")
+
+    # Raise an error if credentials are invalid
     raise HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials"
     )