Merge pull request #27 from kodado/add--remove-companyName-from-user

Add  remove company name from user

Author: nObbY530

docs/authenticating.md

@@ -14,11 +14,10 @@ The `signUp` function registers a new user and derives encryption keys from the
 
 ```typescript
 await client.auth.signUp({
-    email: "john.doe@example.com",
-    password: "SecurePassword123!",
-    username: "johndoe",
-    fullName: "John Doe",
-    companyName: "Example Corp",
+  email: "john.doe@example.com",
+  password: "SecurePassword123!",
+  username: "johndoe",
+  fullName: "John Doe",
 });
 ```
 
@@ -28,8 +27,8 @@ The `signIn` function authenticates an existing user using the SRP protocol.
 
 ```typescript
 await client.auth.signIn({
-    email: "john.doe@example.com",
-    password: "SecurePassword123!",
+  email: "john.doe@example.com",
+  password: "SecurePassword123!",
 });
 ```
 
@@ -39,8 +38,8 @@ The `updatePassword` function allows a user to change their password.
 
 ```typescript
 await client.auth.updatePassword({
-    oldPassword: "SecurePassword123!",
-    newPassword: "NewSecurePassword456!",
+  oldPassword: "SecurePassword123!",
+  newPassword: "NewSecurePassword456!",
 });
 ```
 

src/auth/AuthApiClient.ts

@@ -50,18 +50,16 @@ export class AuthApiClient {
 
   async updateUserProfile({
     fullName,
-    companyName,
     emailNotifications,
     token,
   }: {
     fullName?: string;
-    companyName?: string;
     emailNotifications?: string;
     token: string;
   }) {
     await fetch(`${this.endpoint}/auth/profile`, {
       method: "PUT",
-      body: JSON.stringify({ fullName, companyName, emailNotifications }),
+      body: JSON.stringify({ fullName, emailNotifications }),
       headers: {
         Authorization: token,
       },

src/auth/AuthClient.ts

@@ -33,7 +33,6 @@ export type User = {
   nickname: string;
   fullName: string;
   imageUrl: string;
-  companyName: string;
   emailNotifications?: Record<string, boolean>;
   userId: string;
   keys: Keys;
@@ -102,7 +101,6 @@ export class AuthClient {
       nickname: idToken.payload.nickname,
       fullName: idToken.payload.name,
       imageUrl: profile.imageUrl,
-      companyName: idToken.payload["custom:companyName"],
       emailNotifications: idToken.payload["custom:emailNotifications"]
         ? JSON.parse(idToken.payload["custom:emailNotifications"])
         : {},
@@ -166,7 +164,6 @@ export class AuthClient {
         nickname: idToken.payload.nickname,
         fullName: idToken.payload.name,
         imageUrl,
-        companyName: idToken.payload["custom:companyName"],
         emailNotifications: idToken.payload["custom:emailNotifications"]
           ? JSON.parse(idToken.payload["custom:emailNotifications"])
           : {},
@@ -203,13 +200,11 @@ export class AuthClient {
     password,
     nickname,
     fullName,
-    companyName,
   }: {
     email: string;
     password: string;
     nickname: string;
     fullName?: string;
-    companyName?: string;
   }) {
     const keys = generateKeys();
     const encryptedPrivateKeys: string = encryptPrivateKeys(keys, password);
@@ -221,7 +216,6 @@ export class AuthClient {
         nickname,
         encryptedPrivateKeys,
         fullName,
-        companyName,
       });
     } catch (e) {
       throw new UsernameAlreadyExistsError();
@@ -230,7 +224,6 @@ export class AuthClient {
     const userData = {
       username: nickname,
       fullName,
-      companyName,
       appId: "testApp",
       encryptionPublicKey: encodeBase64(keys.encryptionPublicKey),
       signPublicKey: encodeBase64(keys.signPublicKey),
@@ -245,29 +238,24 @@ export class AuthClient {
 
   async updateProfile({
     fullName,
-    companyName,
     emailNotifications,
   }: {
     fullName?: string;
-    companyName?: string;
     emailNotifications?: Record<string, boolean>;
   }) {
     if (!this.user || !this.session) return;
 
     await this.apiClient.updateUserProfile({
       fullName,
-      companyName,
       emailNotifications: JSON.stringify(emailNotifications),
       token: (await this.getCurrentAuthorizationToken()) || "",
     });
     await this.cognitoClient.updateCognitoProfile(this.session, {
       fullName,
-      companyName,
       emailNotifications: JSON.stringify(emailNotifications),
     });
 
     this.user.fullName = fullName || this.user.fullName;
-    this.user.companyName = companyName || this.user.companyName;
     this.user.emailNotifications =
       emailNotifications || this.user.emailNotifications;
   }
@@ -485,7 +473,6 @@ export class AuthClient {
       nickname: idToken.payload.nickname,
       fullName: idToken.payload.name,
       imageUrl,
-      companyName: idToken.payload["custom:companyName"],
       emailNotifications: idToken.payload["custom:emailNotifications"]
         ? JSON.parse(idToken.payload["custom:emailNotifications"])
         : {},

src/auth/CognitoClient.ts

@@ -17,7 +17,6 @@ type UserAttributes = {
   password: string;
   encryptedPrivateKeys?: string;
   fullName?: string;
-  companyName?: string;
 };
 
 type UserPool = {
@@ -104,7 +103,6 @@ export class CognitoClient {
     password,
     encryptedPrivateKeys,
     fullName,
-    companyName,
   }: UserAttributes): Promise<ISignUpResult | undefined> {
     const userPool = new CognitoUserPool(this.userpool);
 
@@ -130,15 +128,6 @@ export class CognitoClient {
       );
     }
 
-    if (companyName) {
-      userAttributes.push(
-        new CognitoUserAttribute({
-          Name: "custom:companyName",
-          Value: companyName,
-        })
-      );
-    }
-
     return new Promise((res, rej) => {
       userPool.signUp(
         username,
@@ -185,11 +174,9 @@ export class CognitoClient {
     session: CognitoUserSession,
     {
       fullName,
-      companyName,
       emailNotifications,
     }: {
       fullName?: string;
-      companyName?: string;
       emailNotifications?: string;
     }
   ) {
@@ -213,15 +200,6 @@ export class CognitoClient {
         );
       }
 
-      if (companyName) {
-        attributes.push(
-          new CognitoUserAttribute({
-            Name: "custom:companyName",
-            Value: companyName,
-          })
-        );
-      }
-
       if (emailNotifications) {
         attributes.push(
           new CognitoUserAttribute({

test/auth.spec.ts

@@ -28,7 +28,6 @@ const credentials = getUserCredentials({
   password: "Abcd1234!",
   username: "auth-lib-user",
   fullName: "Auth Lib User",
-  companyName: "CompanyXYZ",
 });
 
 beforeAll(async () => {
@@ -69,7 +68,6 @@ describe("signIn", () => {
     expect(user.email).toBe(credentials.email);
     expect(user.nickname).toBe(credentials.username);
     expect(user.fullName).toBe(credentials.fullName);
-    expect(user.companyName).toBe(credentials.companyName);
     expect(user).toHaveProperty("keys");
     expect(user).toHaveProperty("keys.encryptionPublicKey");
     expect(user).toHaveProperty("keys.encryptionSecretKey");
@@ -119,7 +117,6 @@ describe("updateProfile", () => {
 
     await client.auth.updateProfile({
       fullName: "updated fullName",
-      companyName: "updated companyName",
       emailNotifications: { type1: true, type2: false },
     });
 
@@ -132,7 +129,6 @@ describe("updateProfile", () => {
     }
 
     expect(session.fullName).toBe("updated fullName");
-    expect(session.companyName).toBe("updated companyName");
     expect(session.emailNotifications).toEqual({ type1: true, type2: false });
 
     client.auth.signOut();

test/bulkCreateItem.spec.ts

@@ -24,15 +24,13 @@ beforeAll(async () => {
     password: "Abcd1234!",
     username: "bulkCreate1",
     fullName: "Bulk Create 1",
-    companyName: "Company 1",
   });
 
   await recreateUser(client, {
     email: "bulkCreate2@turingpoint.de",
     password: "Abcd1234!",
     username: "bulkCreate2",
     fullName: "Bulk Create 2",
-    companyName: "Company 2",
   });
 
   await client.auth.signIn({

test/bulkRevokeItem.spec.ts

@@ -24,15 +24,13 @@ beforeAll(async () => {
     password: "Abcd1234!",
     username: "bulkRevoke1",
     fullName: "Bulk Revoke 1",
-    companyName: "Company 1",
   });
 
   await recreateUser(client, {
     email: "bulkRevoke2@turingpoint.de",
     password: "Abcd1234!",
     username: "bulkRevoke2",
     fullName: "Bulk Revoke 2",
-    companyName: "Company 2",
   });
 
   await client.auth.signIn({

test/deepShare.spec.ts

@@ -31,23 +31,20 @@ beforeAll(async () => {
     password: "Abcd1234!",
     username: "deepShare1",
     fullName: "Deep Share 1",
-    companyName: "Company 1",
   });
 
   await recreateUser(client, {
     email: "deepShare2@turingpoint.de",
     password: "Abcd1234!",
     username: "deepShare2",
     fullName: "Deep Share 2",
-    companyName: "Company 2",
   });
 
   await recreateUser(client, {
     email: "deepShare3@turingpoint.de",
     password: "Abcd1234!",
     username: "deepShare3",
     fullName: "Deep Share 3",
-    companyName: "Company 1",
   });
 
   await client.auth.signIn({
@@ -190,7 +187,6 @@ describe("shareItem", () => {
             username
             role
             fullName
-            companyName
           }
           createdAt
         }
@@ -211,13 +207,11 @@ describe("shareItem", () => {
           username: "deepShare2",
           role: "member",
           fullName: "Deep Share 2",
-          companyName: "Company 2",
         },
         {
           username: "deepShare1",
           role: "owner",
           fullName: "Deep Share 1",
-          companyName: "Company 1",
         },
       ])
     );

test/helpers/createUser.ts

@@ -5,7 +5,6 @@ export type Credentials = {
   password: string;
   username: string;
   fullName?: string;
-  companyName?: string;
 };
 
 export async function safelyDeleteUser(
@@ -36,7 +35,6 @@ export async function recreateUser(
     password: credentials.password,
     nickname: credentials.username,
     fullName: credentials.fullName,
-    companyName: credentials.companyName,
   });
 }
 
@@ -49,7 +47,6 @@ export function getUserCredentials(credentials: Credentials) {
     username: `${prefix}-${credentials.username}`,
     password: credentials.password,
     fullName: credentials.fullName,
-    companyName: credentials.companyName,
   };
 
   return prefixedCredentials;

test/publicKeyStorage.spec.ts

@@ -21,15 +21,13 @@ beforeAll(async () => {
     password: "Abcd1234!",
     username: "publicKeyStorage1",
     fullName: "Deep Share 1",
-    companyName: "Company 1",
   });
 
   await recreateUser(client, {
     email: "publicKeyStorage2@turingpoint.de",
     password: "Abcd1234!",
     username: "publicKeyStorage2",
     fullName: "Deep Share 2",
-    companyName: "Company 2",
   });
 });