outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: oauth AccountNotFound

Browse Source
This commit is contained in:
Joe 2024-09-02 15:24:13 +08:00
parent c84f004035
commit 2c7cb5498d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/controllers/console/auth/oauth.py
View File

@ -43,7 +43,8 @@ def get_oauth_providers():
class OAuthLogin(Resource): class OAuthLogin(Resource):
def get(self, provider: str, invite_toke: Optional[str] = None): def get(self, provider: str):
invite_token = request.args.get('invite_token') or None
OAUTH_PROVIDERS = get_oauth_providers() OAUTH_PROVIDERS = get_oauth_providers()
with current_app.app_context(): with current_app.app_context():
oauth_provider = OAUTH_PROVIDERS.get(provider) oauth_provider = OAUTH_PROVIDERS.get(provider)
@ -51,7 +52,7 @@ class OAuthLogin(Resource):
if not oauth_provider: if not oauth_provider:
return {"error": "Invalid provider"}, 400 return {"error": "Invalid provider"}, 400
auth_url = oauth_provider.get_authorization_url(invite_toke) auth_url = oauth_provider.get_authorization_url(invite_token)
return redirect(auth_url) return redirect(auth_url)
@ -114,7 +115,7 @@ def _generate_account(provider: str, user_info: OAuthUserInfo):
# Get account by openid or email. # Get account by openid or email.
account = _get_account_by_openid_or_email(provider, user_info) account = _get_account_by_openid_or_email(provider, user_info)
if not account and dify_config.ALLOW_REGISTER: if not account:
account_name = user_info.name if user_info.name else "Dify" account_name = user_info.name if user_info.name else "Dify"
account = RegisterService.register( account = RegisterService.register(
email=user_info.email, name=account_name, password=None, open_id=user_info.id, provider=provider email=user_info.email, name=account_name, password=None, open_id=user_info.id, provider=provider
@ -128,8 +129,6 @@ def _generate_account(provider: str, user_info: OAuthUserInfo):
interface_language = languages[0] interface_language = languages[0]
account.interface_language = interface_language account.interface_language = interface_language
db.session.commit() db.session.commit()
else:
raise AccountNotFound()
# Link account # Link account
AccountService.link_account_integrate(provider, user_info.id, account) AccountService.link_account_integrate(provider, user_info.id, account)