From ebb92356febadd4a0576b1bb88f59dc79da3b7e4 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sat, 22 Jul 2023 19:58:04 +0200 Subject: [PATCH] feat: add SCIM support --- ...0aff06ea62f94ff357c446a8e2311e083efdf.json | 14 ++++++++++ ...80052d20327c5e12bc27de91886818d081e0.json} | 7 +++-- ...2851a08e429ce368f7a564cddaeebbec6de0.json} | 6 ++-- ...8a34a13579ebf69a73ac6897edaa9e87ab9f1.json | 28 +++++++++++++++++++ ...696b824685978760b308d8b578df95cf8db45.json | 14 ++++++++++ ...c0f224dcb80d7097f4af0ebc8effd5e2205b.json} | 4 +-- ...3063e168f10a53d56f222c7917aeba020fff3.json | 14 ++++++++++ 7 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 backend/.sqlx/query-120fa12a4c2fdecf1da58ffba0c0aff06ea62f94ff357c446a8e2311e083efdf.json rename backend/.sqlx/{query-04a15674cf66f2822085e65ca33ee42b8e7f3f9d63ffac0585a12368d0322252.json => query-37643190d597726871e0d92f2cbe80052d20327c5e12bc27de91886818d081e0.json} (64%) rename backend/.sqlx/{query-7eeac533a0d63f4e3af9d3e3123b0a73f44543e618e29e4c6a6d573852339933.json => query-87462841813fcb365541959dbadf2851a08e429ce368f7a564cddaeebbec6de0.json} (55%) create mode 100644 backend/.sqlx/query-a355b3e13faa52b12c7d01fd8c78a34a13579ebf69a73ac6897edaa9e87ab9f1.json create mode 100644 backend/.sqlx/query-cac375edf290d68d487de4273c3696b824685978760b308d8b578df95cf8db45.json rename backend/.sqlx/{query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json => query-df8ebebb61194d9427ee922d037fc0f224dcb80d7097f4af0ebc8effd5e2205b.json} (56%) create mode 100644 backend/.sqlx/query-f1e65e52585b27bfb39817e82613063e168f10a53d56f222c7917aeba020fff3.json diff --git a/backend/.sqlx/query-120fa12a4c2fdecf1da58ffba0c0aff06ea62f94ff357c446a8e2311e083efdf.json b/backend/.sqlx/query-120fa12a4c2fdecf1da58ffba0c0aff06ea62f94ff357c446a8e2311e083efdf.json new file mode 100644 index 0000000000..5a1cf243eb --- /dev/null +++ b/backend/.sqlx/query-120fa12a4c2fdecf1da58ffba0c0aff06ea62f94ff357c446a8e2311e083efdf.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO password (email, login_type, verified) VALUES ($1, 'saml', true) ON CONFLICT DO NOTHING", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Varchar" + ] + }, + "nullable": [] + }, + "hash": "120fa12a4c2fdecf1da58ffba0c0aff06ea62f94ff357c446a8e2311e083efdf" +} diff --git a/backend/.sqlx/query-04a15674cf66f2822085e65ca33ee42b8e7f3f9d63ffac0585a12368d0322252.json b/backend/.sqlx/query-37643190d597726871e0d92f2cbe80052d20327c5e12bc27de91886818d081e0.json similarity index 64% rename from backend/.sqlx/query-04a15674cf66f2822085e65ca33ee42b8e7f3f9d63ffac0585a12368d0322252.json rename to backend/.sqlx/query-37643190d597726871e0d92f2cbe80052d20327c5e12bc27de91886818d081e0.json index 467d187901..236e7451d3 100644 --- a/backend/.sqlx/query-04a15674cf66f2822085e65ca33ee42b8e7f3f9d63ffac0585a12368d0322252.json +++ b/backend/.sqlx/query-37643190d597726871e0d92f2cbe80052d20327c5e12bc27de91886818d081e0.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT group_ FROM usr_to_group where usr = $1 AND workspace_id = $2", + "query": "SELECT group_ FROM usr_to_group where usr = $1 AND workspace_id = $2 UNION ALL SELECT igroup FROM email_to_igroup WHERE email = $3", "describe": { "columns": [ { @@ -11,13 +11,14 @@ ], "parameters": { "Left": [ + "Text", "Text", "Text" ] }, "nullable": [ - false + null ] }, - "hash": "04a15674cf66f2822085e65ca33ee42b8e7f3f9d63ffac0585a12368d0322252" + "hash": "37643190d597726871e0d92f2cbe80052d20327c5e12bc27de91886818d081e0" } diff --git a/backend/.sqlx/query-7eeac533a0d63f4e3af9d3e3123b0a73f44543e618e29e4c6a6d573852339933.json b/backend/.sqlx/query-87462841813fcb365541959dbadf2851a08e429ce368f7a564cddaeebbec6de0.json similarity index 55% rename from backend/.sqlx/query-7eeac533a0d63f4e3af9d3e3123b0a73f44543e618e29e4c6a6d573852339933.json rename to backend/.sqlx/query-87462841813fcb365541959dbadf2851a08e429ce368f7a564cddaeebbec6de0.json index 1b461f1ac6..5542bf6e37 100644 --- a/backend/.sqlx/query-7eeac533a0d63f4e3af9d3e3123b0a73f44543e618e29e4c6a6d573852339933.json +++ b/backend/.sqlx/query-87462841813fcb365541959dbadf2851a08e429ce368f7a564cddaeebbec6de0.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT name FROM group_ WHERE workspace_id = $1 ORDER BY name desc", + "query": "SELECT name FROM group_ WHERE workspace_id = $1 UNION ALL SELECT name FROM instance_group ORDER BY name desc", "describe": { "columns": [ { @@ -15,8 +15,8 @@ ] }, "nullable": [ - false + null ] }, - "hash": "7eeac533a0d63f4e3af9d3e3123b0a73f44543e618e29e4c6a6d573852339933" + "hash": "87462841813fcb365541959dbadf2851a08e429ce368f7a564cddaeebbec6de0" } diff --git a/backend/.sqlx/query-a355b3e13faa52b12c7d01fd8c78a34a13579ebf69a73ac6897edaa9e87ab9f1.json b/backend/.sqlx/query-a355b3e13faa52b12c7d01fd8c78a34a13579ebf69a73ac6897edaa9e87ab9f1.json new file mode 100644 index 0000000000..3abf62e53f --- /dev/null +++ b/backend/.sqlx/query-a355b3e13faa52b12c7d01fd8c78a34a13579ebf69a73ac6897edaa9e87ab9f1.json @@ -0,0 +1,28 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT name, array_remove(array_agg(email_to_igroup.email), null) as emails FROM email_to_igroup RIGHT JOIN instance_group ON instance_group.name = email_to_igroup.igroup WHERE name = $1 GROUP BY name", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "name", + "type_info": "Varchar" + }, + { + "ordinal": 1, + "name": "emails", + "type_info": "VarcharArray" + } + ], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [ + false, + null + ] + }, + "hash": "a355b3e13faa52b12c7d01fd8c78a34a13579ebf69a73ac6897edaa9e87ab9f1" +} diff --git a/backend/.sqlx/query-cac375edf290d68d487de4273c3696b824685978760b308d8b578df95cf8db45.json b/backend/.sqlx/query-cac375edf290d68d487de4273c3696b824685978760b308d8b578df95cf8db45.json new file mode 100644 index 0000000000..bd3c911d70 --- /dev/null +++ b/backend/.sqlx/query-cac375edf290d68d487de4273c3696b824685978760b308d8b578df95cf8db45.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "INSERT INTO instance_group (name) VALUES ($1) ON CONFLICT DO NOTHING", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Varchar" + ] + }, + "nullable": [] + }, + "hash": "cac375edf290d68d487de4273c3696b824685978760b308d8b578df95cf8db45" +} diff --git a/backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json b/backend/.sqlx/query-df8ebebb61194d9427ee922d037fc0f224dcb80d7097f4af0ebc8effd5e2205b.json similarity index 56% rename from backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json rename to backend/.sqlx/query-df8ebebb61194d9427ee922d037fc0f224dcb80d7097f4af0ebc8effd5e2205b.json index 854f4740ef..ad654d9389 100644 --- a/backend/.sqlx/query-d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4.json +++ b/backend/.sqlx/query-df8ebebb61194d9427ee922d037fc0f224dcb80d7097f4af0ebc8effd5e2205b.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT igroup as name, array_agg(email_to_igroup.email) as emails FROM email_to_igroup GROUP BY igroup", + "query": "SELECT name, array_remove(array_agg(email_to_igroup.email), null) as emails FROM email_to_igroup RIGHT JOIN instance_group ON instance_group.name = email_to_igroup.igroup GROUP BY name", "describe": { "columns": [ { @@ -22,5 +22,5 @@ null ] }, - "hash": "d3e005e5663a9dccf9d5c52e3c8e512d3b0daf5ecc0d245d53504278b2d6eaa4" + "hash": "df8ebebb61194d9427ee922d037fc0f224dcb80d7097f4af0ebc8effd5e2205b" } diff --git a/backend/.sqlx/query-f1e65e52585b27bfb39817e82613063e168f10a53d56f222c7917aeba020fff3.json b/backend/.sqlx/query-f1e65e52585b27bfb39817e82613063e168f10a53d56f222c7917aeba020fff3.json new file mode 100644 index 0000000000..7a578ce15c --- /dev/null +++ b/backend/.sqlx/query-f1e65e52585b27bfb39817e82613063e168f10a53d56f222c7917aeba020fff3.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM email_to_igroup WHERE igroup = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text" + ] + }, + "nullable": [] + }, + "hash": "f1e65e52585b27bfb39817e82613063e168f10a53d56f222c7917aeba020fff3" +}