Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

feat(api): return account created_at from the OAuth provider account endpoint (#43744)

L1nSn0w6a0d228ebfeb
diff --git a/api/controllers/console/auth/oauth_server.py b/api/controllers/console/auth/oauth_server.py
index 15b1c867235..501ee568379 100644
--- a/api/controllers/console/auth/oauth_server.py
+++ b/api/controllers/console/auth/oauth_server.py
@@ -1,9 +1,10 @@
+from datetime import datetime
from http import HTTPStatus
from typing import Any, Never
from flask import Response, jsonify, request
from flask_restx import Resource
-from pydantic import BaseModel, ValidationError
+from pydantic import BaseModel, ValidationError, field_validator
from werkzeug.exceptions import BadRequest, NotFound, UnprocessableEntity
from controllers.common.schema import register_response_schema_models, register_schema_models
@@ -11,7 +12,7 @@ from controllers.console.flask_admission import console_account_admission
from controllers.console.wraps import setup_required
from extensions.ext_application_services import application_services
from fields.base import ResponseModel
-from libs.helper import dump_response
+from libs.helper import dump_response, to_timestamp
from machinery.context import RequestContext
from services.oauth_server_service import (
OAuthServerClientNotFoundError,
@@ -65,6 +66,12 @@ class OAuthProviderAccountResponse(ResponseModel):
avatar: str | None = None
interface_language: str | None
timezone: str | None
+ created_at: int
+
+ @field_validator("created_at", mode="before")
+ @classmethod
+ def _normalize_timestamp(cls, value: datetime | int) -> int:
+ return to_timestamp(value)
register_schema_models(console_ns, OAuthClientPayload, OAuthProviderRequest, OAuthTokenRequest)
diff --git a/api/openapi/markdown/console-openapi.md b/api/openapi/markdown/console-openapi.md
index 48d5db25c49..be1a3ffb051 100644
--- a/api/openapi/markdown/console-openapi.md
+++ b/api/openapi/markdown/console-openapi.md
@@ -21128,6 +21128,7 @@ Coarse node-level status used by Inspector to pick a banner.
| Name | Type | Description | Required |
| ---- | ---- | ----------- | -------- |
| avatar | string | | No |
+| created_at | integer | | Yes |
| email | string | | Yes |
| id | string | | Yes |
| interface_language | string | | Yes |
diff --git a/api/repositories/oauth_server_repository.py b/api/repositories/oauth_server_repository.py
index 9f9e7fa8570..2edee39be7b 100644
--- a/api/repositories/oauth_server_repository.py
+++ b/api/repositories/oauth_server_repository.py
@@ -72,6 +72,7 @@ class SQLAlchemyOAuthServerRepository(OAuthServerRepository):
Account.interface_language,
Account.timezone,
Account.status,
+ Account.created_at,
).where(Account.id == account_id)
with self._session_factory() as session:
@@ -86,6 +87,7 @@ class SQLAlchemyOAuthServerRepository(OAuthServerRepository):
interface_language=row.interface_language,
timezone=row.timezone,
status=OAuthProviderAccountStatus(row.status.value),
+ created_at=row.created_at,
)
diff --git a/api/services/entities/oauth_server_entities.py b/api/services/entities/oauth_server_entities.py
index 25194cf1795..a51c34280bd 100644
--- a/api/services/entities/oauth_server_entities.py
+++ b/api/services/entities/oauth_server_entities.py
@@ -2,6 +2,7 @@
from collections.abc import Mapping
from dataclasses import dataclass
+from datetime import datetime
from enum import StrEnum
@@ -58,6 +59,7 @@ class OAuthProviderAccount:
avatar: str | None
interface_language: str | None
timezone: str | None
+ created_at: datetime
@dataclass(frozen=True, slots=True)
@@ -69,3 +71,4 @@ class OAuthProviderAccountRecord:
interface_language: str | None
timezone: str | None
status: OAuthProviderAccountStatus
+ created_at: datetime
diff --git a/api/services/oauth_server_service.py b/api/services/oauth_server_service.py
index af5bef2f5fd..9c3abff2621 100644
--- a/api/services/oauth_server_service.py
+++ b/api/services/oauth_server_service.py
@@ -143,6 +143,7 @@ class OAuthServerService:
avatar=account.avatar,
interface_language=account.interface_language,
timezone=account.timezone,
+ created_at=account.created_at,
)
def _require_provider_app(self, client_id: str) -> OAuthProviderAppRecord:
diff --git a/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth_server.py b/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth_server.py
index a4cd1b71973..9e87503c726 100644
--- a/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth_server.py
+++ b/api/tests/test_containers_integration_tests/controllers/console/auth/test_oauth_server.py
@@ -1,5 +1,6 @@
"""Controller integration tests for console OAuth server routes."""
+from datetime import UTC, datetime
from types import SimpleNamespace
from unittest.mock import MagicMock, patch
@@ -259,6 +260,7 @@ def test_oauth_account_successful_retrieval(
avatar=None,
interface_language=None,
timezone=None,
+ created_at=datetime(2024, 1, 2, 3, 4, 5, tzinfo=UTC),
)
with patch(
@@ -279,6 +281,7 @@ def test_oauth_account_successful_retrieval(
"avatar": None,
"interface_language": None,
"timezone": None,
+ "created_at": 1704164645,
}
diff --git a/api/tests/unit_tests/controllers/console/auth/test_oauth_server.py b/api/tests/unit_tests/controllers/console/auth/test_oauth_server.py
index 2718e600204..61e78d6b3f6 100644
--- a/api/tests/unit_tests/controllers/console/auth/test_oauth_server.py
+++ b/api/tests/unit_tests/controllers/console/auth/test_oauth_server.py
@@ -1,3 +1,4 @@
+from datetime import UTC, datetime
from http import HTTPStatus
from inspect import unwrap
from types import SimpleNamespace
@@ -132,6 +133,7 @@ def test_account_endpoint_parses_bearer_token_and_serializes_account() -> None:
avatar="avatar",
interface_language="en-US",
timezone="UTC",
+ created_at=datetime(2024, 1, 2, 3, 4, 5, tzinfo=UTC),
)
with (
@@ -151,6 +153,7 @@ def test_account_endpoint_parses_bearer_token_and_serializes_account() -> None:
"avatar": "avatar",
"interface_language": "en-US",
"timezone": "UTC",
+ "created_at": 1704164645,
},
HTTPStatus.OK,
)
@@ -167,6 +170,7 @@ def test_account_endpoint_serializes_nullable_account_preferences() -> None:
avatar=None,
interface_language=None,
timezone=None,
+ created_at=datetime(2024, 1, 2, 3, 4, 5, tzinfo=UTC),
)
with (
@@ -186,6 +190,7 @@ def test_account_endpoint_serializes_nullable_account_preferences() -> None:
"avatar": None,
"interface_language": None,
"timezone": None,
+ "created_at": 1704164645,
},
HTTPStatus.OK,
)
diff --git a/api/tests/unit_tests/repositories/test_oauth_server_repository.py b/api/tests/unit_tests/repositories/test_oauth_server_repository.py
index fc75780803b..8b71fa75bb6 100644
--- a/api/tests/unit_tests/repositories/test_oauth_server_repository.py
+++ b/api/tests/unit_tests/repositories/test_oauth_server_repository.py
@@ -1,4 +1,5 @@
import uuid
+from datetime import datetime
from unittest.mock import MagicMock, patch
import pytest
@@ -81,6 +82,7 @@ def test_get_account_by_id_maps_record(
timezone="UTC",
status=status,
)
+ account.created_at = datetime(2024, 1, 2, 3, 4, 5)
with sqlite_session_factory.begin() as session:
session.add(account)
session.flush()
@@ -96,6 +98,7 @@ def test_get_account_by_id_maps_record(
interface_language="en-US",
timezone="UTC",
status=expected_status,
+ created_at=datetime(2024, 1, 2, 3, 4, 5),
)
diff --git a/api/tests/unit_tests/services/test_oauth_server_service.py b/api/tests/unit_tests/services/test_oauth_server_service.py
index 4eb1b8e5eb2..44dba89e249 100644
--- a/api/tests/unit_tests/services/test_oauth_server_service.py
+++ b/api/tests/unit_tests/services/test_oauth_server_service.py
@@ -1,3 +1,4 @@
+from datetime import datetime
from unittest.mock import MagicMock
import pytest
@@ -184,6 +185,7 @@ def test_get_account_returns_active_account_without_requiring_workspace_membersh
interface_language="en-US",
timezone="UTC",
status=OAuthProviderAccountStatus.ACTIVE,
+ created_at=datetime(2024, 1, 2, 3, 4, 5),
)
assert oauth_server.get_account(client_id="client-1", access_token="access-1") == OAuthProviderAccount(
@@ -193,6 +195,7 @@ def test_get_account_returns_active_account_without_requiring_workspace_membersh
avatar=None,
interface_language="en-US",
timezone="UTC",
+ created_at=datetime(2024, 1, 2, 3, 4, 5),
)
tokens.resolve_account_id.assert_called_once_with("client-1", "access-1")
repository.get_account_by_id.assert_called_once_with("account-1")
@@ -244,6 +247,7 @@ def test_get_account_rejects_inactive_account(
interface_language=None,
timezone=None,
status=status,
+ created_at=datetime(2024, 1, 2, 3, 4, 5),
)
with pytest.raises(OAuthServerUnauthorizedError, match=message):
diff --git a/packages/contracts/generated/api/console/oauth/types.gen.ts b/packages/contracts/generated/api/console/oauth/types.gen.ts
index d42b16324b5..a04666d9c0f 100644
--- a/packages/contracts/generated/api/console/oauth/types.gen.ts
+++ b/packages/contracts/generated/api/console/oauth/types.gen.ts
@@ -40,6 +40,7 @@ export type OAuthClientPayload = {
export type OAuthProviderAccountResponse = {
avatar?: string | null
+ created_at: number
email: string
id: string
interface_language: string | null
diff --git a/packages/contracts/generated/api/console/oauth/zod.gen.ts b/packages/contracts/generated/api/console/oauth/zod.gen.ts
index 23bde3c453e..2357de3c1b9 100644
--- a/packages/contracts/generated/api/console/oauth/zod.gen.ts
+++ b/packages/contracts/generated/api/console/oauth/zod.gen.ts
@@ -60,6 +60,7 @@ export const zOAuthClientPayload = z.object({
*/
export const zOAuthProviderAccountResponse = z.object({
avatar: z.string().nullish(),
+ created_at: z.int(),
email: z.string(),
id: z.string(),
interface_language: z.string().nullable(),