|
|
|
|
@ -1,18 +1,18 @@
|
|
|
|
|
import uuid
|
|
|
|
|
from datetime import UTC, datetime, timedelta
|
|
|
|
|
|
|
|
|
|
from flask import request
|
|
|
|
|
from flask_restful import Resource
|
|
|
|
|
from werkzeug.exceptions import NotFound, Unauthorized
|
|
|
|
|
|
|
|
|
|
from configs import dify_config
|
|
|
|
|
from controllers.web import api
|
|
|
|
|
from controllers.web.error import WebAppAuthRequiredError
|
|
|
|
|
from extensions.ext_database import db
|
|
|
|
|
from flask import request
|
|
|
|
|
from flask_restful import Resource
|
|
|
|
|
from libs.passport import PassportService
|
|
|
|
|
from models.model import App, EndUser, Site
|
|
|
|
|
from services.enterprise.enterprise_service import EnterpriseService
|
|
|
|
|
from services.feature_service import FeatureService
|
|
|
|
|
from werkzeug.exceptions import NotFound, Unauthorized
|
|
|
|
|
|
|
|
|
|
from services.webapp_auth_service import WebAppAuthService, WebAppAuthType
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -187,9 +187,9 @@ def _exchange_for_public_app_token(app_model, site, token_decoded):
|
|
|
|
|
user_id = token_decoded.get("user_id")
|
|
|
|
|
end_user = None
|
|
|
|
|
if user_id:
|
|
|
|
|
end_user = db.session.query(EndUser).filter(
|
|
|
|
|
EndUser.app_id == app_model.id, EndUser.session_id == user_id
|
|
|
|
|
).first()
|
|
|
|
|
end_user = (
|
|
|
|
|
db.session.query(EndUser).filter(EndUser.app_id == app_model.id, EndUser.session_id == user_id).first()
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if not end_user:
|
|
|
|
|
end_user = EndUser(
|
|
|
|
|
|