Commit Graph
842 Commits
Author SHA1 Message Date
林玮 (Jade Lin) db05dd57dd chore: merge WebApp Account settings into deploy/saas 2026-11-10 16:32:12 +08:00
林玮 (Jade Lin) 8854babdf1 feat(api): add WebApp Account settings endpoints (#45972) 2026-11-10 16:21:02 +08:00
Joel 181f909969 Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/repositories/app_definition_query_repository.py
#	api/services/app_definition_query_service.py
#	api/services/entities/tool_connection_entities.py
#	api/tests/unit_tests/services/test_workflow_tool_end_user_restriction.py
2026-11-10 10:51:29 +08:00
林玮 (Jade Lin) ba144bb1a2 Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/repositories/app_definition_query_repository.py
2026-11-10 10:39:45 +08:00
Joel de6ba97fa0 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe
# Conflicts:
#	api/services/app_definition_query_service.py
#	api/tests/unit_tests/services/test_workflow_tool_end_user_restriction.py
2026-11-10 10:38:38 +08:00
Joel 031cb178d2 Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	api/repositories/app_definition_query_repository.py
2026-11-10 10:19:20 +08:00
林玮 (Jade Lin) b155868cd6 chore: merge Installed App list filters and sorting into deploy/saas 2026-11-10 10:06:28 +08:00
林玮 (Jade Lin) 4d0aacfac0 feat(api): support installed app list sorting (#45926) 2026-11-10 09:57:52 +08:00
XiaoBa 23ea5e3562 fix: validate retrieval attachment UUIDs and tolerate invalid image history (#45915) 2026-11-09 11:36:53 +00:00
林玮 (Jade Lin) 226bf603d9 feat(api): add installed app list type filtering (#45919) 2026-11-09 18:20:31 +08:00
yetugeandyetuge 071905e7b8 test(api): bring workspace model provider tests under strict pyrefly (#45878)
Co-authored-by: yetuge <yetuge@users.noreply.github.com>
2026-11-09 09:11:20 +00:00
Joel ca0b5da58e Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	packages/dev-proxy/README.md
#	packages/dev-proxy/src/server.spec.ts
#	packages/dev-proxy/src/server.ts
#	packages/dev-proxy/src/session-import.spec.ts
#	packages/dev-proxy/src/types.ts
#	web/.env.example
#	web/dev-proxy.config.ts
2026-11-09 15:38:38 +08:00
林玮 (Jade Lin) 0970b352d2 chore: merge workflow admission and trigger updates into deploy/saas 2026-11-09 14:35:27 +08:00
Joel 867f08b183 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe
# Conflicts:
#	api/openapi/markdown/web-openapi.md
#	api/tests/unit_tests/controllers/web/test_migration.py
#	packages/contracts/generated/api/web/orpc.gen.ts
2026-11-09 12:50:55 +08:00
Joel 111eada536 Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/tests/unit_tests/services/test_workflow_tool_end_user_restriction.py
#	web/app/components/share/connections/connection-readme.tsx
2026-11-09 12:44:53 +08:00
林玮 (Jade Lin) 89f4c0a9fa Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/controllers/console/app/workflow.py
#	api/tests/unit_tests/tasks/test_remove_app_and_related_data_task.py
2026-11-09 12:36:20 +08:00
林玮 (Jade Lin) 469d24c7bc chore: merge console connection ID fix into deploy/saas 2026-11-09 11:23:18 +08:00
林玮 (Jade Lin) a4bcf028eb fix(api): return console connection IDs after creation (#45869) 2026-11-09 11:18:29 +08:00
Joel b854116334 Merge remote-tracking branch 'origin/linw/snp-911-end-user-auth' into feat/end-user-auth-fe 2026-11-09 11:14:28 +08:00
林玮 (Jade Lin) 4cc9814b1e chore: merge WebApp discovery and connection updates into deploy/saas 2026-11-09 10:59:52 +08:00
非法操作 dd21c981f2 refactor(api): inject trigger subscription renewal and event execution (#44653) 2026-11-09 02:42:52 +00:00
林玮 (Jade Lin) 75dd516277 fix(api): expose WebApp URL before authentication (#45721) 2026-11-09 10:25:28 +08:00
Joel ce28fce394 Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	api/controllers/console/app/workflow.py
#	api/tests/unit_tests/tasks/test_remove_app_and_related_data_task.py
#	oxlint-suppressions.json
#	web/app/(auth)/reset-password/set-password/__tests__/page.spec.tsx
#	web/app/(auth)/signin/__tests__/normal-form.spec.tsx
#	web/app/components/share/text-generation/text-generation-menu.tsx
#	web/features/app-access-error/view.stories.tsx
#	web/features/app-access-error/view.tsx
2026-11-09 10:20:03 +08:00
yetugeandyetuge b021e559c9 test(api): annotate console app message tests for strict pyrefly (#45727)
Co-authored-by: yetuge <yetuge@users.noreply.github.com>
2026-11-06 10:59:31 +00:00
非法操作 a83ce881a1 refactor(api): inject plugin dynamic option queries (#44576) 2026-11-06 08:08:45 +00:00
非法操作 138ad48d30 refactor(api): inject plugin trigger endpoint dispatch (#44547) 2026-11-06 07:05:04 +00:00
周龙杰 da24f6d133 test(api): verify workflow publish transactions with SQLite (#45142) 2026-11-06 04:02:44 +00:00
林玮 (Jade Lin) 3cf6bf46fd Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/extensions/ext_application_services.py
#	api/openapi/markdown/web-openapi.md
#	packages/contracts/generated/api/console/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
2026-11-06 11:11:21 +08:00
yyh 50f89187e4 Merge remote-tracking branch 'origin/feat/end-user-auth-fe' into merge/deploy-saas-end-user-auth 2026-11-05 21:47:08 +08:00
yyh 09960da9e5 Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe 2026-11-05 21:26:31 +08:00
非法操作 803f5d3d9c refactor(api): isolate trigger subscription management (#44541) 2026-11-05 09:54:35 +00:00
林玮 (Jade Lin) 26ef62dbce chore: merge personal portal login into deploy/saas 2026-11-05 16:21:56 +08:00
非法操作 45279b704d feat: restrict SaaS workflow collaboration to paid plans (#45549) 2026-11-05 08:19:37 +00:00
非法操作 107bbf85ca refactor(api): inject trigger subscription builder lifecycle (#44532) 2026-11-05 08:18:01 +00:00
林玮 (Jade Lin) 209e621c23 feat(api): support end-user personal portal login (#45637) 2026-11-05 16:14:02 +08:00
林玮 (Jade Lin) 793b0522ba chore: merge installed app auth updates into deploy/saas 2026-11-05 15:37:39 +08:00
非法操作 db3ffcc92b refactor(api): isolate trigger provider and subscription queries (#44514) 2026-11-05 07:20:07 +00:00
非法操作 11517691d2 refactor(api): isolate trigger OAuth authorization flow (#44505) 2026-11-05 06:21:44 +00:00
林玮 (Jade Lin) febb5f949f Merge remote-tracking branch 'origin/main' into linw/snp-911-end-user-auth
# Conflicts:
#	api/.importlinter
#	api/controllers/console/__init__.py
#	api/controllers/console/workspace/account.py
#	api/core/app/apps/message_based_app_generator.py
#	api/core/app/entities/app_invoke_entities.py
#	api/core/tools/tool_manager.py
#	api/extensions/application_services/installed_app.py
#	api/extensions/ext_application_services.py
#	api/models/__init__.py
#	api/models/workflow.py
#	api/openapi/markdown/console-openapi.md
#	api/openapi/markdown/web-openapi.md
#	api/repositories/account/repository.py
#	api/repositories/api_workflow_run_repository.py
#	api/repositories/app/console_repository.py
#	api/repositories/app_definition_query_repository.py
#	api/services/app_definition_query_service.py
#	api/services/app_generate_service.py
#	api/services/conversation_service.py
#	api/services/message_service.py
#	api/services/web_conversation_service.py
#	api/tasks/app_generate/workflow_execute_task.py
#	api/tests/unit_tests/controllers/console/auth/test_login.py
#	api/tests/unit_tests/controllers/web/test_app.py
#	api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
#	api/tests/unit_tests/repositories/app/test_console_repository.py
#	api/tests/unit_tests/services/test_app_definition_query_service.py
#	api/tests/unit_tests/services/test_app_generate_service.py
#	api/tests/unit_tests/services/test_message_service.py
#	docker/envs/core-services/api.env.example
#	packages/contracts/generated/api/console/account/types.gen.ts
#	packages/contracts/generated/api/console/account/zod.gen.ts
#	packages/contracts/generated/api/console/apps/errors.gen.ts
#	packages/contracts/generated/api/console/apps/orpc.gen.ts
#	packages/contracts/generated/api/console/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/orpc.gen.ts
#	packages/contracts/generated/api/web/errors.gen.ts
#	packages/contracts/generated/api/web/orpc.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
#	packages/contracts/generated/api/web/zod.gen.ts
2026-11-05 14:17:44 +08:00
Joel 99247ee08f Merge branch 'feat/end-user-auth-fe' into deploy/saas 2026-11-05 14:06:56 +08:00
林玮 (Jade Lin) cd36709825 feat(api): support Installed App workspace connections (#45593) 2026-11-05 13:53:16 +08:00
Evan 5d0c0b6657 refactor(api): inject sessions into RAG pipeline console controllers (#45605) 2026-11-05 04:17:24 +00:00
Joel c7513bee8c Merge remote-tracking branch 'origin/main' into feat/end-user-auth-fe
# Conflicts:
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
2026-11-05 10:43:43 +08:00
Joel 53419ee78c Merge branch 'feat/end-user-auth-fe' into deploy/saas
# Conflicts:
#	api/controllers/web/migration.py
#	api/openapi/markdown/web-openapi.md
#	api/repositories/conversation_repository.py
#	api/repositories/conversation_variable_repository.py
#	api/repositories/message_repository.py
#	api/services/conversation_service.py
#	api/tests/unit_tests/controllers/web/test_migration.py
#	api/tests/unit_tests/services/test_web_workflow_admission.py
#	packages/contracts/generated/api/web/orpc.gen.ts
2026-11-05 10:32:25 +08:00
Felix Shiandshi-felix bd1ed239e9 test(api): annotate five controller test modules for strict pyrefly (#45458)
Co-authored-by: shi-felix <204130665+shi-felix@users.noreply.github.com>
2026-11-04 15:56:14 +00:00
非法操作 b501b64f82 refactor(api): isolate trigger OAuth client configuration (#44469) 2026-11-04 12:02:15 +00:00
Yufeng HeandByron Wang cf7ac6120f fix: skip empty tool entries in agent_chat config validation (#37775)
Signed-off-by: Yufeng He <40085740+he-yufeng@users.noreply.github.com>
Co-authored-by: Byron Wang <byron@dify.ai>
2026-11-04 10:39:42 +00:00
Joel 89dd2e0245 Merge branch 'linw/snp-911-end-user-auth' of https://github.com/langgenius/dify into feat/end-user-auth-fe
# Conflicts:
#	api/controllers/console/workspace/account.py
#	api/controllers/web/migration.py
#	api/core/app/apps/message_based_app_generator.py
#	api/openapi/markdown/web-openapi.md
#	api/repositories/account/repository.py
#	api/services/conversation_service.py
#	api/services/message_service.py
#	api/services/web_conversation_service.py
#	api/tests/unit_tests/controllers/web/test_migration.py
#	api/tests/unit_tests/core/app/apps/advanced_chat/test_app_generator.py
#	api/tests/unit_tests/repositories/app/test_console_repository.py
#	api/tests/unit_tests/services/test_message_service.py
#	packages/contracts/generated/api/console/account/types.gen.ts
#	packages/contracts/generated/api/console/account/zod.gen.ts
#	packages/contracts/generated/api/console/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/errors.gen.ts
#	packages/contracts/generated/api/console/workspaces/orpc.gen.ts
#	packages/contracts/generated/api/web/errors.gen.ts
#	packages/contracts/generated/api/web/orpc.gen.ts
#	packages/contracts/generated/api/web/types.gen.ts
#	packages/contracts/generated/api/web/zod.gen.ts
2026-11-04 17:23:28 +08:00
林玮 (Jade Lin) 5a246e57a0 chore: merge end-user auth updates into deploy/saas 2026-11-04 15:24:10 +08:00
林玮 (Jade Lin) e21bba69e8 feat(api): add explicit Cloud workspace activation (#45452) 2026-11-04 14:02:04 +08:00