Update app.py

app.py

@@ -630,9 +630,29 @@ async def callback(request: Request, code: str = None):
                         acc_list_res = ProtoOAGetAccountListByAccessTokenRes()
                         acc_list_res.ParseFromString(proto_msg.payload)
                         if acc_list_res.ctidTraderAccount:
-                            account_id = str(acc_list_res.ctidTraderAccount[0].ctidTraderAccountId)
-                            detected_env = try_env
-                            logger.info(f"Found account ID: {account_id} on {try_env} server")
+                            logger.info(f"Accounts returned from token ({len(acc_list_res.ctidTraderAccount)} accounts):")
+                            for a in acc_list_res.ctidTraderAccount:
+                                is_live = getattr(a, "isLive", False)
+                                logger.info(f"  - Account ID: {a.ctidTraderAccountId}, isLive: {is_live}, broker: {getattr(a, 'brokerName', 'N/A')}")
+                            
+                            # Filter based on CTRADER_ENV
+                            matched_acc = None
+                            for a in acc_list_res.ctidTraderAccount:
+                                is_live = getattr(a, "isLive", False)
+                                env_type = "live" if is_live else "demo"
+                                if env_type == CTRADER_ENV:
+                                    matched_acc = a
+                                    break
+                            
+                            if matched_acc:
+                                selected_acc = matched_acc
+                                logger.info(f"Successfully matched account matching CTRADER_ENV={CTRADER_ENV}: {selected_acc.ctidTraderAccountId}")
+                            else:
+                                selected_acc = acc_list_res.ctidTraderAccount[0]
+                                logger.info(f"No account matching CTRADER_ENV={CTRADER_ENV} found. Using first available: {selected_acc.ctidTraderAccountId}")
+                                
+                            account_id = str(selected_acc.ctidTraderAccountId)
+                            detected_env = "live" if getattr(selected_acc, "isLive", False) else "demo"
                     
                     ssl_sock.close()
                     if account_id: