Merge pull request #1355 from internxt/feat/update-members-seats-for-workspace-sub

[PB-3313]: feat/update workspace members

Author: xabg2

package.json

@@ -9,7 +9,7 @@
     "@internxt/internxtui": "^0.0.6",
     "@internxt/inxt-js": "=1.2.21",
     "@internxt/lib": "^1.2.0",
-    "@internxt/sdk": "^1.5.24",
+    "@internxt/sdk": "^1.6.3",
     "@phosphor-icons/react": "^2.1.7",
     "@popperjs/core": "^2.11.6",
     "@reduxjs/toolkit": "^1.6.0",
@@ -81,7 +81,7 @@
     "string-template": "^1.0.0",
     "url": "^0.11.3",
     "util": "^0.12.5",
-    "uuid": "^8.3.2",
+    "uuid": "^11.0.3",
     "web-vitals": "^0.2.4",
     "xlsx-preview": "^1.0.4"
   },

src/app/auth/components/SignUp/useSignUp.ts

@@ -108,6 +108,16 @@ export function useSignUp(
       privateKeyEncrypted: encPrivateKey,
       publicKey: publicKeyArmored,
       revocationCertificate: revocationCertificate,
+      keys: {
+        ecc: {
+          privateKeyEncrypted: encPrivateKey,
+          publicKey: publicKeyArmored,
+        },
+        kyber: {
+          privateKeyEncrypted: '',
+          publicKey: '',
+        },
+      },
     };
     const registerDetails: RegisterDetails = {
       name: 'My',
@@ -171,6 +181,16 @@ export function useSignUp(
       privateKeyEncrypted: encPrivateKey,
       publicKey: publicKeyArmored,
       revocationCertificate: revocationCertificate,
+      keys: {
+        ecc: {
+          privateKeyEncrypted: encPrivateKey,
+          publicKey: publicKeyArmored,
+        },
+        kyber: {
+          privateKeyEncrypted: '',
+          publicKey: '',
+        },
+      },
     };
     const registerDetails: RegisterDetails = {
       name: 'My',

src/app/auth/services/auth.service.test.ts

@@ -53,6 +53,17 @@ const mockUser: UserSettings = {
   createdAt: new Date(),
   avatar: null,
   emailVerified: false,
+  keys: {
+    ecc: {
+      privateKey: '',
+      revocationKey: '',
+      publicKey: '',
+    },
+    kyber: {
+      privateKyberKey: '',
+      publicKyberKey: '',
+    },
+  },
 };
 const mockSignUpFunction = jest.fn();
 

src/app/auth/services/auth.service.ts

@@ -138,7 +138,7 @@ export const doLogin = async (
     tfaCode: twoFactorCode,
   };
   const cryptoProvider: CryptoProvider = {
-    encryptPasswordHash(password: Password, encryptedSalt: string): string {
+    async encryptPasswordHash(password: Password, encryptedSalt: string): Promise<string> {
       const salt = decryptText(encryptedSalt);
       const hashObj = passToHash({ password, salt });
       return encryptText(hashObj.hash);
@@ -150,6 +150,16 @@ export const doLogin = async (
         privateKeyEncrypted: privateKeyArmoredEncrypted,
         publicKey: publicKeyArmored,
         revocationCertificate: revocationCertificate,
+        keys: {
+          ecc: {
+            privateKeyEncrypted: privateKeyArmoredEncrypted,
+            publicKey: publicKeyArmored,
+          },
+          kyber: {
+            privateKeyEncrypted: '',
+            publicKey: '',
+          },
+        },
       };
       return keys;
     },

src/app/i18n/locales/de.json

@@ -1241,6 +1241,7 @@
     "linkUpdated": "Link aktualisiert",
     "itemsMovedToTrash": "{{item}} in den Papierkorb verschoben",
     "storageModified": "Speicher erfolgreich geändert",
+    "membersUpdatedSuccessfully": "Mitglieder erfolgreich aktualisiert",
     "errorModifyingStorage": "Der neue Speicherplatz ist für dieses Mitglied ungültig.",
     "generalErrorWhileModifyingStorage": "Beim Ändern des Speicherplatzes ist ein Fehler aufgetreten.",
     "restoreItems": "{{itemsToRecover}} verschoben nach {{destination}}",
@@ -1262,7 +1263,10 @@
     "errorWhileLoadingWorkspace": "Fehler beim Laden des Arbeitsbereichs {{error}}",
     "errorFetchingWorkspaceCredentials": "Fehler beim Abrufen der Anmeldeinformationen für den Arbeitsbereich {{error}}",
     "invalidWorkspaceInvitationError": "Arbeitsbereich voll. Kontaktieren Sie den Eigentümer.",
-    "errorAcceptingWorkspaceInvitation": "Beim Annehmen der Einladung ist ein Fehler aufgetreten"
+    "errorAcceptingWorkspaceInvitation": "Beim Annehmen der Einladung ist ein Fehler aufgetreten",
+    "errorWhileUpdatingWorkspaceMembers": "Beim Aktualisieren der Mitglieder ist ein Fehler aufgetreten",
+    "errorWhileFetchingCurrentWorkspaceMembers": "Beim Abrufen der Mitglieder des Arbeitsbereichs ist ein Fehler aufgetreten",
+    "newMembersCannotBeLessThanTheExistentOnesError": "Die ausgewählten Mitglieder dürfen nicht weniger sein als die aktuellen Mitglieder des Arbeitsbereichs"
   },
   "actions": {
     "undo": "Rückgängig machen",
@@ -1294,6 +1298,7 @@
     "moreInfo": "Mehr Info",
     "dismiss": "Zurückweisen",
     "save": "Sichern",
+    "saveChanges": "Änderungen speichern",
     "back": "Zurück",
     "edit": "Bearbeite",
     "submit": "Einreichen",
@@ -1311,7 +1316,9 @@
     "report": "Missbrauch melden",
     "yes": "Ja",
     "no": "Nein",
-    "more": "Mehr"
+    "more": "Mehr",
+    "continue": "Fortsetzen",
+    "keepCurrent": "Aktuell behalten"
   },
   "drive": {
     "usage": "Verwendung",
@@ -1644,6 +1651,14 @@
         "nextBillingDate": "Nächstes Abrechnungsdatum",
         "planLimit": "Abgerechnet für {{planLimit}} plan",
         "subscription": "Abonnement",
+        "membersLabel": "Mitglieder",
+        "perUser": "pro Benutzer",
+        "members": {
+          "title": "Mitglieder",
+          "editMembers": "Mitglieder bearbeiten",
+          "numberOfMembers": "Anzahl der Mitglieder",
+          "expandNumber": "Die Anzahl der Mitglieder erweitern."
+        },
         "lifetimeSubscription": {
           "planType": "Lebenslang",
           "text": "Keine kommenden Rechnungen"

src/app/i18n/locales/en.json

@@ -1295,6 +1295,7 @@
     "restoreItems": "{{itemsToRecover}} restored successfully",
     "moveItems": "{{itemsToMove}} moved successfully",
     "storageModified": "Storage modified successfully",
+    "membersUpdatedSuccessfully": "Members updated successfully",
     "errorModifyingStorage": "The new storage is not valid for this member.",
     "generalErrorWhileModifyingStorage": "Something went wrong while modifying storage",
     "itemDeleted": "{{item}} deleted",
@@ -1318,7 +1319,10 @@
     "errorWhileLoadingWorkspace": "Error while loading the workspace {{error}}",
     "errorFetchingWorkspaceCredentials": "Error while fetching workspace credentials {{error}}",
     "invalidWorkspaceInvitationError": "Workspace full. Contact the owner.",
-    "errorAcceptingWorkspaceInvitation": "Something went wrong while accepting the invitation"
+    "errorAcceptingWorkspaceInvitation": "Something went wrong while accepting the invitation",
+    "errorWhileUpdatingWorkspaceMembers": "Something went wrong while updating the members",
+    "errorWhileFetchingCurrentWorkspaceMembers": "Something went wrong while fetching workspace members",
+    "newMembersCannotBeLessThanTheExistentOnesError": "Selected members cannot be fewer than current workspace members"
   },
   "actions": {
     "undo": "Undo",
@@ -1349,6 +1353,7 @@
     "moreInfo": "More info",
     "dismiss": "Dismiss",
     "save": "Save",
+    "saveChanges": "Save changes",
     "saving": "Saving",
     "share": "Share",
     "back": "Back",
@@ -1368,7 +1373,9 @@
     "report": "Report abuse",
     "yes": "Yes",
     "no": "No",
-    "more": "More"
+    "more": "More",
+    "continue": "Continue",
+    "keepCurrent": "Keep current"
   },
   "drive": {
     "usage": "Usage",
@@ -1702,7 +1709,9 @@
         "title": "Billing",
         "nextBillingDate": "Next billing date",
         "planLimit": "Billed for {{planLimit}} plan",
+        "membersLabel": "members",
         "subscription": "Subscription",
+        "perUser": "per user",
         "lifetimeSubscription": {
           "planType": "Lifetime",
           "text": "No upcoming billings"
@@ -1712,6 +1721,30 @@
           "action": "Upgrade",
           "actionDescription": "Increase your storage space and get more features"
         },
+        "members": {
+          "title": "Members",
+          "editMembers": "Edit members",
+          "numberOfMembers": "Number of members",
+          "expandNumber": "Expand the number of members.",
+          "confirmUpdateModal": {
+            "title": "Change plan",
+            "confirmToProceed": {
+              "text1": "You are about to change your Internxt member plan from ",
+              "to": "to ",
+              "text2": ". Confirm your choice to proceed, please."
+            },
+            "current": "Current",
+            "new": "New",
+            "decreaseStorage": {
+              "text": "This will also decrease your total business storage from ",
+              "to": " to "
+            },
+            "increaseStorage": {
+              "text": "This will also increase your total business storage from ",
+              "to": " to "
+            }
+          }
+        },
         "paymentMethod": {
           "title": "Payment Method",
           "editButton": "Edit payment method",

src/app/i18n/locales/es.json

@@ -1258,6 +1258,7 @@
     "itemsMovedToTrash": "{{item}} movid{{s}} a la papelera",
     "restoreItems": "{{itemsToRecover}} restaurad{{s}} con éxito",
     "storageModified": "Almacenamiento modificado con éxito",
+    "membersUpdatedSuccessfully": "Miembros actualizados con éxito",
     "errorModifyingStorage": "El nuevo almacenamiento no es válido para este miembro.",
     "generalErrorWhileModifyingStorage": "Algo salió mal al modificar el almacenamiento.",
     "moveItems": "{{itemsToMove}} movid{{s}} con éxito",
@@ -1282,7 +1283,10 @@
     "errorWhileLoadingWorkspace": "Error al cargar el espacio de trabajo {{error}}",
     "errorFetchingWorkspaceCredentials": "Error al obtener las credenciales del espacio de trabajo {{error}}",
     "invalidWorkspaceInvitationError": "Espacio de trabajo lleno. Contacta al propietario.",
-    "errorAcceptingWorkspaceInvitation": "Ocurrió un error al aceptar la invitación"
+    "errorAcceptingWorkspaceInvitation": "Ocurrió un error al aceptar la invitación",
+    "errorWhileUpdatingWorkspaceMembers": "Ocurrió un error al actualizar los miembros",
+    "errorWhileFetchingCurrentWorkspaceMembers": "Ocurrió un error al obtener los miembros del espacio de trabajo",
+    "newMembersCannotBeLessThanTheExistentOnesError": "Los miembros seleccionados no pueden ser menos que los miembros actuales del espacio de trabajo"
   },
   "success": {
     "passwordChanged": "Contraseña actualizada correctamente",
@@ -1328,6 +1332,7 @@
     "moreInfo": "Más info",
     "dismiss": "Dismiss",
     "save": "Guardar",
+    "saveChanges": "Guardar cambios",
     "saving": "Guardando",
     "share": "Compartir",
     "back": "Atrás",
@@ -1347,7 +1352,9 @@
     "report": "Reportar abuso",
     "yes": "Si",
     "no": "No",
-    "more": "Más"
+    "more": "Más",
+    "continue": "Continuar",
+    "keepCurrent": "Mantener actual"
   },
   "drive": {
     "usage": "Uso",
@@ -1680,6 +1687,14 @@
         "nextBillingDate": "Próxima fecha de facturación",
         "planLimit": "Facturado por plan de {{planLimit}}",
         "subscription": "Suscripción",
+        "membersLabel": "miembros",
+        "perUser": "por usuario",
+        "members": {
+          "title": "Miembros",
+          "editMembers": "Editar miembros",
+          "numberOfMembers": "Número de miembros",
+          "expandNumber": "Ampliar el número de miembros."
+        },
         "lifetimeSubscription": {
           "planType": "De por vida",
           "text": "Sin facturas pendientes"

src/app/i18n/locales/fr.json

@@ -1226,6 +1226,7 @@
     "itemsMovedToTrash": "{{item}} déplacé vers la corbeille",
     "restoreItems": "{{itemsToRecover}} restauré avec succès",
     "storageModified": "Stockage modifié avec succès",
+    "membersUpdatedSuccessfully": "Membres mis à jour avec succès",
     "errorModifyingStorage": "Le nouvel espace de stockage n'est pas valide pour ce membre.",
     "generalErrorWhileModifyingStorage": "Une erreur s'est produite lors de la modification du stockage.",
     "itemDeleted": "{{itemsToDelete}} supprimé",
@@ -1246,7 +1247,10 @@
     "errorWhileLoadingWorkspace": "Erreur lors du chargement de l'espace de travail {{error}}",
     "errorFetchingWorkspaceCredentials": "Erreur lors de la récupération des identifiants de l'espace de travail {{error}}",
     "invalidWorkspaceInvitationError": "Espace de travail plein. Contactez le propriétaire.",
-    "errorAcceptingWorkspaceInvitation": "Une erreur s'est produite lors de l'acceptation de l'invitation"
+    "errorAcceptingWorkspaceInvitation": "Une erreur s'est produite lors de l'acceptation de l'invitation",
+    "errorWhileUpdatingWorkspaceMembers": "Une erreur s'est produite lors de la mise à jour des membres",
+    "errorWhileFetchingCurrentWorkspaceMembers": "Une erreur s'est produite lors de la récupération des membres de l'espace de travail",
+    "newMembersCannotBeLessThanTheExistentOnesError": "Les membres sélectionnés ne peuvent pas être inférieurs au nombre de membres actuels de l'espace de travail"
   },
   "actions": {
     "undo": "Annuler",
@@ -1278,6 +1282,7 @@
     "moreInfo": "Plus d'informations",
     "dismiss": "Rejeter",
     "save": "Enregistrer",
+    "saveChanges": "Enregistrer les modifications",
     "saving": "Sauvagarde en cours",
     "back": "Retourner",
     "edit": "Éditer",
@@ -1296,7 +1301,9 @@
     "report": "Signaler un abus",
     "yes": "Oui",
     "no": "Non",
-    "more": "Plus"
+    "more": "Plus",
+    "continue": "Continuer",
+    "keepCurrent": "Garder actuel"
   },
   "drive": {
     "usage": "Usage",
@@ -1629,6 +1636,14 @@
         "nextBillingDate": "Prochaine date de facturation",
         "planLimit": "Facturé pour un forfait de {{planLimit}}",
         "subscription": "Abonnement",
+        "membersLabel": "membres",
+        "perUser": "par utilisateur",
+        "members": {
+          "title": "Membres",
+          "editMembers": "Modifier les membres",
+          "numberOfMembers": "Nombre de membres",
+          "expandNumber": "Augmenter le nombre de membres."
+        },
         "lifetimeSubscription": {
           "planType": "Durée de vie",
           "text": "Pas de facturation à venir"

src/app/i18n/locales/it.json

@@ -1286,6 +1286,7 @@
     "itemsMovedToTrash": "{{item}} spostati nel cestino",
     "restoreItems": "{{itemsToRecover}} ripristinato correttamente",
     "storageModified": "Archiviazione modificata con successo",
+    "membersUpdatedSuccessfully": "Membri aggiornati con successo",
     "errorModifyingStorage": "Il nuovo spazio di archiviazione non è valido per questo membro.",
     "generalErrorWhileModifyingStorage": "Si è verificato un errore durante la modifica dello spazio di archiviazione.",
     "itemDeleted": "{{item}} eliminate",
@@ -1306,7 +1307,10 @@
     "errorWhileLoadingWorkspace": "Errore durante il caricamento dell'area di lavoro {{error}}",
     "errorFetchingWorkspaceCredentials": "Errore durante il recupero delle credenziali dell'area di lavoro {{error}}",
     "invalidWorkspaceInvitationError": "Spazio di lavoro pieno. Contatta il proprietario.",
-    "errorAcceptingWorkspaceInvitation": "Si è verificato un errore durante l'accettazione dell'invito"
+    "errorAcceptingWorkspaceInvitation": "Si è verificato un errore durante l'accettazione dell'invito",
+    "errorWhileUpdatingWorkspaceMembers": "Si è verificato un errore durante l'aggiornamento dei membri",
+    "errorWhileFetchingCurrentWorkspaceMembers": "Si è verificato un errore durante il recupero dei membri dello spazio di lavoro",
+    "newMembersCannotBeLessThanTheExistentOnesError": "I membri selezionati non possono essere meno dei membri attuali dello spazio di lavoro"
   },
   "actions": {
     "undo": "Annulla",
@@ -1338,6 +1342,7 @@
     "moreInfo": "Maggiori informazioni",
     "dismiss": "Licenziare",
     "save": "Salva",
+    "saveChanges": "Salva modifiche",
     "saving": "Salvare",
     "back": "Indietro",
     "edit": "Modifica",
@@ -1356,7 +1361,9 @@
     "report": "Segnala abuso",
     "yes": "Sì",
     "no": "No",
-    "more": "Di più"
+    "more": "Di più",
+    "continue": "Continua",
+    "keepCurrent": "Mantieni attuale"
   },
   "drive": {
     "usage": "Utilizzo",
@@ -1689,6 +1696,14 @@
         "nextBillingDate": "Prossima data di fatturazione",
         "planLimit": "Fatturato per un piano da {{planLimit}}",
         "subscription": "Abbonamento",
+        "membersLabel": "membri",
+        "perUser": "per utente",
+        "members": {
+          "title": "Membri",
+          "editMembers": "Modifica membri",
+          "numberOfMembers": "Numero di membri",
+          "expandNumber": "Espandi il numero di membri."
+        },
         "lifetimeSubscription": {
           "planType": "Durata della vita",
           "text": "Nessuna fatturazione imminente"