subscription

App/Subscriptions/SubscriptionRoutes.py

@@ -92,20 +92,21 @@ async def get_user_subscriptions(user_id: str):
 
     for subscription in subscriptions:
         remaining_hours = await subscription.time_remaining()
-        result.append(
-            SubscriptionResponse(
-                id=str(subscription.id),
-                user_id=subscription.user_id,
-                plan_id=subscription.plan_id,
-                active=subscription.active,
-                duration=subscription.duration,
-                download_mb=subscription.download_mb,
-                upload_mb=subscription.upload_mb,
-                remaining_hours=remaining_hours,
-                created_time=subscription.created_time,
-                expiration_time=subscription.expiration_time,
+        if subscription.active:
+            result.append(
+                SubscriptionResponse(
+                    id=str(subscription.id),
+                    user_id=subscription.user_id,
+                    plan_id=subscription.plan_id,
+                    active=subscription.active,
+                    duration=subscription.duration,
+                    download_mb=subscription.download_mb,
+                    upload_mb=subscription.upload_mb,
+                    remaining_hours=remaining_hours,
+                    created_time=subscription.created_time,
+                    expiration_time=subscription.expiration_time,
+                )
             )
-        )
 
     return result
 

App/Users/UserRoutes.py

@@ -62,7 +62,13 @@ async def register_user(request: RegisterUserRequest):
 async def login_user(request: LoginUserRequest):
     db_user = await User.filter(phoneNumber=request.phoneNumber).first()
     if db_user and db_user.verify_password(request.password):
-        access_token = create_access_token(data={"sub": db_user.phoneNumber})
+        access_token = create_access_token(
+            data={
+                "sub": db_user.phoneNumber,
+                "locked": db_user.account_locked,
+                "userId": db_user.id,
+            }
+        )
         return AccessTokenResponse(access_token=access_token, token_type="bearer")
     raise HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials"