fix removing users

This commit is contained in:
Ruben Fiszel
2022-11-26 14:21:36 +01:00
parent fd31e24816
commit c8d5f853c5
3 changed files with 13 additions and 2 deletions
+3 -2
View File
@@ -892,8 +892,9 @@ async fn login_callback(
if demo_exists {
if let Err(e) = sqlx::query!(
"INSERT INTO workspace_invite
(workspace_id, email, is_admin)
VALUES ('demo', $1, false)",
(workspace_id, email, is_admin)
VALUES ('demo', $1, false)
ON CONFLICT DO NOTHING",
&email
)
.execute(&mut tx)
+7
View File
@@ -1014,6 +1014,13 @@ async fn delete_user(
.execute(&mut tx)
.await?;
sqlx::query!(
"DELETE FROM workspace_invite WHERE email = $1",
&email_to_delete
)
.execute(&mut tx)
.await?;
audit_log(
&mut tx,
&email.unwrap(),
@@ -8,6 +8,7 @@
import InviteGlobalUser from '$lib/components/InviteGlobalUser.svelte'
import { Alert, Badge, Drawer, DrawerContent } from '$lib/components/common'
import ConfirmationModal from '$lib/components/common/confirmationModal/ConfirmationModal.svelte'
import { sendUserToast } from '$lib/utils'
let drawer: Drawer
@@ -44,6 +45,7 @@
async function listUsers(): Promise<void> {
users = await UserService.listUsersAsSuperAdmin({ perPage: 100000 })
fuse?.setCollection(users)
userFilter = userFilter
}
</script>
@@ -128,6 +130,7 @@
on:click={async () => {
deleteConfirmedCallback = async () => {
await UserService.globalUserDelete({ email })
sendUserToast(`User ${email} removed`)
listUsers()
}
openConfirmation = true