From b4a6d62aca7142a19c48fd59fde1acc0f1a38bca Mon Sep 17 00:00:00 2001
From: ramiroaisen <52116153+ramiroaisen@users.noreply.github.com>
Date: Tue, 13 Jun 2023 11:33:03 -0300
Subject: [PATCH] members, revoke access, change role

---
 defs/api/PublicInvitation.ts                  |   1 +
 .../members/[member]/DELETE/Output.ts         |   4 +
 .../[member]/set-role/POST/AccessKind.ts      |   3 +
 .../members/[member]/set-role/POST/Output.ts  |   4 +
 .../members/[member]/set-role/POST/Payload.ts |   4 +
 .../invitations/[invitation]/DELETE/Output.ts |   4 +
 .../src/lib/components/SimpleLogo.svelte      |  12 +-
 .../lib/components/Dashboard/TopUser.svelte   |  10 +-
 .../app/src/lib/components/SimpleLogo.svelte  |  12 +-
 .../accounts/[account]/members/+page.svelte   | 316 +++++++++++++++++-
 .../(app)/accounts/[account]/members/+page.ts |   2 +-
 .../(app)/me/invitations/+page.svelte         |  42 ++-
 front/server/src/api/shared-api.ts            |  13 +
 front/server/src/client.ts                    |  12 +
 front/server/src/locale/studio/studio.ar.ts   |   9 +
 front/server/src/locale/studio/studio.de.ts   |   9 +
 front/server/src/locale/studio/studio.en.ts   |   9 +
 .../server/src/locale/studio/studio.es-AR.ts  |  11 +-
 front/server/src/locale/studio/studio.es.ts   |   9 +
 front/server/src/locale/studio/studio.fr.ts   |   9 +
 front/server/src/locale/studio/studio.it.ts   |   9 +
 front/server/src/locale/studio/studio.pt.ts   |   9 +
 front/server/src/locale/studio/studio.zh.ts   |   9 +
 front/server/src/locale/wip/wip.ar.ts         | 113 +------
 front/server/src/locale/wip/wip.de.ts         | 113 +------
 front/server/src/locale/wip/wip.en.ts         | 111 +-----
 front/server/src/locale/wip/wip.es-AR.ts      | 114 +------
 front/server/src/locale/wip/wip.es.ts         | 114 +------
 front/server/src/locale/wip/wip.fr.ts         | 113 +------
 front/server/src/locale/wip/wip.it.ts         | 113 +------
 front/server/src/locale/wip/wip.pt.ts         | 113 +------
 front/server/src/locale/wip/wip.zh.ts         | 113 +------
 .../api/src/routes/accounts/members/id.rs     | 217 ++++++++++++
 .../accounts/{members.rs => members/mod.rs}   |   2 +
 .../api/src/routes/invitations/accept.rs      |  17 +-
 .../src/routes/invitations/get_by_token.rs    |   9 +-
 rs/packages/api/src/routes/invitations/id.rs  | 138 +++++++-
 rs/packages/api/src/routes/invitations/mod.rs |   4 +
 .../api/src/routes/invitations/reject.rs      |   7 +-
 rs/packages/api/src/routes/mod.rs             |  13 +-
 .../db/src/models/account_invitations/mod.rs  |   2 +
 41 files changed, 961 insertions(+), 987 deletions(-)
 create mode 100644 defs/api/accounts/[account]/members/[member]/DELETE/Output.ts
 create mode 100644 defs/api/accounts/[account]/members/[member]/set-role/POST/AccessKind.ts
 create mode 100644 defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts
 create mode 100644 defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts
 create mode 100644 defs/api/invitations/[invitation]/DELETE/Output.ts
 create mode 100644 rs/packages/api/src/routes/accounts/members/id.rs
 rename rs/packages/api/src/routes/accounts/{members.rs => members/mod.rs} (99%)

diff --git a/defs/api/PublicInvitation.ts b/defs/api/PublicInvitation.ts
index efd4c61e..1a7f4cf8 100644
--- a/defs/api/PublicInvitation.ts
+++ b/defs/api/PublicInvitation.ts
@@ -13,6 +13,7 @@ export type PublicInvitation = {
   account_id: string;
   receiver_email: string;
   created_at: DateTime;
+  deleted_at: DateTime | null;
   is_expired: boolean;
   expires_at: DateTime;
   account: InvitationAccount | null;
diff --git a/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts b/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts
new file mode 100644
index 00000000..26622e8a
--- /dev/null
+++ b/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EmptyStruct } from "../../../../../../EmptyStruct";
+
+export type Output = EmptyStruct;
diff --git a/defs/api/accounts/[account]/members/[member]/set-role/POST/AccessKind.ts b/defs/api/accounts/[account]/members/[member]/set-role/POST/AccessKind.ts
new file mode 100644
index 00000000..8352b104
--- /dev/null
+++ b/defs/api/accounts/[account]/members/[member]/set-role/POST/AccessKind.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type AccessKind = "owner" | "staff";
diff --git a/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts b/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts
new file mode 100644
index 00000000..fe3ccd5b
--- /dev/null
+++ b/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EmptyStruct } from "../../../../../../../EmptyStruct";
+
+export type Output = EmptyStruct;
diff --git a/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts b/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts
new file mode 100644
index 00000000..8e69f53b
--- /dev/null
+++ b/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { AccessKind } from "./AccessKind";
+
+export type Payload = { role: AccessKind };
diff --git a/defs/api/invitations/[invitation]/DELETE/Output.ts b/defs/api/invitations/[invitation]/DELETE/Output.ts
new file mode 100644
index 00000000..711ba65b
--- /dev/null
+++ b/defs/api/invitations/[invitation]/DELETE/Output.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { EmptyStruct } from "../../../../EmptyStruct";
+
+export type Output = EmptyStruct;
diff --git a/front/admin/src/lib/components/SimpleLogo.svelte b/front/admin/src/lib/components/SimpleLogo.svelte
index ebdb9b28..a5959665 100644
--- a/front/admin/src/lib/components/SimpleLogo.svelte
+++ b/front/admin/src/lib/components/SimpleLogo.svelte
@@ -31,10 +31,10 @@
   }
 </style>
 
-    <div class="logo">
-      <div class="logo-icon" style:background-image="url({ logo })" />
-      <div class="logo-text">
-        {$locale.logo_text}
-      </div>
-    </div>
+<div class="logo">
+  <div class="logo-icon" style:background-image="url({ logo })" />
+  <div class="logo-text">
+    {$locale.logo_text}
+  </div>
+</div>
 
diff --git a/front/app/src/lib/components/Dashboard/TopUser.svelte b/front/app/src/lib/components/Dashboard/TopUser.svelte
index 13714ac8..daeea880 100644
--- a/front/app/src/lib/components/Dashboard/TopUser.svelte
+++ b/front/app/src/lib/components/Dashboard/TopUser.svelte
@@ -17,7 +17,7 @@
 	import { click_out } from "$share/actions";
 	import { action, _post } from "$share/net.client";
 	import Icon from "$share/Icon.svelte";
-	import { mdiAccountCircleOutline, mdiAccountMultipleOutline, mdiCastAudioVariant, mdiLogout } from "@mdi/js";
+	import { mdiAccountCircleOutline, mdiAccountMultipleOutline, mdiAccountPlusOutline, mdiCastAudioVariant, mdiLogout } from "@mdi/js";
 	import { goto } from "$app/navigation";
 	import { locale } from "$lib/locale";
 	import { invalidate_siblings } from "$lib/invalidate";
@@ -271,6 +271,14 @@
                 {$locale.user_menu.profile}
               </a>
             </div>
+            <div class="menu-section">
+              <a href="/me/invitations" class="na menu-section-link ripple-container" use:ripple on:click={() => menu_open = false}>
+                <div class="menu-icon">
+                  <Icon d={mdiAccountPlusOutline} />
+                </div>
+                {$locale.user_menu.invitations}
+              </a>
+            </div>
             <div class="menu-section">
               <a href="/accounts" class="na menu-section-link ripple-container" use:ripple on:click={() => menu_open = false}>
                 <div class="menu-icon">
diff --git a/front/app/src/lib/components/SimpleLogo.svelte b/front/app/src/lib/components/SimpleLogo.svelte
index ebdb9b28..a5959665 100644
--- a/front/app/src/lib/components/SimpleLogo.svelte
+++ b/front/app/src/lib/components/SimpleLogo.svelte
@@ -31,10 +31,10 @@
   }
 </style>
 
-    <div class="logo">
-      <div class="logo-icon" style:background-image="url({ logo })" />
-      <div class="logo-text">
-        {$locale.logo_text}
-      </div>
-    </div>
+<div class="logo">
+  <div class="logo-icon" style:background-image="url({ logo })" />
+  <div class="logo-text">
+    {$locale.logo_text}
+  </div>
+</div>
 
diff --git a/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.svelte b/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.svelte
index 8e142993..32552e3d 100644
--- a/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.svelte
+++ b/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.svelte
@@ -9,20 +9,80 @@
 	import Formy from "$share/formy/Formy.svelte";
 	import Validator from "$share/formy/Validator.svelte";
 	import { _email } from "$share/formy/validate";
-	import { _post, action } from "$share/net.client";
+	import { _delete, _post, action } from "$share/net.client";
 	import { _message } from "$share/notify";
 	import { ripple } from "$share/ripple";
-	import { mdiAccountPlusOutline } from "@mdi/js";
-	import { scale } from "svelte/transition";
+	import { mdiAccountPlusOutline, mdiDotsVertical, mdiSecurity, mdiTrashCanOutline } from "@mdi/js";
+	import { scale, slide } from "svelte/transition";
   import { locale } from "$lib/locale";
+	import { logical_fly } from "$share/transition";
+	import { click_out } from "$share/actions";
+	import { invalidate } from "$app/navigation";
+	import { invalidateAll } from "$lib/invalidate";
 
-
-  type Relation = Exclude<typeof data.access.members, null>[number]["relation"];
+  type Member = Exclude<typeof data.access.members, null>[number];
+  type Relation = Member["relation"];
   const relation_names: Record<Relation, string> = {
     "owner": "Admin",
     "staff": "Staff",
   };
 
+  let member_menu_open_id: string | null = null;
+
+  const toggle_member_menu = (id: string) => {
+    if(member_menu_open_id === id) member_menu_open_id = null;
+    else member_menu_open_id = id;
+  }
+
+  const member_menu_click_out = () => {
+    setTimeout(() => {
+      member_menu_open_id = null;
+    }, 3)
+  }
+
+  let roling = false;
+  const set_member_role = action(async (member: Member, relation: "owner" | "staff") => {
+    if(roling) return;
+    roling = true;
+    try {
+      const payload: import("$api/accounts/[account]/members/[member]/set-role/POST/Payload").Payload = {
+        role: relation
+      }
+      
+      await _post(`/api/accounts/${data.account._id}/members/${member._id}/set-role`, payload);
+      
+      member_menu_open_id = null;
+
+      _message($locale.pages["account/members"].notifier.member_role_changed);
+      roling = false;
+      invalidateAll();
+    } catch(e) {
+      roling = false;
+      invalidateAll();
+      throw e;
+    }
+  })
+
+  
+  let deleting_member = false;
+  const del_member = action(async (member: Member) => {
+    if(deleting_member == true) return;
+    deleting_member = true;
+    try {
+      await _delete<import("$api/accounts/[account]/members/[member]/DELETE/Output").Output>(`/api/accounts/${data.account._id}/members/${member._id}`);
+      _message($locale.pages["account/members"].notifier.member_access_revoked)
+      member_menu_open_id = null;
+      deleting_member = false;
+      invalidateAll();
+
+    } catch(e) {
+      deleting_member = false;
+      invalidateAll();
+      throw e;
+    }
+  })
+
+
   let invite_open = false;
 
   let invite_email = "";
@@ -63,7 +123,7 @@
     // we only show the last pending invitation for each receiver_email 
     // sort the invitations in reverse order and filter already existing invitations
     for(const item of items.slice().sort((a, b) => b.created_at.localeCompare(a.created_at))) {
-      if(item.is_expired || item.state !== "pending") continue;
+      if(item.is_expired || item.state !== "pending" || item.deleted_at != null) continue;
       if(map.has(item.receiver_email)) continue;
       map.set(item.receiver_email, item);
     }
@@ -91,6 +151,51 @@
       return null;
     }
   })()
+
+  let invitation_menu_open_id: string | null = null;
+
+  const toggle_invitation_menu = (id: string) => {
+    if(invitation_menu_open_id === id) invitation_menu_open_id = null;
+    else invitation_menu_open_id = id;
+  }
+
+  const invitation_menu_click_out = () => {
+    setTimeout(() => {
+      invitation_menu_open_id = null;
+    }, 3)
+  }
+
+  let deleting = false;
+  const del_invitation = action(async (item: PublicInvitation) => {
+
+    if(deleting) return;
+    deleting = true;
+
+    try {
+      // remove all pending invitations to the same email
+      const ids = new Set([item.id]);
+      if(data.access.is_owner) {
+        for(const each of data.access.invitations.items) {
+          if(each.deleted_at != null) continue;
+          if(each.state !== "pending") continue;
+          if(each.receiver_email !== item.receiver_email) continue;
+          ids.add(each.id);
+        }
+      }
+
+      await Promise.all([...ids].map(async id => {
+        await _delete<import("$api/invitations/[invitation]/DELETE/Output").Output>(`/api/invitations/${id}`);
+      }));
+
+      invitation_menu_open_id = null;
+      deleting = false;
+      invalidate("api:invitations");
+    } catch(e) {
+      deleting = false;
+      invalidate("api:invitations");
+      throw e;
+    }
+  })
 </script>
 
 <style>
@@ -108,9 +213,16 @@
 
   .item {
     padding: 1rem;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+
+  .item-data {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
+    flex: 1;
   }
 
   .item-name {
@@ -122,6 +234,7 @@
     color: #444;
     font-size: 0.95rem;
     margin-top: 0.25rem;
+    word-break: break-all;
   }
 
   .item-relation {
@@ -149,7 +262,7 @@
     display: flex;
     flex-direction: column;
     align-items: flex-start;
-    margin-top: 1rem;
+    margin-top: 2rem;
   }
 
   .invite {
@@ -218,6 +331,82 @@
     line-height: 2rem;
   }
 
+  .invitations {
+    background: #fff;
+    padding: 0.5rem 0;
+    box-shadow: var(--some-shadow);
+    border-radius: 0.5rem;
+    margin-top: 1rem;
+  }
+
+  .invitation-item {
+    padding: 0 1rem;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+
+  .invitation-item:nth-child(even) {
+    background: rgba(0,0,0,0.05);
+  }
+
+  .invitation-item-email {
+    padding: 0.75rem 0;
+    font-weight: 600;
+    flex: 1;
+    word-break: break-all;
+  }
+
+  .menu-anchor {
+    position: relative;
+    flex: none; 
+  }
+
+  .menu-btn {
+    display: flex;
+    font-size: 1.5rem;
+    border-radius: 50%;
+    padding: 0.75rem;
+    transition: background-color 200ms ease;
+  }
+
+  .menu-btn:hover, .menu-btn.open {
+    background-color: rgba(0,0,0,0.05)
+  }
+
+
+  .menu {
+    position: absolute;
+    inset-block-start: 100%;
+    inset-inline-end: 0;
+    background: #fff;
+    box-shadow: var(--some-shadow);
+    border-radius: 0.25rem;
+    padding: 0.25rem;
+    min-width: 10rem;
+    display: flex;
+    flex-direction: column;
+    z-index: 1;
+  }
+
+  .menu-item {
+    white-space: nowrap;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    padding: 0.5rem 0.75rem;
+    transition: background-color 200ms ease;
+    align-self: stretch;
+  }
+
+  .menu-item:hover {
+    background-color: rgba(0,0,0,0.05);
+  }
+
+  .menu-item-icon {
+    display: flex;
+    margin-inline-end: 0.75rem;
+  }
 </style>
 
 <svelte:head>
@@ -240,29 +429,122 @@
     
     <div class="list">
       {#each data.access.members as item (item._id)}
+        {@const is_self = data.user._id === item._id}
+        {@const menu_open = member_menu_open_id === item._id}
         {@const relation_name = relation_names[item.relation]}
-        <div class="item" class:me={data.user._id === item._id}>
-          <div class="item-name">{item.first_name} {item.last_name}</div>
-          <div class="item-email">{item.email}</div>
-          <div class="item-relation">{relation_name}</div>
-        </div>
+        <div class="item" class:me={is_self} transition:slide|local={{ duration: 400 }}>
+          <div class="item-data">
+            <div class="item-name">{item.first_name} {item.last_name}</div>
+            <div class="item-email">{item.email}</div>
+            <div class="item-relation">{relation_name}</div>
+          </div>
+          {#if !is_self}
+            <div class="menu-anchor">
+              <button
+                class="menu-btn ripple-container"
+                class:open={menu_open}
+                on:click={() => toggle_member_menu(item._id)}
+                use:ripple
+              >
+                <Icon d={mdiDotsVertical} /> 
+              </button>
+              {#if menu_open}
+                <div
+                  class="menu"
+                  transition:logical_fly|local={{ duration: 200, y: -15, x: 15 }}
+                  use:click_out={member_menu_click_out}
+                >
+                  {#if item.relation === "owner"}
+                    <button
+                      class="menu-item ripple-container"
+                      use:ripple
+                      on:click={() => set_member_role(item, "staff")}
+                    >
+                      <div class="menu-item-icon">
+                        <Icon d={mdiSecurity} />
+                      </div>
+                        {
+                          $locale.pages["account/members"].actions.set_role_to
+                            .replace("@role", relation_names["staff"])
+                        }
+                    </button>
+                  {:else}
+                    <button
+                      class="menu-item ripple-container"
+                      use:ripple
+                      on:click={() => set_member_role(item, "owner")}
+                    >
+                      <div class="menu-item-icon">
+                        <Icon d={mdiSecurity} />
+                      </div>
+                      {
+                        $locale.pages["account/members"].actions.set_role_to
+                          .replace("@role", relation_names["owner"])
+                      }
+                    </button>
+                  {/if}
+                  <button
+                    class="menu-item ripple-container"
+                    use:ripple
+                    on:click={() => del_member(item)}
+                  >
+                    <div class="menu-item-icon">
+                      <Icon d={mdiTrashCanOutline} />
+                    </div>
+                      {$locale.pages["account/members"].actions.revoke_access}
+                    </button>
+                </div>
+              {/if}
+            </div>
+          {/if}
+      </div>
       {/each}
     </div>
 
-    {@const invitations = filter_invitations(data.access.invitations.items)}
  
     <h2>{$locale.pages["account/members"].Pending_invitations}</h2>
+
+    {@const invitations = filter_invitations(data.access.invitations.items)}
     
     {#if invitations.length}
-      <div class="invitations">
-        {#each filter_invitations(data.access.invitations.items) as item (item.id)}
-          <div class="invitation-item">
+      <div class="invitations" transition:slide|local={{ duration: 400 }}>
+        {#each invitations as item (item.id)}
+          {@const menu_open = invitation_menu_open_id == item.id}
+          <div class="invitation-item" transition:slide|local={{ duration: 400 }}>
             <div class="invitation-item-email">{item.receiver_email}</div>
+            <div class="menu-anchor">
+              <button
+                class="menu-btn ripple-container"
+                class:open={menu_open}
+                use:ripple
+                on:click={() => toggle_invitation_menu(item.id)}
+              >
+                <Icon d={mdiDotsVertical} />
+              </button>
+              {#if menu_open}
+                <div
+                  class="menu"
+                  transition:logical_fly|local={{ duration: 200, y: -15, x: 15 }}
+                  use:click_out={invitation_menu_click_out}
+                >
+                  <button
+                    class="menu-item ripple-container"
+                    use:ripple
+                    on:click={() => del_invitation(item)}
+                  >
+                    <div class="menu-item-icon">
+                      <Icon d={mdiTrashCanOutline} />
+                    </div>
+                    {$locale.pages["account/members"].actions.delete}
+                  </button>
+                </div>
+              {/if}
+            </div>
           </div>
         {/each}
       </div>
     {:else}
-      <p class="invitations-empty">
+      <p class="invitations-empty" transition:slide|local={{ duration: 400 }}>
         {$locale.pages["account/members"].no_pending_invitations_message}
       </p>
     {/if}
diff --git a/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.ts b/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.ts
index c76c7b80..10023516 100644
--- a/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.ts
+++ b/front/app/src/routes/(root)/(online)/(app)/accounts/[account]/members/+page.ts
@@ -3,7 +3,7 @@ import { load_get } from "$lib/load";
 export const load = (async ({ fetch, url, depends, parent }) => {
   
   depends("api:accounts/:id/members");
-  depends("api:accounts/invitations");
+  depends("api:invitations");
   
   const { account, is_account_owner } = await parent();
 
diff --git a/front/app/src/routes/(root)/(online)/(app)/me/invitations/+page.svelte b/front/app/src/routes/(root)/(online)/(app)/me/invitations/+page.svelte
index b6178715..7f82ca06 100644
--- a/front/app/src/routes/(root)/(online)/(app)/me/invitations/+page.svelte
+++ b/front/app/src/routes/(root)/(online)/(app)/me/invitations/+page.svelte
@@ -20,6 +20,7 @@
     const map = new Map<string, Item>();
     // we only show the last invitation for each account
     for(const item of data.invitations.items.slice().sort((a, b) => b.created_at.localeCompare(a.created_at))) {
+      if(item.deleted_at != null) continue;
       if(item.is_expired) continue;
       if(item.state !== "pending") continue;
       if(map.has(item.account_id)) continue;
@@ -34,18 +35,36 @@
 	let to_reject_item: Item | null = null;
   const reject = action(async () => {
 		if (to_reject_item == null) return;
-		const payload: import("$api/invitations/reject/POST/Payload").Payload = {
-      invitation_id: to_reject_item.id
-    };
-
+		const item = to_reject_item;
+    const payload: import("$api/invitations/reject/POST/Payload").Payload = { invitation_id: item.id };
+    
     await _post(`/api/invitations/reject`, payload);
-		
-    _message($locale.pages['me/invitations'].notifier.rejected);
-
-		to_reject_item = null;
-		invalidate('api:invitations');
+		_message($locale.pages['me/invitations'].notifier.rejected);
+    to_reject_item = null;
+    
+    await delete_siblings(item).catch(() => {});
+      
+    invalidate('api:invitations');
 	});
 
+  /** delete other invitations to same account */
+  const delete_siblings = async (item: Item) => {
+    const ids = new Set();
+      for(const each of data.invitations.items) {
+      if(each.deleted_at != null) continue;
+      if(each.is_expired) continue;
+      if(each.state !== "pending") continue;
+      if(each.id === item.id) continue;
+      if(each.account_id !== item.account_id) {
+        ids.add(each.id);
+      }
+    } 
+
+    await Promise.all([...ids].map(async id => {
+      await _delete<import("$api/invitations/[invitation]/DELETE/Output").Output>(`/api/invitations/${id}`);
+    }))
+  }
+
   let accepting = false;
   const accept = action(async (item: Item) => {
     if(accepting) return;
@@ -60,6 +79,7 @@
       if(result !== "ok") {
         _error($locale.pages['me/invitations'].notifier.accept_error.replace("@error", result))
       } else {
+        await delete_siblings(item).catch(() => {});
         _message($locale.pages["me/invitations"].notifier.accepted);
       }
 
@@ -213,13 +233,13 @@
           <div class="invitation" data-invitation-id={item.id} transition:slide|local={{ duration: 400 }}>
             <div class="invitation-data">
               {#if item.user_sender}
-                {
+                {@html 
                   $locale.pages['me/invitations'].item_message_with_sender_html
                     .replace("@sender", item.user_sender.first_name)
                     .replace("@account", item.account ? item.account.name : `#${item.account_id}`)
                 }
               {:else}
-                {
+                {@html
                   $locale.pages['me/invitations'].item_message_without_sender_html
                     .replace("@account", item.account ? item.account.name : `#${item.account_id}`)
                 }
diff --git a/front/server/src/api/shared-api.ts b/front/server/src/api/shared-api.ts
index 21274c2b..9f1cbb55 100644
--- a/front/server/src/api/shared-api.ts
+++ b/front/server/src/api/shared-api.ts
@@ -76,6 +76,16 @@ export const shared_api = ({
       return await client.accounts.list_members(ip(req), ua(req), get_token(req), req.params.account)
     }))
 
+  api.route("/accounts/:account/members/:member")
+    .delete(json(async req => {
+      return await client.accounts.delete_member(ip(req), ua(req), get_token(req), req.params.account, req.params.member)
+    }))
+
+  api.route("/accounts/:account/members/:member/set-role")
+    .post(json(async req => {
+      return await client.accounts.set_member_role(ip(req), ua(req), get_token(req), req.params.account, req.params.member, req.body);
+    }))
+
   api.route("/accounts/:account/stream-stats")
     .get(json(async req => {
       return await client.accounts.get_stream_stats(ip(req), ua(req), get_token(req), req.params.account);
@@ -294,6 +304,9 @@ export const shared_api = ({
     .get(json(async req => {
       return await client.invitations.get(ip(req), ua(req), get_token(req), req.params.invitation)
     }))
+    .delete(json(async req => {
+      return await client.invitations.delete(ip(req), ua(req), get_token(req), req.params.invitation)
+    }))
 
   api.route("/invitations/accept")
     .post(json(async req => {
diff --git a/front/server/src/client.ts b/front/server/src/client.ts
index 80112995..7fd75cab 100644
--- a/front/server/src/client.ts
+++ b/front/server/src/client.ts
@@ -340,6 +340,14 @@ export class Accounts {
     return await this.client.get(ip, ua, token, `/accounts/${account_id}/members`)
   }
 
+  async delete_member(ip: string | null, ua: string | null, token: string, account_id: string, member_id: string): Promise<import("$api/accounts/[account]/members/[member]/DELETE/Output").Output> {
+    return await this.client.delete(ip, ua, token, `/accounts/${account_id}/members/${member_id}`)
+  }
+
+  async set_member_role(ip: string | null, ua: string | null, token: string, account_id: string, member_id: string, payload: import("$api/accounts/[account]/members/[member]/set-role/POST/Payload").Payload): Promise<import("$api/accounts/[account]/members/[member]/set-role/POST/Output").Output> {
+    return await this.client.post(ip, ua, token, `/accounts/${account_id}/members/${member_id}/set-role`, payload);
+  }
+
   async get_stream_stats(ip: string | null, ua: string | null, token: string, account_id: string): Promise<import("$api/accounts/[account]/stream-stats/GET/Output").Output> {
     return await this.client.get(ip, ua, token, `/accounts/${account_id}/stream-stats`);
   }
@@ -644,6 +652,10 @@ export class AccountInvitations {
     return await this.client.get(ip, ua, token, `/invitations/${invitation_id}`);
   }
 
+  async delete(ip: string | null, ua: string | null, token: string, invitation_id: string): Promise<import("$api/invitations/[invitation]/DELETE/Output").Output> {
+    return await this.client.delete(ip, ua, token, `/invitations/${invitation_id}`);
+  }
+
   async get_by_token(ip: string | null, ua: string | null, token: string | null, invitation_token: string): Promise<import("$api/invitations/get-by-token/[token]/GET/Output").Output> {
     return await this.client.get(ip, ua, token, `/invitations/get-by-token/${invitation_token}`); 
   }
diff --git a/front/server/src/locale/studio/studio.ar.ts b/front/server/src/locale/studio/studio.ar.ts
index 32bbd066..65271a76 100644
--- a/front/server/src/locale/studio/studio.ar.ts
+++ b/front/server/src/locale/studio/studio.ar.ts
@@ -636,6 +636,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "تم إرسال الدعوة",
+        "member_access_revoked": "تم إلغاء وصول العضو",
+        "member_role_changed": "تم تحديث دور الوصول للعضو",
+      },
+
+      "actions": {
+        "set_role_to": "تعيين الدور إلى @role",
+        "revoke_access": "إلغاء الوصول",
+        "delete": "حذف",
       },
 
       "dialogs": {
@@ -723,6 +731,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "الملف الشخصي",
+    "invitations": "الدعوات",
     "accounts": "الحسابات",
     "stations": "المحطات",
     "sign_out": "تسجيل الخروج",
diff --git a/front/server/src/locale/studio/studio.de.ts b/front/server/src/locale/studio/studio.de.ts
index c5bc7f3d..6c5bb68a 100644
--- a/front/server/src/locale/studio/studio.de.ts
+++ b/front/server/src/locale/studio/studio.de.ts
@@ -638,6 +638,14 @@ const locale = {
 
       "notifier": {
         "invitation_sent": "Einladung gesendet",
+        "member_access_revoked": "Mitgliederzugriff widerrufen",
+        "member_role_changed": "Mitgliederzugriffsrolle aktualisiert",
+      },
+
+      "actions": {
+        "set_role_to": "Rolle auf @role setzen",
+        "revoke_access": "Zugriff widerrufen",
+        "delete": "Löschen",
       },
 
       "dialogs": {
@@ -725,6 +733,7 @@ const locale = {
 
   "user_menu": {
     "profile": "Profil",
+    "invitations": "Einladungen",
     "accounts": "Konten",
     "stations": "Stationen",
     "sign_out": "Abmelden",
diff --git a/front/server/src/locale/studio/studio.en.ts b/front/server/src/locale/studio/studio.en.ts
index b9dda271..81743061 100644
--- a/front/server/src/locale/studio/studio.en.ts
+++ b/front/server/src/locale/studio/studio.en.ts
@@ -637,6 +637,14 @@ const locale = {
 
       "notifier": {
         "invitation_sent": "Invitation sent",
+        "member_access_revoked": "Member access revoked",
+        "member_role_changed": "Member access role updated",
+      },
+
+      "actions": {
+        "set_role_to": "Set role to @role",
+        "revoke_access": "Revoke access",
+        "delete": "Delete",
       },
 
       "dialogs": {
@@ -724,6 +732,7 @@ const locale = {
 
   "user_menu": {
     "profile": "Profile",
+    "invitations": "Invitations",
     "accounts": "Accounts",
     "stations": "Stations",
     "sign_out": "Sign out",
diff --git a/front/server/src/locale/studio/studio.es-AR.ts b/front/server/src/locale/studio/studio.es-AR.ts
index 68149418..a4cea25d 100644
--- a/front/server/src/locale/studio/studio.es-AR.ts
+++ b/front/server/src/locale/studio/studio.es-AR.ts
@@ -639,6 +639,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "Invitación enviada",
+        "member_access_revoked": "Acceso revocado",
+        "member_role_changed": "Rol de acceso actualizado",
+      },
+
+      "actions": {
+        "set_role_to": "Establecer rol a @role",
+        "revoke_access": "Revocar acceso",
+        "delete": "Eliminar",
       },
 
       "dialogs": {
@@ -681,7 +689,7 @@ const locale: import("./studio.locale").StudioLocale = {
           "password": "Constraseña",
           "confirm_password": "Confirmar contraseña",
         },
-        "pre_message_html": "Para <b>aceptar</b> la invitación, completa el formulario.",
+        "pre_message_html": "Para <b>aceptar</b> la invitación, completá el formulario.",
         "title": "Registarme",
         "submit": "Enviar",
       },
@@ -726,6 +734,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "Perfil",
+    "invitations": "Invitaciones",
     "accounts": "Cuentas",
     "stations": "Estaciones",
     "sign_out": "Cerrar sesión",
diff --git a/front/server/src/locale/studio/studio.es.ts b/front/server/src/locale/studio/studio.es.ts
index 5e7f8d41..8533c3e5 100644
--- a/front/server/src/locale/studio/studio.es.ts
+++ b/front/server/src/locale/studio/studio.es.ts
@@ -636,6 +636,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "Invitación enviada",
+        "member_access_revoked": "Acceso revocado",
+        "member_role_changed": "Rol de acceso actualizado",
+      },
+
+      "actions": {
+        "set_role_to": "Establecer rol a @role",
+        "revoke_access": "Revocar acceso",
+        "delete": "Eliminar",
       },
 
       "dialogs": {
@@ -723,6 +731,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "Perfil",
+    "invitations": "Invitaciones",
     "accounts": "Cuentas",
     "stations": "Estaciones",
     "sign_out": "Cerrar sesión",
diff --git a/front/server/src/locale/studio/studio.fr.ts b/front/server/src/locale/studio/studio.fr.ts
index 854b09f8..8bd64a12 100644
--- a/front/server/src/locale/studio/studio.fr.ts
+++ b/front/server/src/locale/studio/studio.fr.ts
@@ -636,6 +636,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "Invitation envoyée",
+        "member_access_revoked": "Accès membre révoqué",
+        "member_role_changed": "Rôle d'accès membre mis à jour",
+      },
+
+      "actions": {
+        "set_role_to": "Définir le rôle à @role",
+        "revoke_access": "Révoquer l'accès",
+        "delete": "Supprimer",
       },
 
       "dialogs": {
@@ -723,6 +731,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "Profil",
+    "invitations": "Invitations",
     "accounts": "Comptes",
     "stations": "Stations",
     "sign_out": "Se déconnecter",
diff --git a/front/server/src/locale/studio/studio.it.ts b/front/server/src/locale/studio/studio.it.ts
index a04f5e92..ccb76e8d 100644
--- a/front/server/src/locale/studio/studio.it.ts
+++ b/front/server/src/locale/studio/studio.it.ts
@@ -637,6 +637,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "Invito inviato",
+        "member_access_revoked": "Accesso membro revocato",
+        "member_role_changed": "Ruolo di accesso membro aggiornato",
+      },
+
+      "actions": {
+        "set_role_to": "Imposta ruolo a @role",
+        "revoke_access": "Revoca accesso",
+        "delete": "Elimina",
       },
 
       "dialogs": {
@@ -724,6 +732,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "Profilo",
+    "invitations": "Inviti",
     "accounts": "Account",
     "stations": "Stazioni",
     "sign_out": "Esci",
diff --git a/front/server/src/locale/studio/studio.pt.ts b/front/server/src/locale/studio/studio.pt.ts
index 5e0b3999..afec465c 100644
--- a/front/server/src/locale/studio/studio.pt.ts
+++ b/front/server/src/locale/studio/studio.pt.ts
@@ -635,6 +635,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "Convite enviado",
+        "member_access_revoked": "Acesso do membro revogado",
+        "member_role_changed": "Função de acesso do membro atualizada",    
+      },
+
+      "actions": {
+        "set_role_to": "Definir função para @role",
+        "revoke_access": "Revogar acesso",
+        "delete": "Excluir",
       },
 
       "dialogs": {
@@ -722,6 +730,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "Perfil",
+    "invitations": "Convites",
     "accounts": "Contas",
     "stations": "Estações",
     "sign_out": "Sair",
diff --git a/front/server/src/locale/studio/studio.zh.ts b/front/server/src/locale/studio/studio.zh.ts
index c77c4c43..0bfd79c8 100644
--- a/front/server/src/locale/studio/studio.zh.ts
+++ b/front/server/src/locale/studio/studio.zh.ts
@@ -637,6 +637,14 @@ const locale: import("./studio.locale").StudioLocale = {
 
       "notifier": {
         "invitation_sent": "邀请已发送",
+        "member_access_revoked": "成员访问权限已撤销",
+        "member_role_changed": "成员访问角色已更新",
+      },
+
+      "actions": {
+        "set_role_to": "将角色设置为 @role",
+        "revoke_access": "撤销访问权限",
+        "delete": "删除",
       },
 
       "dialogs": {
@@ -724,6 +732,7 @@ const locale: import("./studio.locale").StudioLocale = {
 
   "user_menu": {
     "profile": "个人资料",
+    "invitations": "邀请",
     "accounts": "账户",
     "stations": "电台",
     "sign_out": "登出",
diff --git a/front/server/src/locale/wip/wip.ar.ts b/front/server/src/locale/wip/wip.ar.ts
index 15dc9feb..e0eb72b4 100644
--- a/front/server/src/locale/wip/wip.ar.ts
+++ b/front/server/src/locale/wip/wip.ar.ts
@@ -1,108 +1,13 @@
 /// file: wip.ar.ts
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "الأعضاء"
-      },
-      "title": "الأعضاء",
-
-      "no_owner_message_p1": "هذا القسم متاح فقط لمسؤولي الحساب",
-      "no_owner_message_p2": "تواصل مع مسؤولي الحساب إذا كنت بحاجة إلى دعوة أشخاص للمشاركة في هذا الحساب.",
-
-      "Pending_invitations": "دعوات معلقة",
-      "no_pending_invitations_message": "لا توجد دعوات معلقة",
-      "invite_btn_text": "دعوة أشخاص",
-
-      "validate": {
-        "user_account_exists": "المستخدم بالبريد الإلكتروني @email ينتمي بالفعل إلى هذا الحساب",
-      },
-
-      "notifier": {
-        "invitation_sent": "تم إرسال الدعوة",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "ادعو الأشخاص للمشاركة في هذا الحساب بدور @role",
-          "submit": "دعوة",
-          "Email": "البريد الإلكتروني",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "الدعوة غير موجودة",
-        "expired": "انتهت صلاحية الدعوة",
-        "accepted": "تم قبول الدعوة",
-        "rejected": "تم رفض الدعوة",
-        "ok": "دعوة معلقة",
-      },
-
-      "error_message": {
-        "not_found": "الرابط الذي استخدمته للوصول إلى هذه الصفحة لم يعد موجودًا أو تم حذفه",
-        "expired": "انتهت صلاحية الدعوة، اتصل بمسؤولي الحساب ليقوموا بإرسال دعوة جديدة لك",
-        "accepted": "تم قبول الدعوة",
-        "rejected": "تم رفض الدعوة، إذا كان هذا خطأ، اتصل بمسؤولي الحساب ليقوموا بإرسال دعوة جديدة لك",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> يدعوك للانضمام إلى <b>@account</b> في Openstream.",
-        "without_sender_name_html": "تمت دعوتك للانضمام إلى <b>@account</b> في Openstream",
-      },
-
-      "login_as_btn_html": "قم بتسجيل الدخول كـ <b>@email</b> لقبول الدعوة",
-
-      "form": {
-        "fields": {
-          "first_name": "اسمك الأول",
-          "last_name": "اسمك الأخير",
-          "email": "بريدك الإلكتروني",
-          "password": "كلمة المرور",
-          "confirm_password": "تأكيد كلمة المرور",
-        },
-        "pre_message_html": "ل<b>قبول</b> الدعوة، أكمل النموذج.",
-        "title": "تسجيل",
-        "submit": "إرسال",
-      },
-
-      "notifier": {
-        "accept_error": "حدث خطأ أثناء قبول الدعوة: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "دعوات معلقة",
-      },
-      "title": "دعوات معلقة",
-
-      "no_items_message": "ليس لديك دعوات معلقة",
-
-      "notifier": {
-        "accept_error": "حدث خطأ أثناء قبول الدعوة: @error",
-        "accepted": "تم قبول الدعوة",
-        "rejected": "تم رفض الدعوة",
-      },
-
-      "actions": {
-        "reject": "رفض",
-        "accept": "قبول",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> يدعوك للانضمام إلى <b>@account</b>",
-      "item_message_without_sender_html": "تمت دعوتك للانضمام إلى <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "رفض الدعوة",
-          "message": "هل أنت متأكد من رغبتك في رفض الدعوة؟",
-          "cancel": "إلغاء",
-          "reject": "رفض الدعوة",
-        }
-      }
-    }
+const locale = {
+  "actions": {
+    "set_role_to": "تعيين الدور إلى @role",
+    "revoke_access": "إلغاء الوصول",
+    "delete": "حذف",
+  },
+  "notifier": {
+    "member_access_revoked": "تم إلغاء وصول العضو",
+    "member_role_changed": "تم تحديث دور الوصول للعضو",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.de.ts b/front/server/src/locale/wip/wip.de.ts
index a61d413b..231fb0c1 100644
--- a/front/server/src/locale/wip/wip.de.ts
+++ b/front/server/src/locale/wip/wip.de.ts
@@ -1,108 +1,13 @@
 /// file: wip.de.ts
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Mitglieder"
-      },
-      "title": "Mitglieder",
-
-      "no_owner_message_p1": "Dieser Bereich ist nur für Kontoadministratoren verfügbar",
-      "no_owner_message_p2": "Wenden Sie sich an die Kontoadministratoren, wenn Sie Personen einladen möchten, um an diesem Konto teilzunehmen.",
-
-      "Pending_invitations": "Ausstehende Einladungen",
-      "no_pending_invitations_message": "Keine ausstehenden Einladungen",
-      "invite_btn_text": "Personen einladen",
-
-      "validate": {
-        "user_account_exists": "Der Benutzer mit der E-Mail-Adresse @email ist bereits Teil dieses Kontos",
-      },
-
-      "notifier": {
-        "invitation_sent": "Einladung gesendet",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Laden Sie Personen ein, an diesem Konto mit der Rolle @role teilzunehmen",
-          "submit": "Einladen",
-          "Email": "E-Mail",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Einladung nicht gefunden",
-        "expired": "Einladung abgelaufen",
-        "accepted": "Einladung bereits angenommen",
-        "rejected": "Einladung bereits abgelehnt",
-        "ok": "Ausstehende Einladung",
-      },
-
-      "error_message": {
-        "not_found": "Der Link, den Sie zum Aufrufen dieser Seite verwendet haben, existiert nicht mehr oder wurde gelöscht",
-        "expired": "Die Einladung ist abgelaufen, wenden Sie sich an die Kontoadministratoren, damit sie Ihnen eine neue Einladung senden",
-        "accepted": "Die Einladung wurde bereits angenommen",
-        "rejected": "Die Einladung wurde bereits abgelehnt, wenn dies ein Fehler war, wenden Sie sich an die Kontoadministratoren, damit sie Ihnen eine neue Einladung senden",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> lädt Sie ein, sich <b>@account</b> bei Openstream anzuschließen.",
-        "without_sender_name_html": "Sie wurden eingeladen, sich <b>@account</b> bei Openstream anzuschließen",
-      },
-
-      "login_as_btn_html": "Melden Sie sich als <b>@email</b> an, um die Einladung anzunehmen",
-
-      "form": {
-        "fields": {
-          "first_name": "Dein Vorname",
-          "last_name": "Dein Nachname",
-          "email": "Deine E-Mail",
-          "password": "Passwort",
-          "confirm_password": "Passwort bestätigen",
-        },
-        "pre_message_html": "Um die Einladung <b>anzunehmen</b>, füllen Sie das Formular aus.",
-        "title": "Registrieren",
-        "submit": "Absenden",
-      },
-
-      "notifier": {
-        "accept_error": "Es gab einen Fehler beim Annehmen der Einladung: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Ausstehende Einladungen",
-      },
-      "title": "Ausstehende Einladungen",
-
-      "no_items_message": "Sie haben keine ausstehenden Einladungen",
-
-      "notifier": {
-        "accept_error": "Es gab einen Fehler beim Annehmen der Einladung: @error",
-        "accepted": "Einladung angenommen",
-        "rejected": "Einladung abgelehnt",
-      },
-
-      "actions": {
-        "reject": "Ablehnen",
-        "accept": "Annehmen",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> lädt Sie ein, sich <b>@account</b> anzuschließen",
-      "item_message_without_sender_html": "Sie wurden eingeladen, sich <b>@account</b> anzuschließen",
-
-      "dialogs": {
-        "reject": {
-          "title": "Einladung ablehnen",
-          "message": "Sind Sie sicher, dass Sie die Einladung ablehnen möchten?",
-          "cancel": "Abbrechen",
-          "reject": "Einladung ablehnen",
-        }
-      }
-    }
+const locale = {
+  "actions": {
+    "set_role_to": "Rolle auf @role setzen",
+    "revoke_access": "Zugriff widerrufen",
+    "delete": "Löschen",
+  },
+  "notifier": {
+    "member_access_revoked": "Mitgliederzugriff widerrufen",
+    "member_role_changed": "Mitgliederzugriffsrolle aktualisiert",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.en.ts b/front/server/src/locale/wip/wip.en.ts
index 64935d30..19e29efb 100644
--- a/front/server/src/locale/wip/wip.en.ts
+++ b/front/server/src/locale/wip/wip.en.ts
@@ -1,108 +1,13 @@
 const locale = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Members"
-      },
-      "title": "Members",
-
-      "no_owner_message_p1": "This section is only available for account administrators.",
-      "no_owner_message_p2": "Contact the account administrators if you need to invite people to this account.",
-
-      "Pending_invitations": "Pending invitations",
-      "no_pending_invitations_message": "There are no pending invitations",
-      "invite_btn_text": "Invite people",
-
-      "validate": {
-        "user_account_exists": "The user with email @email is already a member of the account",
-      },
-
-      "notifier": {
-        "invitation_sent": "Invitation sent",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Invite people to manage this account with @role role",
-          "submit": "Invite",
-          "Email": "Email",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Invitation not found",
-        "expired": "Invitation has expired",
-        "accepted": "Invitation already accepted",
-        "rejected": "Invitation already rejected",
-        "ok": "Pending invitation",
-      },
-
-      "error_message": {
-        "not_found": "The link used to access this page has doesn't exist or has been deleted",
-        "expired": "The invitation has expired, ask the administrators of the account to send a new invitation",
-        "accepted": "This invitation has already been accepted",
-        "rejected": "This invitation has already been rejected, if that was an error, ask the administrators of the account to send a new invitation",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> has invited you to join <b>@account</b> at Openstream.",
-        "without_sender_name_html": "You have been invited yo join <b>@account</b> at Openstream",
-      },
-
-      "login_as_btn_html": "Login as <b>@email</b> to accept the invitation",
-
-      "form": {
-        "fields": {
-          "first_name": "Yout first name",
-          "last_name": "Yout last name",
-          "email": "Your email",
-          "password": "Password",
-          "confirm_password": "Confirm password",
-        },
-        "pre_message_html": "To <b>accept</b> the invitation, fill the form.",
-        "title": "Sign up",
-        "submit": "Submit",
-      },
-
-      "notifier": {
-        "accept_error": "There was an error accepting the invitaiton: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Pending invitations",     
-      },
-      "title": "Pending invitations",
-      
-      "no_items_message": "You don't have any pending invitations",
-
-      "notifier": {
-        "accept_error": "There was an error accepting the invitation: @error",
-        "accepted": "Invitation accepted",
-        "rejected": "Invitation rejected",
-      },
-
-      "actions": {
-        "reject": "Reject",
-        "accept": "Accept",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> has invited you to join <b>@account</b>",
-      "item_message_without_sender_html":  "You have been invited to join <b>@account</b>",
-      
-      "dialogs": {
-        "reject": {
-          "title": "Reject invitation",
-          "message": "Are you sure you want to reject the invitation?",
-          "cancel": "Cancel",
-          "reject": "Reject invitation",
-        }
-      }
-    }
+  "actions": {
+    "set_role_to": "Set role to @role",
+    "revoke_access": "Revoke access",
+    "delete": "Delete",
   },
+  "notifier": {
+    "member_access_revoked": "Member access revoked",
+    "member_role_changed": "Member access role updated",
+  }
 }
 
 export default locale;
\ No newline at end of file
diff --git a/front/server/src/locale/wip/wip.es-AR.ts b/front/server/src/locale/wip/wip.es-AR.ts
index 97787736..64515c0e 100644
--- a/front/server/src/locale/wip/wip.es-AR.ts
+++ b/front/server/src/locale/wip/wip.es-AR.ts
@@ -1,107 +1,13 @@
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Miembros"
-      },
-      "title": "Miembros",
-
-      "no_owner_message_p1": "Esta sección esta disponible solo para los administradores de la cuenta",
-      "no_owner_message_p2": "Contactate con los administradores de la cuenta si necesitás invitar gente a participar en esta cuenta.",
-
-      "Pending_invitations": "Invitaciones pendientes",
-      "no_pending_invitations_message": "No hay invitaciones pendientes",
-      "invite_btn_text": "Invitar personas",
-
-      "validate": {
-        "user_account_exists": "El usuario con email @email ya forma parte de esta cuenta",
-      },
-
-      "notifier": {
-        "invitation_sent": "Invitación enviada",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Invitá personas a participar de este cuenta con rol @role",
-          "submit": "Invitar",
-          "Email": "Email",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Invitación no encontrada",
-        "expired": "La invitación ha expirado",
-        "accepted": "La invitatión ya fue aceptada",
-        "rejected": "La invitación ya fue rechazada",
-        "ok": "Invitación pendiente",
-      },
-
-      "error_message": {
-        "not_found": "El link que usaste para acceder a esta página ya no existe o fue eliminado",
-        "expired": "La invitación ha expirado, contactate con los administradores de la cuenta para que te envíen una nueva invitación",
-        "accepted": "La invitación ya fue aceptada",
-        "rejected": "La invitación ya fue rechazada, si fue un error, contáctate con los administradores de la cuenta para que te envíen una nueva invitación",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> te está invitando a que te unas a <b>@account</b> en Openstream.",
-        "without_sender_name_html": "Fuiste invitado a unirte a <b>@account</b> en Openstream",
-      },
-
-      "login_as_btn_html": "Ingresá como <b>@email</b> para aceptar la invitación",
-
-      "form": {
-        "fields": {
-          "first_name": "Tu nombre",
-          "last_name": "Tu apellido",
-          "email": "Tu email",
-          "password": "Constraseña",
-          "confirm_password": "Confirmar contraseña",
-        },
-        "pre_message_html": "Para <b>aceptar</b> la invitación, completa el formulario.",
-        "title": "Registarme",
-        "submit": "Enviar",
-      },
-
-      "notifier": {
-        "accept_error": "Hubo un error aceptando la invitacion: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Invitaciones pendientes",
-      },
-      "title": "Invitaciones pendientes",
-
-      "no_items_message": "No tenés invitaciones pendientes",
-
-      "notifier": {
-        "accept_error": "Hubo un error aceptando la invtación: @error",
-        "accepted": "Invitación aceptada",
-        "rejected": "Invitación rechazada",
-      },
-
-      "actions": {
-        "reject": "Rechazar",
-        "accept": "Aceptar",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> te esta invitando a que te unas a <b>@account</b>",
-      "item_message_without_sender_html": "Fuiste invitado a unirte a <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "Rechazar invitación",
-          "message": "¿Estás seguro de que querés rechazar la invitación?",
-          "cancel": "Cancelar",
-          "reject": "Rechazar invitación",
-        }
-      }
-    }
+/// file: wip.es-AR.ts
+const locale = {
+  "actions": {
+    "set_role_to": "Establecer rol a @role",
+    "revoke_access": "Revocar acceso",
+    "delete": "Eliminar",
+  },
+  "notifier": {
+    "member_access_revoked": "Acceso de miembro revocado",
+    "member_role_changed": "Rol de acceso de miembro actualizado",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.es.ts b/front/server/src/locale/wip/wip.es.ts
index 8a5f1a91..b33e451f 100644
--- a/front/server/src/locale/wip/wip.es.ts
+++ b/front/server/src/locale/wip/wip.es.ts
@@ -1,107 +1,13 @@
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Miembros"
-      },
-      "title": "Miembros",
-
-      "no_owner_message_p1": "Esta sección esta disponible solo para los administradores de la cuenta",
-      "no_owner_message_p2": "Contáctate con los administradores de la cuenta si necesitas invitar gente a participar en esta cuenta.",
-
-      "Pending_invitations": "Invitaciones pendientes",
-      "no_pending_invitations_message": "No hay invitaciones pendientes",
-      "invite_btn_text": "Invitar personas",
-
-      "validate": {
-        "user_account_exists": "El usuario con email @email ya forma parte de esta cuenta",
-      },
-
-      "notifier": {
-        "invitation_sent": "Invitación enviada",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Invita personas a participar de este cuenta con rol @role",
-          "submit": "Invitar",
-          "Email": "Email",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Invitaciónno encontrada",
-        "expired": "La invitaciónha expirado",
-        "accepted": "La invitation ya fue aceptada",
-        "rejected": "La invitación ya fue rechazada",
-        "ok": "Invitación pendiente",
-      },
-
-      "error_message": {
-        "not_found": "El link que usaste para acceder a esta página ya no existe o fue eliminado",
-        "expired": "La invitación ha expirado, contáctate con los administradores de la cuenta para que te envíen una nueva invitación",
-        "accepted": "La invitación ya fue aceptada",
-        "rejected": "La invitación ya fue rechazada, si fue un error, contáctate con los administradores de la cuenta para que te envíen una nueva invitación",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> te está invitando a que te unas a <b>@account</b> en Openstream.",
-        "without_sender_name_html": "Fuiste invitado a unirte a <b>@account</b> en Openstream",
-      },
-
-      "login_as_btn_html": "Ingresa como <b>@email</b> para aceptar la invitación",
-
-      "form": {
-        "fields": {
-          "first_name": "Tu nombre",
-          "last_name": "Tu apellido",
-          "email": "Tu email",
-          "password": "Constraseña",
-          "confirm_password": "Confirmar contraseña",
-        },
-        "pre_message_html": "Para <b>aceptar</b> la invitación, completa el formulario.",
-        "title": "Registarme",
-        "submit": "Enviar",
-      },
-
-      "notifier": {
-        "accept_error": "Hubo un error aceptando la invitacion: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Invitaciones pendientes",
-      },
-      "title": "Invitaciones pendientes",
-
-      "no_items_message": "No tienes invitaciones pendientes",
-
-      "notifier": {
-        "accept_error": "Hubo un error aceptando la invtación: @error",
-        "accepted": "Invitación aceptada",
-        "rejected": "Invitación rechazada",
-      },
-
-      "actions": {
-        "reject": "Rechazar",
-        "accept": "Aceptar",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> te esta invitando a que te unas a <b>@account</b>",
-      "item_message_without_sender_html": "Fuiste invitado a unirte a <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "Rechazar invitación",
-          "message": "¿Estás seguro de que quieres rechazar la invitación?",
-          "cancel": "Cancelar",
-          "reject": "Rechazar invitación",
-        }
-      }
-    }
+/// file: wip.es.ts
+const locale = {
+  "actions": {
+    "set_role_to": "Establecer rol a @role",
+    "revoke_access": "Revocar acceso",
+    "delete": "Eliminar",
+  },
+  "notifier": {
+    "member_access_revoked": "Acceso de miembro revocado",
+    "member_role_changed": "Rol de acceso de miembro actualizado",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.fr.ts b/front/server/src/locale/wip/wip.fr.ts
index fbcef594..9a5dd573 100644
--- a/front/server/src/locale/wip/wip.fr.ts
+++ b/front/server/src/locale/wip/wip.fr.ts
@@ -1,108 +1,13 @@
 /// file: wip.fr.ts
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Membres"
-      },
-      "title": "Membres",
-
-      "no_owner_message_p1": "Cette section est disponible uniquement pour les administrateurs du compte",
-      "no_owner_message_p2": "Contactez les administrateurs du compte si vous avez besoin d'inviter des personnes à participer à ce compte.",
-
-      "Pending_invitations": "Invitations en attente",
-      "no_pending_invitations_message": "Aucune invitation en attente",
-      "invite_btn_text": "Inviter des personnes",
-
-      "validate": {
-        "user_account_exists": "L'utilisateur avec l'email @email fait déjà partie de ce compte",
-      },
-
-      "notifier": {
-        "invitation_sent": "Invitation envoyée",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Invitez des personnes à participer à ce compte avec le rôle @role",
-          "submit": "Inviter",
-          "Email": "Email",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Invitation non trouvée",
-        "expired": "L'invitation a expiré",
-        "accepted": "L'invitation a déjà été acceptée",
-        "rejected": "L'invitation a déjà été refusée",
-        "ok": "Invitation en attente",
-      },
-
-      "error_message": {
-        "not_found": "Le lien que vous avez utilisé pour accéder à cette page n'existe plus ou a été supprimé",
-        "expired": "L'invitation a expiré, contactez les administrateurs du compte pour qu'ils vous envoient une nouvelle invitation",
-        "accepted": "L'invitation a déjà été acceptée",
-        "rejected": "L'invitation a déjà été refusée, si c'était une erreur, contactez les administrateurs du compte pour qu'ils vous envoient une nouvelle invitation",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> vous invite à rejoindre <b>@account</b> sur Openstream.",
-        "without_sender_name_html": "Vous avez été invité à rejoindre <b>@account</b> sur Openstream",
-      },
-
-      "login_as_btn_html": "Connectez-vous en tant que <b>@email</b> pour accepter l'invitation",
-
-      "form": {
-        "fields": {
-          "first_name": "Votre prénom",
-          "last_name": "Votre nom",
-          "email": "Votre email",
-          "password": "Mot de passe",
-          "confirm_password": "Confirmer le mot de passe",
-        },
-        "pre_message_html": "Pour <b>accepter</b> l'invitation, remplissez le formulaire.",
-        "title": "M'inscrire",
-        "submit": "Envoyer",
-      },
-
-      "notifier": {
-        "accept_error": "Une erreur s'est produite lors de l'acceptation de l'invitation : @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Invitations en attente",
-      },
-      "title": "Invitations en attente",
-
-      "no_items_message": "Vous n'avez pas d'invitations en attente",
-
-      "notifier": {
-        "accept_error": "Une erreur s'est produite lors de l'acceptation de l'invitation : @error",
-        "accepted": "Invitation acceptée",
-        "rejected": "Invitation refusée",
-      },
-
-      "actions": {
-        "reject": "Refuser",
-        "accept": "Accepter",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> vous invite à rejoindre <b>@account</b>",
-      "item_message_without_sender_html": "Vous avez été invité à rejoindre <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "Refuser l'invitation",
-          "message": "Êtes-vous sûr de vouloir refuser l'invitation ?",
-          "cancel": "Annuler",
-          "reject": "Refuser l'invitation",
-        }
-      }
-    }
+const locale = {
+  "actions": {
+    "set_role_to": "Définir le rôle à @role",
+    "revoke_access": "Révoquer l'accès",
+    "delete": "Supprimer",
+  },
+  "notifier": {
+    "member_access_revoked": "Accès membre révoqué",
+    "member_role_changed": "Rôle d'accès membre mis à jour",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.it.ts b/front/server/src/locale/wip/wip.it.ts
index b93f7236..d98de584 100644
--- a/front/server/src/locale/wip/wip.it.ts
+++ b/front/server/src/locale/wip/wip.it.ts
@@ -1,108 +1,13 @@
 /// file: wip.it.ts
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Membri"
-      },
-      "title": "Membri",
-
-      "no_owner_message_p1": "Questa sezione è disponibile solo per gli amministratori dell'account",
-      "no_owner_message_p2": "Contatta gli amministratori dell'account se hai bisogno di invitare persone a partecipare a questo account.",
-
-      "Pending_invitations": "Inviti in sospeso",
-      "no_pending_invitations_message": "Non ci sono inviti in sospeso",
-      "invite_btn_text": "Invita persone",
-
-      "validate": {
-        "user_account_exists": "L'utente con email @email fa già parte di questo account",
-      },
-
-      "notifier": {
-        "invitation_sent": "Invito inviato",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Invita persone a partecipare a questo account con ruolo @role",
-          "submit": "Invita",
-          "Email": "Email",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Invito non trovato",
-        "expired": "L'invito è scaduto",
-        "accepted": "L'invito è stato accettato",
-        "rejected": "L'invito è stato rifiutato",
-        "ok": "Invito in sospeso",
-      },
-
-      "error_message": {
-        "not_found": "Il link che hai usato per accedere a questa pagina non esiste più o è stato eliminato",
-        "expired": "L'invito è scaduto, contatta gli amministratori dell'account per ricevere un nuovo invito",
-        "accepted": "L'invito è stato accettato",
-        "rejected": "L'invito è stato rifiutato, se è stato un errore, contatta gli amministratori dell'account per ricevere un nuovo invito",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> ti sta invitando a unirti a <b>@account</b> su Openstream.",
-        "without_sender_name_html": "Sei stato invitato a unirti a <b>@account</b> su Openstream",
-      },
-
-      "login_as_btn_html": "Accedi come <b>@email</b> per accettare l'invito",
-
-      "form": {
-        "fields": {
-          "first_name": "Il tuo nome",
-          "last_name": "Il tuo cognome",
-          "email": "La tua email",
-          "password": "Password",
-          "confirm_password": "Conferma password",
-        },
-        "pre_message_html": "Per <b>accettare</b> l'invito, completa il modulo.",
-        "title": "Registrati",
-        "submit": "Invia",
-      },
-
-      "notifier": {
-        "accept_error": "Si è verificato un errore nell'accettare l'invito: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Inviti in sospeso",
-      },
-      "title": "Inviti in sospeso",
-
-      "no_items_message": "Non hai inviti in sospeso",
-
-      "notifier": {
-        "accept_error": "Si è verificato un errore nell'accettare l'invito: @error",
-        "accepted": "Invito accettato",
-        "rejected": "Invito rifiutato",
-      },
-
-      "actions": {
-        "reject": "Rifiuta",
-        "accept": "Accetta",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> ti sta invitando a unirti a <b>@account</b>",
-      "item_message_without_sender_html": "Sei stato invitato a unirti a <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "Rifiuta invito",
-          "message": "Sei sicuro di voler rifiutare l'invito?",
-          "cancel": "Annulla",
-          "reject": "Rifiuta invito",
-        }
-      }
-    }
+const locale = {
+  "actions": {
+    "set_role_to": "Imposta ruolo a @role",
+    "revoke_access": "Revoca accesso",
+    "delete": "Elimina",
+  },
+  "notifier": {
+    "member_access_revoked": "Accesso membro revocato",
+    "member_role_changed": "Ruolo di accesso membro aggiornato",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.pt.ts b/front/server/src/locale/wip/wip.pt.ts
index 065b0339..b291e1e0 100644
--- a/front/server/src/locale/wip/wip.pt.ts
+++ b/front/server/src/locale/wip/wip.pt.ts
@@ -1,108 +1,13 @@
 /// file: wip.pt.ts
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "Membros"
-      },
-      "title": "Membros",
-
-      "no_owner_message_p1": "Esta seção está disponível apenas para os administradores da conta",
-      "no_owner_message_p2": "Entre em contato com os administradores da conta se precisar convidar pessoas para participar desta conta.",
-
-      "Pending_invitations": "Convites pendentes",
-      "no_pending_invitations_message": "Não há convites pendentes",
-      "invite_btn_text": "Convidar pessoas",
-
-      "validate": {
-        "user_account_exists": "O usuário com email @email já faz parte desta conta",
-      },
-
-      "notifier": {
-        "invitation_sent": "Convite enviado",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "Convide pessoas para participar desta conta com a função @role",
-          "submit": "Convidar",
-          "Email": "Email",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "Convite não encontrado",
-        "expired": "O convite expirou",
-        "accepted": "O convite já foi aceito",
-        "rejected": "O convite já foi rejeitado",
-        "ok": "Convite pendente",
-      },
-
-      "error_message": {
-        "not_found": "O link que você usou para acessar esta página não existe ou foi removido",
-        "expired": "O convite expirou, entre em contato com os administradores da conta para que eles enviem um novo convite",
-        "accepted": "O convite já foi aceito",
-        "rejected": "O convite já foi rejeitado, se foi um erro, entre em contato com os administradores da conta para que eles enviem um novo convite",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> está te convidando para se juntar a <b>@account</b> no Openstream.",
-        "without_sender_name_html": "Você foi convidado para se juntar a <b>@account</b> no Openstream",
-      },
-
-      "login_as_btn_html": "Entre como <b>@email</b> para aceitar o convite",
-
-      "form": {
-        "fields": {
-          "first_name": "Seu nome",
-          "last_name": "Seu sobrenome",
-          "email": "Seu email",
-          "password": "Senha",
-          "confirm_password": "Confirmar senha",
-        },
-        "pre_message_html": "Para <b>aceitar</b> o convite, preencha o formulário.",
-        "title": "Registrar-me",
-        "submit": "Enviar",
-      },
-
-      "notifier": {
-        "accept_error": "Houve um erro ao aceitar o convite: @error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "Convites pendentes",
-      },
-      "title": "Convites pendentes",
-
-      "no_items_message": "Você não tem convites pendentes",
-
-      "notifier": {
-        "accept_error": "Houve um erro ao aceitar o convite: @error",
-        "accepted": "Convite aceito",
-        "rejected": "Convite rejeitado",
-      },
-
-      "actions": {
-        "reject": "Rejeitar",
-        "accept": "Aceitar",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> está te convidando para se juntar a <b>@account</b>",
-      "item_message_without_sender_html": "Você foi convidado para se juntar a <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "Rejeitar convite",
-          "message": "Tem certeza de que deseja rejeitar o convite?",
-          "cancel": "Cancelar",
-          "reject": "Rejeitar convite",
-        }
-      }
-    }
+const locale = {
+  "actions": {
+    "set_role_to": "Definir função para @role",
+    "revoke_access": "Revogar acesso",
+    "delete": "Excluir",
+  },
+  "notifier": {
+    "member_access_revoked": "Acesso do membro revogado",
+    "member_role_changed": "Função de acesso do membro atualizada",
   }
 }
 
diff --git a/front/server/src/locale/wip/wip.zh.ts b/front/server/src/locale/wip/wip.zh.ts
index 0db1c582..cd057eae 100644
--- a/front/server/src/locale/wip/wip.zh.ts
+++ b/front/server/src/locale/wip/wip.zh.ts
@@ -1,108 +1,13 @@
 /// file: wip.zh.ts
-const locale: typeof import("./wip.en").default = {
-  "pages": {
-    "account/members": {
-      "head": {
-        "title": "成员"
-      },
-      "title": "成员",
-
-      "no_owner_message_p1": "此部分仅供帐户管理员使用",
-      "no_owner_message_p2": "如果您需要邀请其他人参加此帐户，请与帐户管理员联系。",
-
-      "Pending_invitations": "待处理的邀请",
-      "no_pending_invitations_message": "没有待处理的邀请",
-      "invite_btn_text": "邀请人员",
-
-      "validate": {
-        "user_account_exists": "电子邮件为 @email 的用户已经是此帐户的成员",
-      },
-
-      "notifier": {
-        "invitation_sent": "邀请已发送",
-      },
-
-      "dialogs": {
-        "invite": {
-          "title": "邀请人员以 @role 角色加入此帐户",
-          "submit": "邀请",
-          "Email": "电子邮件",
-        }
-      }
-    },
-
-    "email_invitation": {
-      "head_page_title": {
-        "not_found": "未找到邀请",
-        "expired": "邀请已过期",
-        "accepted": "邀请已被接受",
-        "rejected": "邀请已被拒绝",
-        "ok": "待处理的邀请",
-      },
-
-      "error_message": {
-        "not_found": "您用于访问此页面的链接已不存在或已被删除",
-        "expired": "邀请已过期，请联系帐户管理员以获取新的邀请",
-        "accepted": "邀请已被接受",
-        "rejected": "邀请已被拒绝，如果是错误，请联系帐户管理员以获取新的邀请",
-      },
-
-      "description": {
-        "with_sender_name_html": "<b>@sender</b> 邀请您加入 Openstream 的 <b>@account</b>。",
-        "without_sender_name_html": "您被邀请加入 Openstream 的 <b>@account</b>",
-      },
-
-      "login_as_btn_html": "以 <b>@email</b> 登录以接受邀请",
-
-      "form": {
-        "fields": {
-          "first_name": "您的名字",
-          "last_name": "您的姓氏",
-          "email": "您的电子邮件",
-          "password": "密码",
-          "confirm_password": "确认密码",
-        },
-        "pre_message_html": "要<b>接受</b>邀请，请填写表格。",
-        "title": "注册",
-        "submit": "提交",
-      },
-
-      "notifier": {
-        "accept_error": "接受邀请时出错：@error"
-      }
-    },
-
-    "me/invitations": {
-      "head": {
-        "title": "待处理的邀请",
-      },
-      "title": "待处理的邀请",
-
-      "no_items_message": "您没有待处理的邀请",
-
-      "notifier": {
-        "accept_error": "接受邀请时出错：@error",
-        "accepted": "邀请已接受",
-        "rejected": "邀请已拒绝",
-      },
-
-      "actions": {
-        "reject": "拒绝",
-        "accept": "接受",
-      },
-
-      "item_message_with_sender_html": "<b>@sender</b> 邀请您加入 <b>@account</b>",
-      "item_message_without_sender_html": "您被邀请加入 <b>@account</b>",
-
-      "dialogs": {
-        "reject": {
-          "title": "拒绝邀请",
-          "message": "您确定要拒绝邀请吗？",
-          "cancel": "取消",
-          "reject": "拒绝邀请",
-        }
-      }
-    }
+const locale = {
+  "actions": {
+    "set_role_to": "将角色设置为 @role",
+    "revoke_access": "撤销访问权限",
+    "delete": "删除",
+  },
+  "notifier": {
+    "member_access_revoked": "成员访问权限已撤销",
+    "member_role_changed": "成员访问角色已更新",
   }
 }
 
diff --git a/rs/packages/api/src/routes/accounts/members/id.rs b/rs/packages/api/src/routes/accounts/members/id.rs
new file mode 100644
index 00000000..32ccd2d0
--- /dev/null
+++ b/rs/packages/api/src/routes/accounts/members/id.rs
@@ -0,0 +1,217 @@
+use super::*;
+
+pub mod delete {
+
+  use crate::error::ApiError;
+
+  use super::*;
+  use db::models::user_account_relation::UserAccountRelation;
+  use serde_util::empty_struct::EmptyStruct;
+
+  #[derive(Debug, Clone)]
+  pub struct Endpoint {}
+
+  #[derive(Debug, Clone)]
+  pub struct Input {
+    member_id: String,
+    account_id: String,
+  }
+
+  #[derive(Debug, Clone, Serialize, Deserialize, TS)]
+  #[ts(export)]
+  #[ts(export_to = "../../../defs/api/accounts/[account]/members/[member]/DELETE/")]
+  pub struct Output(EmptyStruct);
+
+  #[derive(Debug, thiserror::Error)]
+  pub enum HandleError {
+    #[error("db: {0}")]
+    Db(#[from] mongodb::error::Error),
+    #[error("user not found: {0}")]
+    UserNotFound(String),
+  }
+
+  impl From<HandleError> for ApiError {
+    fn from(e: HandleError) -> Self {
+      match e {
+        HandleError::Db(e) => e.into(),
+        HandleError::UserNotFound(id) => ApiError::UserNotFound(id),
+      }
+    }
+  }
+
+  #[async_trait]
+  impl JsonHandler for Endpoint {
+    type Input = Input;
+    type Output = Output;
+    type ParseError = GetAccessTokenScopeError;
+    type HandleError = HandleError;
+
+    async fn parse(&self, req: Request) -> Result<Self::Input, Self::ParseError> {
+      let account_id = req.param("account").unwrap();
+      let member_id = req.param("member").unwrap().to_string();
+      let access_token_scope = request_ext::get_access_token_scope(&req).await?;
+      let account = access_token_scope
+        .grant_account_owner_scope(account_id)
+        .await?;
+
+      Ok(Input {
+        account_id: account.id,
+        member_id,
+      })
+    }
+
+    async fn perform(&self, input: Input) -> Result<Output, Self::HandleError> {
+      let Self::Input {
+        account_id,
+        member_id,
+      } = input;
+
+      let filter = doc! { UserAccountRelation::KEY_ACCOUNT_ID: &account_id, UserAccountRelation::KEY_USER_ID: &member_id };
+      let r = UserAccountRelation::cl().delete_many(filter, None).await?;
+      if r.deleted_count == 0 {
+        return Err(HandleError::UserNotFound(member_id));
+      };
+
+      Ok(Output(EmptyStruct(())))
+    }
+  }
+}
+
+pub mod set_role {
+  use super::*;
+
+  pub mod post {
+    use super::*;
+
+    use crate::error::ApiError;
+
+    use db::{
+      models::user_account_relation::UserAccountRelation,
+      user_account_relation::UserAccountRelationKind,
+    };
+    use prex::request::ReadBodyJsonError;
+    use serde_util::empty_struct::EmptyStruct;
+
+    #[derive(Debug, Clone)]
+    pub struct Endpoint {}
+
+    #[derive(Debug, Clone)]
+    pub struct Input {
+      member_id: String,
+      account_id: String,
+      payload: Payload,
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize, TS)]
+    #[ts(export)]
+    #[ts(export_to = "../../../defs/api/accounts/[account]/members/[member]/set-role/POST/")]
+    pub struct Payload {
+      role: AccessKind,
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize, TS)]
+    #[ts(export)]
+    #[ts(export_to = "../../../defs/api/accounts/[account]/members/[member]/set-role/POST/")]
+    pub enum AccessKind {
+      #[serde(rename = "owner")]
+      Owner,
+      #[serde(rename = "staff")]
+      Staff,
+    }
+
+    #[derive(Debug, Clone, Serialize, Deserialize, TS)]
+    #[ts(export)]
+    #[ts(export_to = "../../../defs/api/accounts/[account]/members/[member]/set-role/POST/")]
+    pub struct Output(EmptyStruct);
+
+    #[derive(Debug, thiserror::Error)]
+    pub enum ParseError {
+      #[error("token: {0}")]
+      Token(#[from] GetAccessTokenScopeError),
+      #[error("payload: {0}")]
+      Payload(#[from] ReadBodyJsonError),
+    }
+
+    impl From<ParseError> for ApiError {
+      fn from(e: ParseError) -> Self {
+        match e {
+          ParseError::Token(e) => e.into(),
+          ParseError::Payload(e) => e.into(),
+        }
+      }
+    }
+
+    #[derive(Debug, thiserror::Error)]
+    pub enum HandleError {
+      #[error("db: {0}")]
+      Db(#[from] mongodb::error::Error),
+      #[error("user not found: {0}")]
+      UserNotFound(String),
+    }
+
+    impl From<HandleError> for ApiError {
+      fn from(e: HandleError) -> Self {
+        match e {
+          HandleError::Db(e) => e.into(),
+          HandleError::UserNotFound(id) => ApiError::UserNotFound(id),
+        }
+      }
+    }
+
+    #[async_trait]
+    impl JsonHandler for Endpoint {
+      type Input = Input;
+      type Output = Output;
+      type ParseError = ParseError;
+      type HandleError = HandleError;
+
+      async fn parse(&self, mut req: Request) -> Result<Self::Input, Self::ParseError> {
+        let account_id = req.param("account").unwrap().to_string();
+        let member_id = req.param("member").unwrap().to_string();
+        let payload = req.read_body_json(1_000).await?;
+
+        let access_token_scope = request_ext::get_access_token_scope(&req).await?;
+
+        access_token_scope
+          .grant_account_owner_scope(&account_id)
+          .await?;
+
+        Ok(Input {
+          account_id,
+          member_id,
+          payload,
+        })
+      }
+
+      async fn perform(&self, input: Input) -> Result<Output, Self::HandleError> {
+        let Self::Input {
+          account_id,
+          member_id,
+          payload,
+        } = input;
+
+        let Payload { role } = payload;
+
+        let kind_str = match role {
+          AccessKind::Owner => UserAccountRelationKind::KEY_ENUM_VARIANT_OWNER,
+          AccessKind::Staff => UserAccountRelationKind::KEY_ENUM_VARIANT_STAFF,
+        };
+
+        let filter = doc! { UserAccountRelation::KEY_ACCOUNT_ID: &account_id, UserAccountRelation::KEY_USER_ID: &member_id };
+        let update = doc! {
+          "$set": { UserAccountRelation::KEY_KIND: kind_str }
+        };
+
+        let r = UserAccountRelation::cl()
+          .update_many(filter, update, None)
+          .await?;
+
+        if r.matched_count == 0 {
+          return Err(HandleError::UserNotFound(member_id));
+        };
+
+        Ok(Output(EmptyStruct(())))
+      }
+    }
+  }
+}
diff --git a/rs/packages/api/src/routes/accounts/members.rs b/rs/packages/api/src/routes/accounts/members/mod.rs
similarity index 99%
rename from rs/packages/api/src/routes/accounts/members.rs
rename to rs/packages/api/src/routes/accounts/members/mod.rs
index a0bcde9d..9730df7d 100644
--- a/rs/packages/api/src/routes/accounts/members.rs
+++ b/rs/packages/api/src/routes/accounts/members/mod.rs
@@ -8,6 +8,8 @@ use prex::Request;
 use serde::{Deserialize, Serialize};
 use ts_rs::TS;
 
+pub mod id;
+
 pub mod get {
 
   use db::{
diff --git a/rs/packages/api/src/routes/invitations/accept.rs b/rs/packages/api/src/routes/invitations/accept.rs
index b9e6e03b..d1cdea14 100644
--- a/rs/packages/api/src/routes/invitations/accept.rs
+++ b/rs/packages/api/src/routes/invitations/accept.rs
@@ -163,7 +163,12 @@ pub mod post {
 
             let mut invitation = match tx_try!(AccountInvitation::get_by_id_with_session(&invitation_id, &mut session).await) {
               None => return Ok(Output::NotFound),
-              Some(doc) => doc,
+              Some(doc) => {
+                if doc.deleted_at.is_some() {
+                  return Ok(Output::NotFound)
+                }
+                doc
+              },
             };
 
             if invitation.receiver_email != user.email {
@@ -229,10 +234,14 @@ pub mod post {
           }
 
           run_transaction!(session => {
-            let invitation = tx_try!(AccountInvitation::get_by_token_with_session(&token, &mut session).await);
-            let mut invitation = match invitation {
-              Some(invitation) => invitation,
+            let mut invitation = match tx_try!(AccountInvitation::get_by_token_with_session(&token, &mut session).await) {
               None => return Ok(Output::NotFound),
+              Some(doc) => {
+                if doc.deleted_at.is_some() {
+                  return Ok(Output::NotFound)
+                }
+                doc
+              }
             };
 
             match &invitation.state {
diff --git a/rs/packages/api/src/routes/invitations/get_by_token.rs b/rs/packages/api/src/routes/invitations/get_by_token.rs
index 362efbd3..13e33501 100644
--- a/rs/packages/api/src/routes/invitations/get_by_token.rs
+++ b/rs/packages/api/src/routes/invitations/get_by_token.rs
@@ -73,7 +73,13 @@ pub mod get {
 
       let invitation = match AccountInvitation::get_by_token(&token).await? {
         None => return Ok(Output::NotFound),
-        Some(invitation) => invitation,
+        Some(invitation) => {
+          if invitation.deleted_at.is_some() {
+            return Ok(Output::NotFound);
+          }
+
+          invitation
+        }
       };
 
       let account = Account::get_by_id(&invitation.account_id)
@@ -106,6 +112,7 @@ pub mod get {
         is_expired,
         expires_at,
         created_at: invitation.created_at,
+        deleted_at: invitation.deleted_at,
         account,
         admin_sender,
         user_sender,
diff --git a/rs/packages/api/src/routes/invitations/id.rs b/rs/packages/api/src/routes/invitations/id.rs
index 01aa9955..56ee81e9 100644
--- a/rs/packages/api/src/routes/invitations/id.rs
+++ b/rs/packages/api/src/routes/invitations/id.rs
@@ -77,7 +77,13 @@ pub mod get {
 
       let invitation = match AccountInvitation::get_by_id(&invitation_id).await? {
         None => return Err(HandleError::NotFound(invitation_id)),
-        Some(invitation) => invitation,
+        Some(invitation) => {
+          if invitation.deleted_at.is_some() {
+            return Err(HandleError::NotFound(invitation_id));
+          }
+
+          invitation
+        }
       };
 
       match &access_token_scope {
@@ -123,6 +129,7 @@ pub mod get {
         is_expired,
         expires_at,
         created_at: invitation.created_at,
+        deleted_at: invitation.deleted_at,
         account,
         admin_sender,
         user_sender,
@@ -135,3 +142,132 @@ pub mod get {
     }
   }
 }
+
+pub mod delete {
+
+  use serde_util::empty_struct::EmptyStruct;
+
+  use super::*;
+
+  #[derive(Debug)]
+  pub struct Input {
+    invitation_id: String,
+    access_token_scope: AccessTokenScope,
+  }
+
+  #[derive(Debug, Clone, Serialize, Deserialize, TS)]
+  #[ts(
+    export,
+    export_to = "../../../defs/api/invitations/[invitation]/DELETE/"
+  )]
+  pub struct Output(EmptyStruct);
+
+  #[derive(Debug, Clone)]
+  pub struct Endpoint {}
+
+  #[derive(Debug, thiserror::Error)]
+  pub enum ParseError {
+    #[error("payload: {0}")]
+    Token(#[from] GetAccessTokenScopeError),
+  }
+
+  impl From<ParseError> for ApiError {
+    fn from(e: ParseError) -> Self {
+      match e {
+        ParseError::Token(e) => e.into(),
+      }
+    }
+  }
+
+  #[derive(Debug, thiserror::Error)]
+  pub enum HandleError {
+    #[error("db: {0}")]
+    Db(#[from] mongodb::error::Error),
+    #[error("token: {0}")]
+    Token(#[from] GetAccessTokenScopeError),
+    #[error("invitation not found: {0}")]
+    NotFound(String),
+    #[error("already accepted: {0}")]
+    AlreadyAccepted(String),
+    #[error("already rejected: {0}")]
+    AlreadyRejected(String),
+  }
+
+  impl From<HandleError> for ApiError {
+    fn from(e: HandleError) -> Self {
+      match e {
+        HandleError::Db(e) => e.into(),
+        HandleError::Token(e) => e.into(),
+        HandleError::NotFound(id) => ApiError::InvitationNotFound(id),
+        HandleError::AlreadyAccepted(id) => {
+          ApiError::BadRequestCustom(format!("Invitation with id {} was already accepted", id))
+        }
+        HandleError::AlreadyRejected(id) => {
+          ApiError::BadRequestCustom(format!("Invitation with id {} was already rejected", id))
+        }
+      }
+    }
+  }
+
+  #[async_trait]
+  impl JsonHandler for Endpoint {
+    type Input = Input;
+    type Output = Output;
+    type ParseError = ParseError;
+    type HandleError = HandleError;
+
+    async fn parse(&self, req: Request) -> Result<Input, ParseError> {
+      let invitation_id = req.param("invitation").unwrap().to_string();
+      let access_token_scope = get_access_token_scope(&req).await?;
+      Ok(Input {
+        invitation_id,
+        access_token_scope,
+      })
+    }
+
+    async fn perform(&self, input: Input) -> Result<Output, HandleError> {
+      let Input {
+        invitation_id,
+        access_token_scope,
+      } = input;
+
+      let invitation = match AccountInvitation::get_by_id(&invitation_id).await? {
+        None => return Err(HandleError::NotFound(invitation_id)),
+        Some(invitation) => {
+          if invitation.deleted_at.is_some() {
+            return Err(HandleError::NotFound(invitation_id));
+          }
+
+          invitation
+        }
+      };
+
+      match &access_token_scope {
+        AccessTokenScope::Global | AccessTokenScope::Admin(_) => {}
+        AccessTokenScope::User(user) => {
+          // we only allow deleting invitations to this user
+          // or to an account OWNED by this user
+          if user.email != invitation.receiver_email {
+            access_token_scope
+              .grant_account_owner_scope(&invitation.account_id)
+              .await?;
+          }
+        }
+      };
+
+      match &invitation.state {
+        AccountInvitationState::Accepted { .. } => {
+          return Err(HandleError::AlreadyAccepted(invitation.id));
+        }
+        AccountInvitationState::Rejected { .. } => {
+          return Err(HandleError::AlreadyRejected(invitation.id));
+        }
+        AccountInvitationState::Pending => {}
+      }
+
+      AccountInvitation::set_deleted_by_id(&invitation.id).await?;
+
+      Ok(Output(EmptyStruct(())))
+    }
+  }
+}
diff --git a/rs/packages/api/src/routes/invitations/mod.rs b/rs/packages/api/src/routes/invitations/mod.rs
index be1ed8d3..673dfcd3 100644
--- a/rs/packages/api/src/routes/invitations/mod.rs
+++ b/rs/packages/api/src/routes/invitations/mod.rs
@@ -31,6 +31,7 @@ pub struct PublicInvitation {
   pub account_id: String,
   pub receiver_email: String,
   pub created_at: DateTime,
+  pub deleted_at: Option<DateTime>,
   #[serde(flatten)]
   pub state: AccountInvitationState,
   pub is_expired: bool,
@@ -304,6 +305,7 @@ pub mod get {
             admin_sender_id: item.admin_sender_id,
             state: item.state,
             created_at: item.created_at,
+            deleted_at: item.deleted_at,
             is_expired,
             expires_at,
             account,
@@ -476,6 +478,7 @@ pub mod post {
         user_sender_id: user_sender.as_ref().map(|s| &s.id).cloned(),
         state: AccountInvitationState::Pending,
         created_at: DateTime::now(),
+        deleted_at: None,
       };
 
       AccountInvitation::insert(&invitation).await?;
@@ -563,6 +566,7 @@ pub mod post {
         user_sender_id: invitation.user_sender_id,
         state: invitation.state,
         created_at: invitation.created_at,
+        deleted_at: invitation.deleted_at,
 
         account: Some(account.into()),
         receiver: receiver.map(Into::into),
diff --git a/rs/packages/api/src/routes/invitations/reject.rs b/rs/packages/api/src/routes/invitations/reject.rs
index b3489475..b3a6c4b5 100644
--- a/rs/packages/api/src/routes/invitations/reject.rs
+++ b/rs/packages/api/src/routes/invitations/reject.rs
@@ -118,7 +118,12 @@ pub mod post {
 
             let invitation = match tx_try!(AccountInvitation::get_by_id_with_session(invitation_id, &mut session).await) {
               None => return Ok(Output::NotFound),
-              Some(doc) => doc,
+              Some(doc) => {
+                if doc.deleted_at.is_some() {
+                  return Ok(Output::NotFound)
+                }
+                doc
+              },
             };
 
             match access_token_scope {
diff --git a/rs/packages/api/src/routes/mod.rs b/rs/packages/api/src/routes/mod.rs
index ab0cf75d..07557708 100644
--- a/rs/packages/api/src/routes/mod.rs
+++ b/rs/packages/api/src/routes/mod.rs
@@ -202,6 +202,14 @@ pub fn router(
     .at("/accounts/:account/members")
     .get(accounts::members::get::Endpoint {}.into_handler());
 
+  app
+    .at("/accounts/:account/members/:member")
+    .delete(accounts::members::id::delete::Endpoint {}.into_handler());
+
+  app
+    .at("/accounts/:account/members/:member/set-role")
+    .post(accounts::members::id::set_role::post::Endpoint {}.into_handler());
+
   app.at("/accounts/:account/stream-stats").get(
     accounts::stream_stats::get::Endpoint {
       index: stream_connections_index.clone(),
@@ -405,8 +413,9 @@ pub fn router(
     .post(invitations::post::Endpoint { mailer }.into_handler());
 
   app
-    .at("/invitations")
-    .get(invitations::id::get::Endpoint {}.into_handler());
+    .at("/invitations/:invitation")
+    .get(invitations::id::get::Endpoint {}.into_handler())
+    .delete(invitations::id::delete::Endpoint {}.into_handler());
 
   app
     .at("/invitations/get-by-token/:token")
diff --git a/rs/packages/db/src/models/account_invitations/mod.rs b/rs/packages/db/src/models/account_invitations/mod.rs
index 408b639c..f8dd53a8 100644
--- a/rs/packages/db/src/models/account_invitations/mod.rs
+++ b/rs/packages/db/src/models/account_invitations/mod.rs
@@ -34,6 +34,8 @@ pub struct AccountInvitation {
   pub state: AccountInvitationState,
 
   pub created_at: DateTime,
+
+  pub deleted_at: Option<DateTime>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]