bugfix getallapps

backend/app/api/api_v1/routers/auth.py

@@ -1,6 +1,7 @@
 
-from fastapi import Form
-from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestForm
+from fastapi import Request
+from fastapi.responses import JSONResponse
+from fastapi.security import OAuth2PasswordRequestForm
 from fastapi import APIRouter, Depends, HTTPException, status
 from datetime import timedelta
 
@@ -13,7 +14,7 @@ auth_router = r = APIRouter()
 
 
 @r.post("/token")
-async def login(db:Session= Depends(get_db) ,form_data: OAuth2PasswordRequestForm = Depends()):
+async def login(request: Request,db:Session= Depends(get_db) ,form_data: OAuth2PasswordRequestForm = Depends()):
     if not db :
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
@@ -45,9 +46,10 @@ async def login(db:Session= Depends(get_db) ,form_data: OAuth2PasswordRequestFor
         data={"sub": user.id,"roles":roles,"permissions": permissions,"tenant":user.tenantid,},
         expires_delta=access_token_expires,
     )
-
-    return {"access_token": access_token, "token_type": "bearer","user_name":user.first_name + " " + user.last_name}
-
+    return JSONResponse(
+        status_code=200,
+        content={"access_token": access_token, "token_type": "bearer","user_name":user.first_name + " " + user.last_name}
+    )
 
 @r.post("/signup")
 async def signup(

backend/app/api/api_v1/routers/kintone.py

@@ -16,18 +16,18 @@ from app.db.cruddb import domainService
 
 kinton_router = r = APIRouter()
 
-def getkintoneenv(user = Depends(get_current_user)):
-    db = get_db(user.tenantid) #SessionLocal()
+def getkintoneenv(user = Depends(get_current_user),db = Depends(get_db)):
+    #db = SessionLocal()
     domain = domainService.get_default_domain(db,user.id) #get_activedomain(db, user.id)
-    db.close()
+    #db.close()
     kintoneevn = config.KINTONE_ENV(domain)
     return kintoneevn
     
 
-def getkintoneformat(user = Depends(get_current_user)):
-    db = get_db(user.tenantid)#SessionLocal()
+def getkintoneformat(user = Depends(get_current_user),db = Depends(get_db)):
+    #db = SessionLocal()
     formats = get_kintoneformat(db)
-    db.close()
+    #db.close()
     return formats