youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-06-08 09:27:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,063 Commits 553 Branches 172 Tags
4c15e16f594ad89a79adf77fb2731957e65bf6e3
Commit Graph

237 Commits

Author SHA1 Message Date
fatelei
4c15e16f59 Merge remote-tracking branch 'upstream/main' into feat/rbac 
# Conflicts:
#	.github/workflows/cli-tests.yml
#	api/clients/agent_backend/__init__.py
#	api/clients/agent_backend/request_builder.py
#	api/controllers/console/app/app.py
#	api/controllers/console/app/mcp_server.py
#	api/controllers/console/workspace/members.py
#	api/controllers/openapi/__init__.py
#	api/controllers/openapi/_models.py
#	api/controllers/openapi/account.py
#	api/controllers/openapi/app_run.py
#	api/controllers/openapi/apps.py
#	api/controllers/openapi/apps_permitted_external.py
#	api/controllers/openapi/auth/__init__.py
#	api/controllers/openapi/auth/composition.py
#	api/controllers/openapi/auth/pipeline.py
#	api/controllers/openapi/files.py
#	api/controllers/openapi/human_input_form.py
#	api/controllers/openapi/workflow_events.py
#	api/controllers/openapi/workspaces.py
#	api/core/workflow/node_factory.py
#	api/core/workflow/nodes/agent_v2/agent_node.py
#	api/core/workflow/nodes/agent_v2/runtime_request_builder.py
#	api/libs/oauth_bearer.py
#	api/models/agent_config_entities.py
#	api/openapi/markdown/openapi-swagger.md
#	api/services/account_service.py
#	api/tests/unit_tests/clients/agent_backend/test_request_builder.py
#	api/tests/unit_tests/controllers/console/test_workspace_members.py
#	api/tests/unit_tests/controllers/console/workspace/test_members.py
#	api/tests/unit_tests/controllers/openapi/auth/test_composition.py
#	api/tests/unit_tests/controllers/openapi/auth/test_pipeline.py
#	api/tests/unit_tests/controllers/openapi/conftest.py
#	api/tests/unit_tests/controllers/openapi/test_account.py
#	api/tests/unit_tests/controllers/openapi/test_app_run_streaming.py
#	api/tests/unit_tests/controllers/openapi/test_human_input_form.py
#	api/tests/unit_tests/controllers/openapi/test_workflow_events_openapi.py
#	api/tests/unit_tests/core/workflow/nodes/agent_v2/test_agent_node.py
#	api/tests/unit_tests/core/workflow/nodes/agent_v2/test_runtime_request_builder.py
#	api/tests/unit_tests/libs/test_oauth_bearer_rate_limit_ordering.py
#	api/tests/unit_tests/libs/test_oauth_bearer_require_scope.py
#	api/tests/unit_tests/libs/test_workspace_member_helper.py
#	api/tests/unit_tests/services/test_oauth_device_flow.py
#	cli/AGENTS.md
#	cli/ARD.md
#	cli/package.json
#	cli/src/api/account-sessions.ts
#	cli/src/api/app-meta.test.ts
#	cli/src/api/workspaces.ts
#	cli/src/auth/file-backend.test.ts
#	cli/src/auth/file-backend.ts
#	cli/src/auth/hosts.test.ts
#	cli/src/auth/hosts.ts
#	cli/src/cache/app-info.test.ts
#	cli/src/cache/app-info.ts
#	cli/src/cache/nudge-store.test.ts
#	cli/src/cache/nudge-store.ts
#	cli/src/commands/_shared/authed-command.ts
#	cli/src/commands/auth/devices/_shared/devices.test.ts
#	cli/src/commands/auth/devices/_shared/devices.ts
#	cli/src/commands/auth/devices/list/index.ts
#	cli/src/commands/auth/login/index.ts
#	cli/src/commands/auth/login/login.test.ts
#	cli/src/commands/auth/login/login.ts
#	cli/src/commands/auth/logout/index.ts
#	cli/src/commands/auth/logout/logout.test.ts
#	cli/src/commands/auth/logout/logout.ts
#	cli/src/commands/auth/status/index.ts
#	cli/src/commands/auth/status/status.test.ts
#	cli/src/commands/auth/status/status.ts
#	cli/src/commands/auth/whoami/index.ts
#	cli/src/commands/auth/whoami/whoami.test.ts
#	cli/src/commands/auth/whoami/whoami.ts
#	cli/src/commands/config/get/index.ts
#	cli/src/commands/config/get/run.test.ts
#	cli/src/commands/config/get/run.ts
#	cli/src/commands/config/path/index.ts
#	cli/src/commands/config/set/index.ts
#	cli/src/commands/config/set/run.test.ts
#	cli/src/commands/config/set/run.ts
#	cli/src/commands/config/unset/index.ts
#	cli/src/commands/config/unset/run.test.ts
#	cli/src/commands/config/unset/run.ts
#	cli/src/commands/config/view/index.ts
#	cli/src/commands/config/view/run.test.ts
#	cli/src/commands/config/view/run.ts
#	cli/src/commands/describe/app/run.test.ts
#	cli/src/commands/describe/app/run.ts
#	cli/src/commands/env/list/run-list.ts
#	cli/src/commands/get/app/run.ts
#	cli/src/commands/get/workspace/run.ts
#	cli/src/commands/resume/app/run.ts
#	cli/src/commands/run/app/_strategies/streaming-structured.ts
#	cli/src/commands/run/app/_strategies/streaming-text.ts
#	cli/src/commands/run/app/handlers.ts
#	cli/src/commands/run/app/hitl-render.ts
#	cli/src/commands/run/app/run.test.ts
#	cli/src/commands/run/app/run.ts
#	cli/src/commands/run/app/stream-handlers.ts
#	cli/src/commands/tree.generated.ts
#	cli/src/commands/version/index.ts
#	cli/src/env/registry.ts
#	cli/src/errors/format.ts
#	cli/src/util/browser.ts
#	cli/src/version/info.ts
#	cli/src/version/nudge.test.ts
#	cli/src/version/nudge.ts
#	cli/src/version/probe.test.ts
#	cli/src/version/probe.ts
#	cli/src/version/render.ts
#	cli/src/workspace/resolver.ts
#	cli/tsconfig.json
#	eslint-suppressions.json
#	packages/contracts/generated/api/console/apps/types.gen.ts
#	packages/contracts/generated/api/console/apps/zod.gen.ts
#	packages/contracts/generated/api/openapi/orpc.gen.ts
#	packages/contracts/generated/api/openapi/types.gen.ts
#	packages/contracts/generated/api/openapi/zod.gen.ts
#	packages/dify-ui/README.md
#	pnpm-lock.yaml
#	web/app/components/app/app-publisher/index.tsx
#	web/app/components/app/app-publisher/sections.tsx
#	web/app/components/app/create-app-modal/__tests__/index.spec.tsx
#	web/app/components/app/create-app-modal/index.tsx
#	web/app/components/app/duplicate-modal/__tests__/index.spec.tsx
#	web/app/components/base/chip/index.tsx
#	web/app/components/datasets/list/dataset-card/index.tsx
#	web/app/components/datasets/list/datasets.tsx
#	web/app/components/datasets/settings/form/components/basic-info-section.tsx
#	web/app/components/rag-pipeline/components/rag-pipeline-header/run-mode.tsx
#	web/app/components/tools/edit-custom-collection-modal/index.tsx
#	web/app/components/tools/mcp/__tests__/index.spec.tsx
#	web/app/components/tools/mcp/index.tsx
#	web/app/components/tools/provider-list.tsx
#	web/app/components/tools/workflow-tool/__tests__/configure-button.spec.tsx
 2026-05-28 14:01:01 +08:00
Tianle
0e1f19a380 refactor: inject tenant id in tenant-only console handlers (#36751) 2026-05-28 03:50:28 +00:00
非法操作
63890212dd chore: backend feature api exclude_vector_space (#36642) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-05-27 10:17:02 +08:00
林玮 (Jade Lin)
7db3a521e1 fix: member invite limits with dedup, locking, and accurate new-member counting (#36512) 2026-05-27 10:15:21 +08:00
fatelei
5dbad23c28 fix: fix miss account name 2026-05-26 18:10:22 +08:00
非法操作
f5d664887b chore: backend feature api exclude_vector_space (#36642) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-05-26 08:50:54 +00:00
林玮 (Jade Lin)
3a467d1d63 fix: member invite limits with dedup, locking, and accurate new-member counting (#36512) 2026-05-25 08:58:42 +00:00
twwu
7f06534f07 Merge branch 'main' into feat/rbac 2026-05-24 18:24:32 +08:00
Lillian
6133c2ab6a chore: add UUID/str type annotations to api endpoints for files in api/controllers/console (#36563) 2026-05-24 07:59:56 +00:00
-LAN-
8d99326fb3 feat(plugin): cache plugin model providers by tenant (#36449) 
Co-authored-by: WH-2099 <wh2099@pm.me>
 2026-05-23 09:12:09 +00:00
twwu
7aac3ba564 Merge branch 'main' into feat/rbac 2026-05-22 18:26:35 +08:00
chariri
ea5e487d3c fix(api): stop returning 204 with response body and add CI check (#36489) 2026-05-21 16:20:34 +00:00
twwu
fd71780674 Merge branch 'main' into feat/rbac 2026-05-20 18:51:00 +08:00
QuantumGhost
f04d809426 fix(api): fix invalid token error while changing email (#36412) 2026-05-20 05:51:15 +00:00
twwu
ba0751bc3c Merge branch 'main' into feat/rbac 2026-05-19 15:02:56 +08:00
Stephen Zhou
b04b4449db chore(api): annotate simple contract responses (#36331) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Asuka Minato <i@asukaminato.eu.org>
 2026-05-19 06:13:20 +00:00
twwu
f753e76f64 Merge branch 'main' into feat/rbac 2026-05-19 11:55:21 +08:00
NeatGuyCoding
1cee1a25b6 fix(console): require admin/owner to set default builtin tool credential (#36264) 
Signed-off-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com>
 2026-05-18 10:15:51 +00:00
twwu
658b8d038b Merge branch 'main' into feat/rbac 2026-05-15 21:26:33 +08:00
chariri
a35b28dbef refactor: cleanup duplicate code (#36173) 2026-05-14 10:34:31 +00:00
twwu
06ffdbc396 Merge branch 'main' into feat/rbac 2026-05-13 11:44:30 +08:00
fatelei
19ace80419 chore: update legacy permission keys 2026-05-13 11:14:55 +08:00
Joel
680ef077ae chore: admin also has the permission of changing role (#36069) 
Co-authored-by: Yansong Zhang <916125788@qq.com>
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-05-12 10:15:05 +00:00
fatelei
319e71b408 fix: fix missing role_tag 2026-05-12 17:21:01 +08:00
fatelei
e1b7546b28 fix: fix owner filter condition 2026-05-12 17:11:02 +08:00
fatelei
4d8912810c feat: add include owner param 2026-05-12 16:50:00 +08:00
fatelei
b8ab02bfb7 feat: invite member support rbac 2026-05-12 13:36:16 +08:00
Charles Yao
57da82c7a2 Merge remote-tracking branch 'origin/main' into feat/rbac 2026-05-12 05:31:09 +00:00
fatelei
d90825fd8a fix: fix permission key format and fix role return format 2026-05-11 14:08:17 +08:00
fatelei
3dcea78e10 chore: compatiable without rbac 2026-05-11 13:34:03 +08:00
Asuka Minato
7b5c371b9d chore: api para type (#35985) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-05-10 06:04:42 +00:00
Asuka Minato
c67ce6f66d chore: unify api && clean some type ignore (#35984) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-05-10 04:16:29 +00:00
fatelei
d1ad01339b feat: support role copy 2026-05-09 20:56:18 +08:00
fatelei
212252bb78 chore: compatiable result is none 2026-05-09 17:46:02 +08:00
fatelei
1eb6446f5d chore: remove enterprise_only decorator 2026-05-08 17:54:05 +08:00
fatelei
435c8ec96c refactor: refactor rbac api 2026-05-08 14:00:59 +08:00
Xiyuan Chen
29f34848cd fix(tools): scope builtin tool default-credential clear to tenant (#35887) 2026-05-08 05:08:23 +00:00
fatelei
c386908370 refactor: refactor rbac service api 2026-05-07 23:36:34 +08:00
NeatGuyCoding
7ba408eebe fix: IDOR on console GET /account/avatar (#35771) 
Signed-off-by: NeatGuyCoding <15627489+NeatGuyCoding@users.noreply.github.com>
 2026-05-03 14:42:56 +00:00
fatelei
b32ec8741e feat: rbac backend api 2026-04-24 16:09:56 +08:00
Asuka Minato
7cc3db663a chore: update 3 api (#35481) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-24 16:09:56 +08:00
Asuka Minato
8b1533438f chore: update 3 api (#35481) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-22 08:53:53 +00:00
zyssyz123
e561788809 fix(auth): enforce phase-bound change-email token flow (GHSA-4q3w-q5mc-45rq) (#35425) 2026-04-20 10:10:03 +00:00
dev-miro26
97bb338e7d fix: prevent double /v1 in MCP server URL causing 404 authorization failure (#34596) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-20 02:42:59 +00:00
Yunlu Wen
3193e8a712 chore: reorg imports (#35308) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
 2026-04-16 08:50:02 +00:00
非法操作
53a22aa41b feat: collaboration (#30781) 
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: yyh <yuanyouhuilyz@gmail.com>
Co-authored-by: yyh <92089059+lyzno1@users.noreply.github.com>
 2026-04-16 02:21:04 +00:00
NVIDIAN
ef396ac84e refactor(api): migrate workspace current response from marshal_with to BaseModel (#35207) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 19:48:09 +00:00
wdeveloper16
7e7b27fdec refactor: replace bare dict with dict[str, Any] in response converter… (#35212) 
Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-04-14 19:45:04 +00:00
NVIDIAN
a2ea7ca039 refactor(api): migrate workspace account marshal_with responses to BaseModel (#35190) 
Co-authored-by: ai-hpc <ai-hpc@users.noreply.github.com>
 2026-04-14 17:57:34 +00:00
aether
711fe6ba2c refactor: convert plugin permission if/elif to match/case (#30001) (#35140) 2026-04-14 07:03:53 +00:00