Merge remote-tracking branch 'origin/pr/487'

# Conflicts:
#	crates/aether-data/src/lifecycle/bootstrap/postgres.rs
#	crates/aether-data/src/lifecycle/migrate/tests.rs
#	crates/aether-data/src/repository/oauth_providers/postgres.rs
#	crates/aether-data/src/repository/oauth_providers/sqlite.rs
#	frontend/src/views/admin/OAuthSettings.vue
This commit is contained in:
fawney19
2026-05-19 02:27:39 +08:00
27 changed files with 293 additions and 204 deletions

View File

@@ -416,6 +416,7 @@ CREATE TABLE IF NOT EXISTS public.oauth_providers (
frontend_callback_url character varying(500) NOT NULL,
attribute_mapping json,
extra_config json,
icon_url character varying(500),
is_enabled boolean DEFAULT false NOT NULL,
created_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP NOT NULL,
updated_at timestamp with time zone DEFAULT CURRENT_TIMESTAMP NOT NULL

View File

@@ -36,6 +36,7 @@ CREATE TABLE IF NOT EXISTS oauth_providers (
`frontend_callback_url` VARCHAR(500) NOT NULL,
`attribute_mapping` JSON,
`extra_config` JSON,
`icon_url` VARCHAR(500),
`is_enabled` TINYINT(1) NOT NULL DEFAULT 0,
`created_at` BIGINT NOT NULL,
`updated_at` BIGINT NOT NULL,

View File

@@ -38,6 +38,7 @@ CREATE TABLE IF NOT EXISTS public.oauth_providers (
frontend_callback_url character varying(500) NOT NULL,
attribute_mapping jsonb,
extra_config jsonb,
icon_url character varying(500),
is_enabled boolean DEFAULT false NOT NULL,
created_at bigint NOT NULL,
updated_at bigint NOT NULL

View File

@@ -34,6 +34,7 @@ CREATE TABLE IF NOT EXISTS oauth_providers (
frontend_callback_url TEXT NOT NULL,
attribute_mapping TEXT,
extra_config TEXT,
icon_url TEXT,
is_enabled INTEGER NOT NULL DEFAULT 0,
created_at INTEGER NOT NULL,
updated_at INTEGER NOT NULL

View File

@@ -137,6 +137,12 @@ name = "extra_config"
type = "json"
nullable = true
[[table.oauth_providers.columns]]
name = "icon_url"
type = "text"
length = 500
nullable = true
[[table.oauth_providers.columns]]
name = "is_enabled"
type = "bool"