+109









Yeuoly
takatost
kurokobo
Novice Lee
zxhlyh
AkaraChen
Yi
Joel
JzoNg
twwu
Hiroshi Fujita
AkaraChen
NFish
Wu Tianwei
非法操作
Novice
Hiroki Nagai
Gen Sato
eux
huangzhuo1949
huangzhuo
lotsik
crazywoola
nite-knite
Jyong
github-actions[bot]
gakkiyomi
CN-P5
CN-P5
Chuehnone
yihong
Kevin9703
-LAN-
Boris Feld
mbo
mabo
Warren Chen
JzoNgKVO
jiandanfeng
zhu-an
zhaoqingyu.1075
海狸大師
Xu Song
rayshaw001
Ding Jiatong
Bowen Liang
JasonVV
le0zh
zhuxinliang
k-zaku
luckylhb90
hobo.l
jiangbo721
刘江波
Shun Miyazawa
EricPan
crazywoola
sino
Jhvcc
lowell
Boris Polonsky
Ademílson Tonato
Ademílson Tonato
IWAI, Masaharu
Yueh-Po Peng
Jason
Xin Zhang
yjc980121
heyszt
Abdullah AlOsaimi
Abdullah AlOsaimi
Yingchun Lai
Hash Brown
zuodongxu
Masashi Tomooka
aplio
Obada Khalili
Nam Vu
Kei YAMAZAKI
TechnoHouse
Riddhimaan-Senapati
MaFee921
te-chan
HQidea
Joshbly
xhe
weiwenyan-dev
ex_wenyan.wei
engchina
engchina
dependabot[bot]
呆萌闷油瓶
Kemal
Lazy_Frog
Yi Xiao
Steven sun
steven
Kalo Chin
Katy Tao
depy
胡春东
Junjie.M
MuYu
Naoki Takashima
Summer-Gu
Fei He
ybalbert001
Yuanbo Li
douxc
liuzhenghua
Wu Jiayang
Your Name
kimjion
AugNSo
llinvokerl
liusurong.lsr
Vasu Negi
Hundredwz
Xiyuan Chen
403e2d58b9
Signed-off-by: yihong0618 <[email protected]> Signed-off-by: -LAN- <[email protected]> Signed-off-by: xhe <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: takatost <[email protected]> Co-authored-by: kurokobo <[email protected]> Co-authored-by: Novice Lee <[email protected]> Co-authored-by: zxhlyh <[email protected]> Co-authored-by: AkaraChen <[email protected]> Co-authored-by: Yi <[email protected]> Co-authored-by: Joel <[email protected]> Co-authored-by: JzoNg <[email protected]> Co-authored-by: twwu <[email protected]> Co-authored-by: Hiroshi Fujita <[email protected]> Co-authored-by: AkaraChen <[email protected]> Co-authored-by: NFish <[email protected]> Co-authored-by: Wu Tianwei <[email protected]> Co-authored-by: 非法操作 <[email protected]> Co-authored-by: Novice <[email protected]> Co-authored-by: Hiroki Nagai <[email protected]> Co-authored-by: Gen Sato <[email protected]> Co-authored-by: eux <[email protected]> Co-authored-by: huangzhuo1949 <[email protected]> Co-authored-by: huangzhuo <[email protected]> Co-authored-by: lotsik <[email protected]> Co-authored-by: crazywoola <[email protected]> Co-authored-by: nite-knite <[email protected]> Co-authored-by: Jyong <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: gakkiyomi <[email protected]> Co-authored-by: CN-P5 <[email protected]> Co-authored-by: CN-P5 <[email protected]> Co-authored-by: Chuehnone <[email protected]> Co-authored-by: yihong <[email protected]> Co-authored-by: Kevin9703 <[email protected]> Co-authored-by: -LAN- <[email protected]> Co-authored-by: Boris Feld <[email protected]> Co-authored-by: mbo <[email protected]> Co-authored-by: mabo <[email protected]> Co-authored-by: Warren Chen <[email protected]> Co-authored-by: JzoNgKVO <[email protected]> Co-authored-by: jiandanfeng <[email protected]> Co-authored-by: zhu-an <[email protected]> Co-authored-by: zhaoqingyu.1075 <[email protected]> Co-authored-by: 海狸大師 <[email protected]> Co-authored-by: Xu Song <[email protected]> Co-authored-by: rayshaw001 <[email protected]> Co-authored-by: Ding Jiatong <[email protected]> Co-authored-by: Bowen Liang <[email protected]> Co-authored-by: JasonVV <[email protected]> Co-authored-by: le0zh <[email protected]> Co-authored-by: zhuxinliang <[email protected]> Co-authored-by: k-zaku <[email protected]> Co-authored-by: luckylhb90 <[email protected]> Co-authored-by: hobo.l <[email protected]> Co-authored-by: jiangbo721 <[email protected]> Co-authored-by: 刘江波 <[email protected]> Co-authored-by: Shun Miyazawa <[email protected]> Co-authored-by: EricPan <[email protected]> Co-authored-by: crazywoola <[email protected]> Co-authored-by: sino <[email protected]> Co-authored-by: Jhvcc <[email protected]> Co-authored-by: lowell <[email protected]> Co-authored-by: Boris Polonsky <[email protected]> Co-authored-by: Ademílson Tonato <[email protected]> Co-authored-by: Ademílson Tonato <[email protected]> Co-authored-by: IWAI, Masaharu <[email protected]> Co-authored-by: Yueh-Po Peng (Yabi) <[email protected]> Co-authored-by: Jason <[email protected]> Co-authored-by: Xin Zhang <[email protected]> Co-authored-by: yjc980121 <[email protected]> Co-authored-by: heyszt <[email protected]> Co-authored-by: Abdullah AlOsaimi <[email protected]> Co-authored-by: Abdullah AlOsaimi <[email protected]> Co-authored-by: Yingchun Lai <[email protected]> Co-authored-by: Hash Brown <[email protected]> Co-authored-by: zuodongxu <[email protected]> Co-authored-by: Masashi Tomooka <[email protected]> Co-authored-by: aplio <[email protected]> Co-authored-by: Obada Khalili <[email protected]> Co-authored-by: Nam Vu <[email protected]> Co-authored-by: Kei YAMAZAKI <[email protected]> Co-authored-by: TechnoHouse <[email protected]> Co-authored-by: Riddhimaan-Senapati <[email protected]> Co-authored-by: MaFee921 <[email protected]> Co-authored-by: te-chan <[email protected]> Co-authored-by: HQidea <[email protected]> Co-authored-by: Joshbly <[email protected]> Co-authored-by: xhe <[email protected]> Co-authored-by: weiwenyan-dev <[email protected]> Co-authored-by: ex_wenyan.wei <[email protected]> Co-authored-by: engchina <[email protected]> Co-authored-by: engchina <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: 呆萌闷油瓶 <[email protected]> Co-authored-by: Kemal <[email protected]> Co-authored-by: Lazy_Frog <[email protected]> Co-authored-by: Yi Xiao <[email protected]> Co-authored-by: Steven sun <[email protected]> Co-authored-by: steven <[email protected]> Co-authored-by: Kalo Chin <[email protected]> Co-authored-by: Katy Tao <[email protected]> Co-authored-by: depy <[email protected]> Co-authored-by: 胡春东 <[email protected]> Co-authored-by: Junjie.M <[email protected]> Co-authored-by: MuYu <[email protected]> Co-authored-by: Naoki Takashima <[email protected]> Co-authored-by: Summer-Gu <[email protected]> Co-authored-by: Fei He <[email protected]> Co-authored-by: ybalbert001 <[email protected]> Co-authored-by: Yuanbo Li <[email protected]> Co-authored-by: douxc <[email protected]> Co-authored-by: liuzhenghua <[email protected]> Co-authored-by: Wu Jiayang <[email protected]> Co-authored-by: Your Name <[email protected]> Co-authored-by: kimjion <[email protected]> Co-authored-by: AugNSo <[email protected]> Co-authored-by: llinvokerl <[email protected]> Co-authored-by: liusurong.lsr <[email protected]> Co-authored-by: Vasu Negi <[email protected]> Co-authored-by: Hundredwz <[email protected]> Co-authored-by: Xiyuan Chen <[email protected]>
186 lines
7.5 KiB
Python
186 lines
7.5 KiB
Python
import logging
|
|
from datetime import UTC, datetime
|
|
from typing import Optional
|
|
|
|
import requests
|
|
from flask import current_app, redirect, request
|
|
from flask_restful import Resource # type: ignore
|
|
from sqlalchemy import select
|
|
from sqlalchemy.orm import Session
|
|
from werkzeug.exceptions import Unauthorized
|
|
|
|
from configs import dify_config
|
|
from constants.languages import languages
|
|
from events.tenant_event import tenant_was_created
|
|
from extensions.ext_database import db
|
|
from libs.helper import extract_remote_ip
|
|
from libs.oauth import GitHubOAuth, GoogleOAuth, OAuthUserInfo
|
|
from models import Account
|
|
from models.account import AccountStatus
|
|
from services.account_service import AccountService, RegisterService, TenantService
|
|
from services.errors.account import AccountNotFoundError, AccountRegisterError
|
|
from services.errors.workspace import WorkSpaceNotAllowedCreateError, WorkSpaceNotFoundError
|
|
from services.feature_service import FeatureService
|
|
|
|
from .. import api
|
|
|
|
|
|
def get_oauth_providers():
|
|
with current_app.app_context():
|
|
if not dify_config.GITHUB_CLIENT_ID or not dify_config.GITHUB_CLIENT_SECRET:
|
|
github_oauth = None
|
|
else:
|
|
github_oauth = GitHubOAuth(
|
|
client_id=dify_config.GITHUB_CLIENT_ID,
|
|
client_secret=dify_config.GITHUB_CLIENT_SECRET,
|
|
redirect_uri=dify_config.CONSOLE_API_URL + "/console/api/oauth/authorize/github",
|
|
)
|
|
if not dify_config.GOOGLE_CLIENT_ID or not dify_config.GOOGLE_CLIENT_SECRET:
|
|
google_oauth = None
|
|
else:
|
|
google_oauth = GoogleOAuth(
|
|
client_id=dify_config.GOOGLE_CLIENT_ID,
|
|
client_secret=dify_config.GOOGLE_CLIENT_SECRET,
|
|
redirect_uri=dify_config.CONSOLE_API_URL + "/console/api/oauth/authorize/google",
|
|
)
|
|
|
|
OAUTH_PROVIDERS = {"github": github_oauth, "google": google_oauth}
|
|
return OAUTH_PROVIDERS
|
|
|
|
|
|
class OAuthLogin(Resource):
|
|
def get(self, provider: str):
|
|
invite_token = request.args.get("invite_token") or None
|
|
OAUTH_PROVIDERS = get_oauth_providers()
|
|
with current_app.app_context():
|
|
oauth_provider = OAUTH_PROVIDERS.get(provider)
|
|
if not oauth_provider:
|
|
return {"error": "Invalid provider"}, 400
|
|
|
|
auth_url = oauth_provider.get_authorization_url(invite_token=invite_token)
|
|
return redirect(auth_url)
|
|
|
|
|
|
class OAuthCallback(Resource):
|
|
def get(self, provider: str):
|
|
OAUTH_PROVIDERS = get_oauth_providers()
|
|
with current_app.app_context():
|
|
oauth_provider = OAUTH_PROVIDERS.get(provider)
|
|
if not oauth_provider:
|
|
return {"error": "Invalid provider"}, 400
|
|
|
|
code = request.args.get("code")
|
|
state = request.args.get("state")
|
|
invite_token = None
|
|
if state:
|
|
invite_token = state
|
|
|
|
try:
|
|
token = oauth_provider.get_access_token(code)
|
|
user_info = oauth_provider.get_user_info(token)
|
|
except requests.exceptions.RequestException as e:
|
|
error_text = e.response.text if e.response else str(e)
|
|
logging.exception(f"An error occurred during the OAuth process with {provider}: {error_text}")
|
|
return {"error": "OAuth process failed"}, 400
|
|
|
|
if invite_token and RegisterService.is_valid_invite_token(invite_token):
|
|
invitation = RegisterService._get_invitation_by_token(token=invite_token)
|
|
if invitation:
|
|
invitation_email = invitation.get("email", None)
|
|
if invitation_email != user_info.email:
|
|
return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin?message=Invalid invitation token.")
|
|
|
|
return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin/invite-settings?invite_token={invite_token}")
|
|
|
|
try:
|
|
account = _generate_account(provider, user_info)
|
|
except AccountNotFoundError:
|
|
return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin?message=Account not found.")
|
|
except (WorkSpaceNotFoundError, WorkSpaceNotAllowedCreateError):
|
|
return redirect(
|
|
f"{dify_config.CONSOLE_WEB_URL}/signin"
|
|
"?message=Workspace not found, please contact system admin to invite you to join in a workspace."
|
|
)
|
|
except AccountRegisterError as e:
|
|
return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin?message={e.description}")
|
|
|
|
# Check account status
|
|
if account.status == AccountStatus.BANNED.value:
|
|
return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin?message=Account is banned.")
|
|
|
|
if account.status == AccountStatus.PENDING.value:
|
|
account.status = AccountStatus.ACTIVE.value
|
|
account.initialized_at = datetime.now(UTC).replace(tzinfo=None)
|
|
db.session.commit()
|
|
|
|
try:
|
|
TenantService.create_owner_tenant_if_not_exist(account)
|
|
except Unauthorized:
|
|
return redirect(f"{dify_config.CONSOLE_WEB_URL}/signin?message=Workspace not found.")
|
|
except WorkSpaceNotAllowedCreateError:
|
|
return redirect(
|
|
f"{dify_config.CONSOLE_WEB_URL}/signin"
|
|
"?message=Workspace not found, please contact system admin to invite you to join in a workspace."
|
|
)
|
|
|
|
token_pair = AccountService.login(
|
|
account=account,
|
|
ip_address=extract_remote_ip(request),
|
|
)
|
|
|
|
return redirect(
|
|
f"{dify_config.CONSOLE_WEB_URL}?access_token={token_pair.access_token}&refresh_token={token_pair.refresh_token}"
|
|
)
|
|
|
|
|
|
def _get_account_by_openid_or_email(provider: str, user_info: OAuthUserInfo) -> Optional[Account]:
|
|
account: Optional[Account] = Account.get_by_openid(provider, user_info.id)
|
|
|
|
if not account:
|
|
with Session(db.engine) as session:
|
|
account = session.execute(select(Account).filter_by(email=user_info.email)).scalar_one_or_none()
|
|
|
|
return account
|
|
|
|
|
|
def _generate_account(provider: str, user_info: OAuthUserInfo):
|
|
# Get account by openid or email.
|
|
account = _get_account_by_openid_or_email(provider, user_info)
|
|
|
|
if account:
|
|
tenant = TenantService.get_join_tenants(account)
|
|
if not tenant:
|
|
if not FeatureService.get_system_features().is_allow_create_workspace:
|
|
raise WorkSpaceNotAllowedCreateError()
|
|
else:
|
|
tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
|
|
TenantService.create_tenant_member(tenant, account, role="owner")
|
|
account.current_tenant = tenant
|
|
tenant_was_created.send(tenant)
|
|
|
|
if not account:
|
|
if not FeatureService.get_system_features().is_allow_register:
|
|
raise AccountNotFoundError()
|
|
account_name = user_info.name or "Dify"
|
|
account = RegisterService.register(
|
|
email=user_info.email, name=account_name, password=None, open_id=user_info.id, provider=provider
|
|
)
|
|
|
|
# Set interface language
|
|
preferred_lang = request.accept_languages.best_match(languages)
|
|
if preferred_lang and preferred_lang in languages:
|
|
interface_language = preferred_lang
|
|
else:
|
|
interface_language = languages[0]
|
|
account.interface_language = interface_language
|
|
db.session.commit()
|
|
|
|
# Link account
|
|
AccountService.link_account_integrate(provider, user_info.id, account)
|
|
|
|
return account
|
|
|
|
|
|
api.add_resource(OAuthLogin, "/oauth/login/<provider>")
|
|
api.add_resource(OAuthCallback, "/oauth/authorize/<provider>")
|