mirror of
https://github.com/dani-garcia/vaultwarden.git
synced 2026-03-16 20:01:22 -05:00
[PR #2787] [CLOSED] merge & rebase for pinpox SSO #6790
Reference in New Issue
Block a user
Delete Branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/dani-garcia/vaultwarden/pull/2787
Author: @m4w0lf
Created: 10/2/2022
Status: ❌ Closed
Base:
main← Head:rebase/pinpox-sso📝 Commits (1)
8ca30e6merge & rebase for pinpox SSO📊 Changes
20 files changed (+1473 additions, -10 deletions)
View changed files
📝
Cargo.lock(+1 -0)📝
Cargo.toml(+4 -0)➕
migrations/mysql/2021-09-16-133000_add_sso/down.sql(+2 -0)➕
migrations/mysql/2021-09-16-133000_add_sso/up.sql(+18 -0)📝
migrations/postgresql/2019-09-12-100000_create_tables/up.sql(+1 -1)➕
migrations/postgresql/2021-09-16-133000_add_sso/down.sql(+2 -0)➕
migrations/postgresql/2021-09-16-133000_add_sso/up.sql(+18 -0)➕
migrations/sqlite/2021-09-16-133000_add_sso/down.sql(+2 -0)➕
migrations/sqlite/2021-09-16-133000_add_sso/up.sql(+18 -0)📝
src/api/core/organizations.rs(+207 -0)📝
src/api/identity.rs(+245 -1)📝
src/db/models/mod.rs(+4 -0)📝
src/db/models/org_policy.rs(+1 -1)📝
src/db/models/organization.rs(+20 -7)➕
src/db/models/sso_config.rs(+104 -0)➕
src/db/models/sso_nonce.rs(+71 -0)📝
src/db/schemas/mysql/schema.rs(+23 -0)📝
src/db/schemas/postgresql/schema.rs(+23 -0)📝
src/db/schemas/sqlite/schema.rs(+23 -0)➕
web-vault-sso.patch(+686 -0)📄 Description
Hi @pinpox,
I rebased you branch and I aligned it with current main on dani-garcia/vaultwarden.
Docker container builds successfully.
Can you help me to configure and test it?
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.