fix: Iuser structure changed (#365)

* fix: iuser changed * fix: changed route * fix: change profilePicture to picture * fix: fixed tests * fix: fix nftOwner and readme * fix: iuser changes * Deployment (#390) * ci(restapi): 🎉 cut release to restapi-v1.0.0 * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.0 * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.1 * ci(restapi): 🎉 cut release to restapi-v1.0.1 * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.2 * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.2 * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.3 * fix: success progressHook * ci(restapi): 🎉 cut release to restapi-v1.0.4 * ci(restapi): 🎉 cut release to restapi-v1.1.0 * ci(restapi): 🎉 cut release to restapi-v1.2.0 * ci(restapi): 🎉 cut release to restapi-v1.2.0 * ci(restapi): 🎉 cut release to restapi-v1.0.0 * fix(component): dummy * fix(component): dummy * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.2 * fix(component): dummy * ci(restapi): 🎉 cut release to restapi-v1.0.3 * ci(restapi): 🎉 cut release to restapi-v1.0.4 * ci(restapi): 🎉 cut release to restapi-v1.2.1 * fix: local for local development (#295) Co-Authored-By: aman035 <[email protected]> * fix: version update * ci(restapi): 🎉 cut release to restapi-v1.2.2 * ci(restapi): 🎉 cut release to restapi-v1.2.3 * ci(restapi): 🎉 cut release to restapi-v1.2.4 * ci(restapi): 🎉 cut release to restapi-v1.2.5 * ci(restapi): 🎉 cut release to restapi-v1.2.6 * ci(restapi): 🎉 cut release to restapi-v1.2.7 * ci(socket): 🎉 cut release to socket-v0.5.0 * fix: test commit * ci(restapi): 🎉 cut release to restapi-v1.2.8 * ci(uiweb): 🎉 cut release to uiweb-v1.0.0 * ci(uiweb): 🎉 cut release to uiweb-v1.0.0 * ci(uiweb): 🎉 cut release to uiweb-v1.0.1 * fix: added ci-version-beta * fix: added ci-version-beta * ci(restapi): 🎉 cut beta release to restapi-v1.2.9 * fix: added releaseType * ci(restapi): 🎉 cut beta release to restapi-v0.0.1-beta.0 * ci(restapi): 🎉 cut beta release to restapi-v0.0.1-beta.0 * ci(restapi): 🎉 cut release to restapi-v1.2.10 * ci(restapi): 🎉 cut release to restapi-v1.2.10 * ci(restapi): 🎉 cut beta release to restapi-v0.0.1-beta.1 * ci(restapi): 🎉 cut release to restapi-v1.2.11 * fix: linkedListHash test cases removed & CI version corrected * fix: update name to beta * ci(restapi): 🎉 cut release to restapi-v1.2.12 * ci(restapi): 🎉 cut release to restapi-v1.2.12 * ci(restapi): 🎉 cut release to restapi-v1.2.13 * ci(restapi): 🎉 cut release to restapi-v1.2.14 * ci(restapi): 🎉 cut release to restapi-v1.2.15 * fix: update package json * fix: updated socket version * ci(uiweb): 🎉 cut release to uiweb-v1.0.2 * fix: socket lib update * ci(uiweb): 🎉 cut release to uiweb-v1.0.2 --------- Co-authored-by: aman035 <[email protected]> * fix: add deprecated info to chat.chat (#392) * fix: show hardcoded msg rather than throwing error (#388) * docs: update * fix: fix decprecated param and verification of keys --------- Co-authored-by: Mohammed S <[email protected]> Co-authored-by: strykerin <[email protected]>
push-protocol · May 29, 2023 · 2fc6f54 · 2fc6f54
1 parent 067bc5d
commit 2fc6f54
Show file tree

Hide file tree

Showing 18 changed files with 1,095 additions and 1,465 deletions.
diff --git a/packages/demoreact/src/app/ChatTest/GetUser.tsx b/packages/demoreact/src/app/ChatTest/GetUser.tsx
@@ -152,7 +152,7 @@ const GetUserTest = () => {
             ) : null}
           </div>
         </SectionItem>
-        {connectedUser && (connectedUser as IUser).nftOwner !== null && (
+        {connectedUser && (connectedUser as IUser).did.split(':')[0] === 'nft' && (
           <SectionItem style={{ marginTop: 20 }}>
             <div>
               {connectedUser ? <CodeFormatter>{password}</CodeFormatter> : null}

diff --git a/packages/restapi/CHANGELOG.md b/packages/restapi/CHANGELOG.md
diff --git a/packages/restapi/README.md b/packages/restapi/README.md
diff --git a/packages/restapi/src/lib/chat/helpers/crypto.ts b/packages/restapi/src/lib/chat/helpers/crypto.ts
@@ -194,9 +194,6 @@ export const getEncryptedRequest = async (
         user: receiverAddress,
         publicKey: '',
         encryptedPrivateKey: '',
-        encryptionType: '',
-        signature: 'pgp',
-        sigType: 'pgp',
         env,
       });
       // If the user is being created here, that means that user don't have a PGP keys. So this intent will be in plaintext

diff --git a/packages/restapi/src/lib/chat/helpers/service.ts b/packages/restapi/src/lib/chat/helpers/service.ts
@@ -14,18 +14,13 @@ import {
   walletType,
 } from '../../types';
 import { getEip191Signature } from './crypto';
+import { populateDeprecatedUser } from '../../utils/populateIUser';
 
 type CreateUserOptionsType = {
   user: string;
   wallet?: walletType;
-  name?: string;
-  nftOwner?: string | null;
-  encryptedPassword?: string | null;
   publicKey?: string;
   encryptedPrivateKey?: string;
-  encryptionType?: string;
-  signature?: string;
-  sigType?: string;
   env?: ENV;
 };
 
@@ -34,16 +29,13 @@ export const createUserService = async (options: CreateUserOptionsType) => {
     wallet,
     publicKey = '',
     encryptedPrivateKey = '',
-    encryptionType = '',
     env = Constants.ENV.PROD,
-    encryptedPassword = null,
-    nftOwner = null,
   } = options || {};
   let { user } = options || {};
 
   const API_BASE_URL = getAPIBaseUrls(env);
 
-  const requestUrl = `${API_BASE_URL}/v1/users/`;
+  const requestUrl = `${API_BASE_URL}/v2/users/`;
 
   if (isValidCAIP10NFTAddress(user)) {
     const epoch = Math.floor(Date.now() / 1000);
@@ -56,33 +48,14 @@ export const createUserService = async (options: CreateUserOptionsType) => {
     did: walletToPCAIP10(user),
     publicKey,
     encryptedPrivateKey,
-
-    // DEPRECATED in eip191v2
-
-    // encryptionType,
-    // name: '',
-    // encryptedPassword: encryptedPassword,
-    // nftOwner: nftOwner ? nftOwner.toLowerCase() : nftOwner,
   };
 
   const hash = generateHash(data);
 
   const signatureObj = await getEip191Signature(wallet!, hash, 'v2');
 
-  // NOTE - To be removed after backend route changes
-  const updatedData = {
-    caip10: walletToPCAIP10(user),
-    did: walletToPCAIP10(user),
-    publicKey,
-    encryptedPrivateKey,
-    encryptionType,
-    name: '',
-    encryptedPassword: encryptedPassword,
-    nftOwner: nftOwner ? nftOwner.toLowerCase() : nftOwner,
-  };
-
   const body = {
-    ...updatedData,
+    ...data,
     ...signatureObj,
   };
 
@@ -91,12 +64,11 @@ export const createUserService = async (options: CreateUserOptionsType) => {
     .then((response) => {
       if (response.data)
         response.data.publicKey = verifyPGPPublicKey(
-          response.data.encryptionType,
+          response.data.encryptedPrivateKey,
           response.data.publicKey,
-          response.data.did,
-          response.data.nftOwner
+          response.data.did
         );
-      return response.data;
+      return populateDeprecatedUser(response.data);
     })
     .catch((err) => {
       console.error(`[Push SDK] - API ${requestUrl}: `, err);
@@ -110,62 +82,37 @@ export const authUpdateUserService = async (options: CreateUserOptionsType) => {
     wallet,
     publicKey = '',
     encryptedPrivateKey = '',
-    encryptionType = '',
-    name = '',
-    encryptedPassword = null,
-    nftOwner = null,
     env = Constants.ENV.PROD,
   } = options || {};
 
   const API_BASE_URL = getAPIBaseUrls(env);
 
-  const requestUrl = `${API_BASE_URL}/v1/users/${walletToPCAIP10(user)}/auth`;
+  const requestUrl = `${API_BASE_URL}/v2/users/${walletToPCAIP10(user)}/auth`;
 
   const data = {
     caip10: walletToPCAIP10(user),
     did: walletToPCAIP10(user),
     publicKey,
     encryptedPrivateKey,
-
-    // DEPRECATED in eip191v2
-
-    // encryptionType,
-    // name,
-    // encryptedPassword,
-    // nftOwner: nftOwner ? nftOwner.toLowerCase() : nftOwner,
   };
 
   const hash = generateHash(data);
 
   const signatureObj = await getEip191Signature(wallet!, hash, 'v2');
 
-  // NOTE - To be removed after backend route changes
-  const updatedData = {
-    caip10: walletToPCAIP10(user),
-    publicKey,
-    encryptedPrivateKey,
-    encryptionType,
-    name,
-    encryptedPassword,
-    nftOwner: nftOwner ? nftOwner.toLowerCase() : nftOwner,
-  };
-
-  const body = {
-    ...updatedData,
-    ...signatureObj,
-  };
+  // Exclude the "did" property from the "body" object
+  const { did, ...body } = { ...data, ...signatureObj };
 
   return axios
     .put(requestUrl, body)
     .then((response) => {
       if (response.data)
         response.data.publicKey = verifyPGPPublicKey(
-          response.data.encryptionType,
+          response.data.encryptedPrivateKey,
           response.data.publicKey,
-          response.data.did,
-          response.data.nftOwner
+          response.data.did
         );
-      return response.data;
+      return populateDeprecatedUser(response.data);
     })
     .catch((err) => {
       console.error(`[Push SDK] - API ${requestUrl}: `, err);

diff --git a/packages/restapi/src/lib/chat/helpers/signature.ts b/packages/restapi/src/lib/chat/helpers/signature.ts
@@ -85,8 +85,7 @@ export const getTypedData = (
 export const verifyProfileSignature = (
   verificationProof: string,
   signedData: string,
-  address: string,
-  nftOwner: string
+  address: string
 ): boolean => {
   const SIG_TYPE_V2 = 'eip712v2';
   const SIG_TYPE_V3 = 'eip191';
@@ -138,10 +137,7 @@ export const verifyProfileSignature = (
       hashMessage(signedData),
       signature
     );
-    if (
-      recoveredAddress.toLowerCase() === address.toLowerCase() ||
-      recoveredAddress.toLowerCase() === nftOwner.toLowerCase()
-    ) {
+    if (recoveredAddress.toLowerCase() === address.toLowerCase()) {
       return true;
     } else return false;
   }

diff --git a/packages/restapi/src/lib/helpers/crypto.ts b/packages/restapi/src/lib/helpers/crypto.ts
@@ -23,7 +23,11 @@ import {
   IMessageIPFS,
   ProgressHookType,
 } from '../types';
-import { isValidETHAddress, pCAIP10ToWallet } from './address';
+import {
+  isValidCAIP10NFTAddress,
+  isValidETHAddress,
+  pCAIP10ToWallet,
+} from './address';
 import { verifyProfileSignature } from '../chat/helpers/signature';
 import { upgrade } from '../user/upgradeUser';
 
@@ -575,30 +579,35 @@ export const preparePGPPublicKey = async (
 };
 
 export const verifyPGPPublicKey = (
-  encryptionType: string,
+  encryptedPrivateKey: string,
   publicKey: string,
-  did: string,
-  nftOwner: string
+  did: string
 ): string => {
-  if (encryptionType && encryptionType !== Constants.ENC_TYPE_V1) {
-    const { key, signature: verificationProof } = JSON.parse(publicKey);
-    publicKey = key;
-    let signedData: string;
-    if (encryptionType === Constants.ENC_TYPE_V2)
-      signedData = 'Create Push Chat Profile \n' + generateHash(key);
-    else signedData = 'Create Push Profile \n' + generateHash(key);
-    if (
-      verifyProfileSignature(
-        verificationProof,
-        signedData,
-        pCAIP10ToWallet(did),
-        nftOwner ? pCAIP10ToWallet(nftOwner) : nftOwner
+  try {
+    if (publicKey !== '' && publicKey.includes('signature')) {
+      const { key, signature: verificationProof } = JSON.parse(publicKey);
+      publicKey = key;
+      let signedData: string;
+      if (verificationProof.includes('eip712'))
+        signedData = 'Create Push Chat Profile \n' + generateHash(key);
+      else signedData = 'Create Push Profile \n' + generateHash(key);
+      if (
+        verifyProfileSignature(
+          verificationProof,
+          signedData,
+          isValidCAIP10NFTAddress(did)
+            ? pCAIP10ToWallet(JSON.parse(encryptedPrivateKey).owner)
+            : pCAIP10ToWallet(did)
+        )
       )
-    )
-      return publicKey;
-    else throw new Error('Cannot verify Encryption Keys for this user');
+        return publicKey;
+      else throw new Error('Cannot Verify this publicKey Owner!!!');
+    }
+    return publicKey;
+  } catch (err) {
+    console.warn('Cannot Verify this publicKey Owner!!!');
+    return publicKey;
   }
-  return publicKey;
 };
 
 export const validatePssword = (password: string) => {

diff --git a/packages/restapi/src/lib/types/index.ts b/packages/restapi/src/lib/types/index.ts
@@ -169,21 +169,67 @@ export interface IFeeds {
   deprecatedCode?: string; // scope only at sdk level
 }
 export interface IUser {
+  msgSent: number;
+  maxMsgPersisted: number;
   did: string;
   wallets: string;
-  profilePicture: string | null;
-  publicKey: string;
+  profile: {
+    name: string | null;
+    desc: string | null;
+    picture: string | null;
+    profileVerificationProof: string | null;
+  };
   encryptedPrivateKey: string;
+  publicKey: string;
+  verificationProof: string;
+
+  /**
+   * @deprecated Use `profile.name` instead.
+   */
+  name: string | null;
+  /**
+   * @deprecated Use `profile.desc` instead.
+   */
+  about: string | null;
+  /**
+   * @deprecated Use `profile.picture` instead.
+   */
+  profilePicture: string | null;
+  /**
+   * @deprecated Use `msgSent` instead.
+   */
+  numMsg: number;
+  /**
+   * @deprecated Use `maxMsgPersisted` instead.
+   */
+  allowedNumMsg: number;
+  /**
+   * @deprecated Use `encryptedPrivateKey.version` instead.
+   */
   encryptionType: string;
+  /**
+   * @deprecated Use `verificationProof` instead.
+   */
   signature: string;
+  /**
+   * @deprecated Use `verificationProof` instead.
+   */
   sigType: string;
-  about: string | null;
-  name: string | null;
+  /**
+   * @deprecated Use `encryptedPrivateKey.encryptedPassword` instead.
+   */
   encryptedPassword: string | null;
+  /**
+   * @deprecated
+   */
   nftOwner: string | null;
-  numMsg: number;
-  allowedNumMsg: number;
+  /**
+   * @deprecated Not recommended to be used anywhere
+   */
   linkedListHash?: string | null;
+  /**
+   * @deprecated Not recommended to be used anywhere
+   */
   nfts?: [] | null;
 }
 

diff --git a/packages/restapi/src/lib/user/auth.updateUser.ts b/packages/restapi/src/lib/user/auth.updateUser.ts
@@ -133,15 +133,8 @@ export const update = async (options: AuthUpdateProps): Promise<IUser> => {
     const body = {
       user: user.did,
       wallet,
-      name: user.name ? user.name : '',
-      encryptedPassword: null,
-      nftOwner:
-        pgpEncryptionVersion === ENCRYPTION_TYPE.NFTPGP_V1
-          ? walletToPCAIP10((await signer?.getAddress()) as string)
-          : null, // check for nft,
       publicKey: signedPublicKey,
       encryptedPrivateKey: JSON.stringify(encryptedPgpPrivateKey),
-      encryptionType: pgpEncryptionVersion,
       env,
     };
 

diff --git a/packages/restapi/src/lib/user/createUser.ts b/packages/restapi/src/lib/user/createUser.ts
@@ -131,12 +131,7 @@ export const create = async (options: CreateUserProps): Promise<IUser> => {
       wallet,
       publicKey: publicKey,
       encryptedPrivateKey: JSON.stringify(encryptedPrivateKey),
-      encryptionType: encryptionType,
       env,
-      nftOwner:
-        encryptionType === Constants.ENC_TYPE_V4
-          ? walletToPCAIP10((await signer?.getAddress()) as string)
-          : null, // check for nft
     };
 
     // Report Progress