mirror of
https://github.com/langgenius/dify.git
synced 2026-05-13 08:57:28 +08:00
1f7da9c191
Conflicts resolved: - api/services/app_service.py: extend AppListParams with status + openapi_visible fields so the openapi caller's per-page visibility gate survives the dict->BaseModel refactor; openapi controller now constructs AppListParams. - pnpm-workspace.yaml: union of CLI-only entries (@napi-rs/keyring, @oclif/*) with main's bumped versions (@next/*, @orpc/*, eslint-plugin-sonarjs, eslint-plugin-storybook); kept eventsource-parser. - pnpm-lock.yaml: regenerated. - web/app/signin/utils/post-login-redirect.ts: union impl — keep main's resolvePostLoginRedirect(searchParams) + setOAuthPendingRedirect; add hardened sessionStorage-based setPostLoginRedirect for device flow with same-origin + path whitelist; device redirect takes precedence over oauth pending. |
||
|---|---|---|
| .. | ||
| (commonLayout) | ||
| (humanInputLayout)/form/[token] | ||
| (shareLayout) | ||
| account | ||
| activate | ||
| components | ||
| device | ||
| education-apply | ||
| forgot-password | ||
| init | ||
| install | ||
| oauth-callback | ||
| reset-password | ||
| signin | ||
| signup | ||
| styles | ||
| layout.tsx | ||
| loading.tsx | ||
| page.tsx | ||
| routePrefixHandle.tsx | ||