问题优化

zhaoqingang

2024-12-13 f2c43713b16e821f4a1ae97804c60f18734d5f6a

 app/api/auth.py

@@ -12,17 +12,19 @@
from app.models.app_token_model import AppToken
from app.models.base_model import get_db
from app.models.postgresql_base_model import get_pdb
from app.models.token_model import upsert_token, get_token, update_token
from app.models.token_model import upsert_token, update_token
from app.models.user import UserCreate, LoginData
from app.models.user_model import UserModel
from app.models.user_model import UserModel, UserAppModel
from app.service.auth import authenticate_user, create_access_token, is_valid_password, save_register_user, \
    update_user_token, UserAppDao, update_user_info
from app.service.bisheng import BishengService
from app.service.service_token import get_new_token, get_token, update_user_group
from app.service.v2.app_register import AppRegisterDao
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from sqlalchemy.future import select

from app.utils.password_handle import generate_password

router = APIRouter()

@@ -115,18 +117,20 @@
        elif app["id"] == BISHENG:
            service = BishengService(settings.sgb_base_url)
        elif app["id"] == DIFY:
            continue
            service = DifyService(settings.dify_base_url)
        else:
            logger.error("未知注册应用---")
            continue
        try:
            name = login_data.username
            app_password = login_data.password
            user_app = await UserAppDao(db).get_data_by_id(user.id, app["id"])
            if user_app:
                name  = user_app.username
                app_password = user_app.decrypted_password(user_app.password)
            else:
                await update_user_info(db, user.id)
            token = await service.login(name, login_data.password)
            token = await service.login(name, app_password)
            token_dict[app["id"]] = token
        except Exception as e:
            return Response(code=500, msg=f"Failed to login with {app['id']}: {str(e)}")
@@ -134,7 +138,7 @@
    # 创建本地token
    access_token = create_access_token(data={"sub": user.username, "user_id": user.id})

    # await update_token(db, user.id, access_token, token_dict)
    await update_token(db, user.id, access_token, token_dict)
    await update_user_token(db, user.id, token_dict)
    result = await pdb.execute(select(AppToken).where(AppToken.id == user.id))
    db_app_token = result.scalars().first()
@@ -171,35 +175,39 @@
        return Response(code=200, msg="Username already registered")
    app_register = AppRegisterDao(db).get_apps()
    register_dict = {}
    token = ""
    app_password = await generate_password(10)
    for app in app_register:
        if app["id"] == RAGFLOW:
            service = RagflowService(settings.fwr_base_url)
        elif app["id"] == BISHENG:
            service = BishengService(settings.sgb_base_url)
        elif app["id"] == DIFY:
            admin_user = db.query(UserModel).filter(UserModel.permission == "admin").first()
            token = await get_new_token(db, admin_user.id, DIFY)
            if not token:
                logger.error("用户注册获取dftoken失败！")
                return Response(code=500, msg=f"Failed to register with app")
            service = DifyService(settings.dify_base_url)
        else:
            logger.error("未知注册应用---")
            continue
        try:
            name = app["id"] + str(int(time.time()))
            register_info = await service.register(name, user.password)
            register_info = await service.register(name, app_password, token)
            # print(register_info)
            register_dict[app['id']] = {"id":register_info.get("id"), "name": name, "email": register_info.get("email")}
        except Exception as e:
            return Response(code=500, msg=f"Failed to register with {app['id']}: {str(e)}")

    # 存储用户信息
    # hashed_password = pwd_context.hash(user.password)
    # db_user = UserModel(username=user.username, hashed_password=hashed_password, email=user.email)
    # db_user.password = db_user.encrypted_password(user.password)
    # for k, v in register_dict.items():
    #     setattr(db_user, k.replace("app", "id"), v)
    # db.add(db_user)
    # db.commit()
    # db.refresh(db_user)

    is_sava = await save_register_user(db, user.username, user.password, user.email, register_dict)
    if not is_sava:
    user_id = await save_register_user(db, user.username, user.password, user.email, app_password, register_dict)
    if not user_id:
        return Response(code=500, msg=f"Failed to register with app")
    return Response(code=200, msg="User registered successfully",data={"username": user.username})
    return Response(code=200, msg="User registered successfully",data={"userFlag": user_id})


@router.get("/v2/sync", response_model=Response)
async def sync_user_tenant(userFlag: str, db=Depends(get_db)):
    app_register = AppRegisterDao(db).get_app_by_id(RAGFLOW)
    if app_register:
        is_update = await update_user_group(db, userFlag)
    return Response(code=200, msg="success", data={})