update snap and identity interactions

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+#### Changed
+- `@rarimo/rarime-connector` - bump version to 1.0.0-rc.0
+- Getting identity id's
+
 ## [2.3.0] - 2023-11-17
 #### Changed
 - env files interaction, now .env files are able to bundle in ci

package.json

@@ -30,7 +30,7 @@
     "@rarimo/auth-zkp-iden3": "^2.0.0-rc.24",
     "@rarimo/client": "^2.0.0-rc.24",
     "@rarimo/identity-gen-iden3": "^2.0.0-rc.24",
-    "@rarimo/rarime-connector": "0.8.0",
+    "@rarimo/rarime-connector": "1.0.0-rc.2",
     "@rarimo/shared-zkp-iden3": "^2.0.0-rc.24",
     "@rarimo/zkp-gen-iden3": "^2.0.0-rc.24",
     "@sentry/react": "7.63.0",

src/contexts/FormStepperContext/FormStepperContext.tsx

@@ -166,7 +166,6 @@ const FormStepperContextProvider: FC<Props> = ({ children }) => {
 
     createIdentity,
     getIsIdentityProvedMsg,
-    parseDIDToIdentityBigIntString,
   } = useZkpContext()
   const { isVCRequestPending, isUserHasClaimHandled, handleWorldcoinRedirect } =
     useKycContext()
@@ -185,14 +184,20 @@ const FormStepperContextProvider: FC<Props> = ({ children }) => {
   const [searchParams] = useSearchParams()
 
   const handleIfUserClaimExist = useCallback(async (): Promise<Steps> => {
-    const identityIdString = await createIdentity()
+    let identity
 
-    const identityBigIntString = identityIdString
-      ? parseDIDToIdentityBigIntString(identityIdString)
-      : ''
+    try {
+      identity = await createIdentity()
+    } catch (e) {
+      identity = undefined
+    }
+
+    if (!identity) return Steps.IdentityCreationStep
+
+    const { identityIdBigIntString } = identity
 
     const isIdentityProvedMsg = await getIsIdentityProvedMsg(
-      identityBigIntString,
+      identityIdBigIntString,
     )
 
     if (isIdentityProvedMsg) {
@@ -210,12 +215,7 @@ const FormStepperContextProvider: FC<Props> = ({ children }) => {
     }
 
     return Steps.KycProvidersStep
-  }, [
-    createIdentity,
-    getIsIdentityProvedMsg,
-    isUserHasClaimHandled,
-    parseDIDToIdentityBigIntString,
-  ])
+  }, [createIdentity, getIsIdentityProvedMsg, isUserHasClaimHandled])
 
   const detectStartStep = useCallback(async () => {
     if (
@@ -261,11 +261,13 @@ const FormStepperContextProvider: FC<Props> = ({ children }) => {
          * As createIdentity() method is return existing identity or create new,
          * we can detect created one by checking verifiable credentials
          */
-        const identityIdString = await createIdentity()
+        try {
+          const identity = await createIdentity()
 
-        identityBigIntString = identityIdString
-          ? parseDIDToIdentityBigIntString(identityIdString)
-          : ''
+          identityBigIntString = identity?.identityIdBigIntString ?? ''
+        } catch (error) {
+          identityBigIntString = ''
+        }
       }
 
       if (identityBigIntString) {
@@ -293,7 +295,6 @@ const FormStepperContextProvider: FC<Props> = ({ children }) => {
     provider?.isConnected,
     handleWorldcoinRedirect,
     createIdentity,
-    parseDIDToIdentityBigIntString,
     getIsIdentityProvedMsg,
   ])
 
@@ -534,13 +535,19 @@ const FormStepperContextProvider: FC<Props> = ({ children }) => {
   useEffect(() => {
     if (!isLoaded || isInitialized) return
 
-    const h = async () => {
+    let defineStep = async () => {
       if (!currentStep) setCurrentStep(await detectStartStep())
 
       setIsInitialized(true)
     }
 
-    h()
+    defineStep()
+
+    return () => {
+      defineStep = async () => {
+        /* empty */
+      }
+    }
   }, [currentStep, detectStartStep, isInitialized, isLoaded])
 
   useEffect(() => {

src/contexts/KycContext/KycContext.tsx

@@ -494,7 +494,7 @@ const KycContextProvider: FC<HTMLAttributes<HTMLDivElement>> = ({
       const socketEndpoint = `${String(config.ISSUER_API_URL).replace(
         'http',
         'ws',
-      )}/v1/credentials/did:iden3:${identityIdString}/${claimType}/subscribe`
+      )}/v1/credentials/${identityIdString}/${claimType}/subscribe`
 
       const socket = new WebSocket(socketEndpoint)
 
@@ -543,7 +543,7 @@ const KycContextProvider: FC<HTMLAttributes<HTMLDivElement>> = ({
   const isUserHasClaimHandled = useCallback(
     async (_VCCreatedOrKycFinishedCb?: () => void) => {
       const currentIdentityIdString =
-        identityIdString || (await createIdentity())
+        identityIdString || (await createIdentity())?.identityIdString
 
       if (!currentIdentityIdString) throw new TypeError('identityId is empty')
 
@@ -562,7 +562,7 @@ const KycContextProvider: FC<HTMLAttributes<HTMLDivElement>> = ({
         "You already have a verifiable credentials, let's check it out!",
       )
 
-      const vc = await getVerifiableCredentials(identityIdString, claim)
+      const vc = await getVerifiableCredentials(currentIdentityIdString, claim)
 
       detectProviderFromVC(vc)
 

src/contexts/MetamaskZkpSnapContext/MetamaskZkpSnapContext.tsx

@@ -21,7 +21,13 @@ interface MetamaskZkpSnapContextValue {
 
   isLocalSnap: (snapId: string) => boolean
 
-  createIdentity: () => Promise<string | undefined>
+  createIdentity: () => Promise<
+    | {
+        identityIdString: string
+        identityIdBigIntString: string
+      }
+    | undefined
+  >
   getVerifiableCredentials: (
     params: SaveCredentialsRequestParams,
   ) => Promise<W3CCredential[] | undefined>
@@ -91,7 +97,7 @@ const MetamaskZkpSnapContextProvider: FC<HTMLAttributes<HTMLDivElement>> = ({
   const createIdentity = useCallback(async () => {
     if (!connector) throw new TypeError('Connector is not defined')
 
-    return (await connector.createIdentity())?.split(':')?.[2]
+    return connector.createIdentity()
   }, [connector])
 
   /**

src/contexts/ZkpContext/ZkpContext.tsx

@@ -1,7 +1,6 @@
 import { config, SUPPORTED_CHAINS } from '@config'
 import { type EthTransactionResponse } from '@distributedlab/w3p'
 import { type TransactionRequest } from '@ethersproject/providers'
-import { DID } from '@iden3/js-iden3-core'
 import type {
   SaveCredentialsRequestParams,
   StateInfo,
@@ -37,7 +36,7 @@ export type StatesMerkleProof = {
 
 interface ZkpContextValue {
   identityIdString: string
-  identityBigIntString: string
+  identityIdBigIntString: string
   isZKPRequestPending: boolean
   isProveRequestPending: boolean
   verifiableCredentials?: W3CCredential
@@ -49,20 +48,25 @@ interface ZkpContextValue {
   getClaimOffer: (
     _identityIdString?: string,
   ) => Promise<SaveCredentialsRequestParams | undefined>
-  createIdentity: () => Promise<string | undefined>
+  createIdentity: () => Promise<
+    | {
+        identityIdString: string
+        identityIdBigIntString: string
+      }
+    | undefined
+  >
   getVerifiableCredentials: (
     _identityIdString?: string,
     claimOffer?: SaveCredentialsRequestParams,
   ) => Promise<W3CCredential | undefined>
   getZkProof: () => Promise<ZKPProofResponse | undefined>
   submitZkp: (selectedChain: SUPPORTED_CHAINS) => Promise<void>
   getIsIdentityProvedMsg: (_identityBigIntString?: string) => Promise<string>
-  parseDIDToIdentityBigIntString: (identityIdString: string) => string
 }
 
 export const zkpContext = createContext<ZkpContextValue>({
   identityIdString: '',
-  identityBigIntString: '',
+  identityIdBigIntString: '',
 
   txSubmitExplorerLink: '',
 
@@ -91,9 +95,6 @@ export const zkpContext = createContext<ZkpContextValue>({
   getIsIdentityProvedMsg: () => {
     throw new TypeError(`getIsIdentityProvedString() not implemented`)
   },
-  parseDIDToIdentityBigIntString: () => {
-    throw new TypeError(`parseDIDToIdentityBigIntString() not implemented`)
-  },
 })
 
 type Props = HTMLAttributes<HTMLDivElement>
@@ -111,6 +112,7 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
   const [updateStateDetails, setUpdateStateDetails] = useState<UpdateStateDetails>()
   const [verifiableCredentials, setVerifiableCredentials] = useLocalStorage<W3CCredential>('vc', undefined)
   const [identityIdString, setIdentityIdString] = useState('')
+  const [identityIdBigIntString, setIdentityIdBigIntString] = useState('')
   const [txSubmitHash, setTxSubmitHash] = useState('')
   /* eslint-enable */
   /* prettier-ignore-end */
@@ -121,23 +123,6 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
   const { isIdentityProved, isSenderAddressProved, getProveIdentityTxBody } =
     useSbtIdentityVerifier()
 
-  const parseDIDToIdentityBigIntString = useCallback(
-    (identityIdString: string) => {
-      const parsedDid = DID.parse(`did:iden3:${identityIdString}`)
-
-      if (!parsedDid?.id?.bigInt()?.toString()) throw new Error('Invalid DID')
-
-      return parsedDid.id.bigInt().toString()
-    },
-    [],
-  )
-
-  const identityBigIntString = useMemo(() => {
-    if (!identityIdString) return ''
-
-    return parseDIDToIdentityBigIntString(identityIdString)
-  }, [identityIdString, parseDIDToIdentityBigIntString])
-
   const txSubmitExplorerLink = useMemo(() => {
     if (!txSubmitHash || !provider?.getTxUrl) return ''
 
@@ -150,16 +135,24 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
   }, [provider, txSubmitHash])
 
   const createIdentity = useCallback(async () => {
-    if (identityIdString) return identityIdString
+    if (identityIdString && identityIdBigIntString)
+      return { identityIdString, identityIdBigIntString }
+
+    const _identityId = await zkpSnap.createIdentity()
 
-    const _identityIdString = await zkpSnap.createIdentity()
+    if (!_identityId) throw new Error('Identity has not created')
 
-    if (!_identityIdString) throw new Error('Identity has not created')
+    const { identityIdString: did, identityIdBigIntString: didBigInt } =
+      _identityId
 
-    setIdentityIdString(_identityIdString)
+    setIdentityIdString(did)
+    setIdentityIdBigIntString(didBigInt)
 
-    return _identityIdString
-  }, [identityIdString, setIdentityIdString, zkpSnap])
+    return {
+      identityIdString: did,
+      identityIdBigIntString: didBigInt,
+    }
+  }, [identityIdBigIntString, identityIdString, zkpSnap])
 
   /**
    * GETTING VERIFIABLE CREDENTIALS
@@ -171,7 +164,7 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
 
       // FIXME: remove
       const { data } = await issuerApi.get<SaveCredentialsRequestParams>(
-        `/v1/credentials/did:iden3:${currIdentityIdString}/${config.CLAIM_TYPE}`,
+        `/v1/credentials/${currIdentityIdString}/${config.CLAIM_TYPE}`,
       )
 
       return data
@@ -352,7 +345,7 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
   const getIsIdentityProvedMsg = useCallback(
     async (_identityBigIntString?: string) => {
       const currentIdentityBigIntString =
-        _identityBigIntString ?? identityBigIntString
+        _identityBigIntString ?? identityIdBigIntString
 
       if (!currentIdentityBigIntString || !provider?.address)
         throw new TypeError(`Identity or provider is not defined`)
@@ -376,7 +369,7 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
       return provedMsg
     },
     [
-      identityBigIntString,
+      identityIdBigIntString,
       isIdentityProved,
       isSenderAddressProved,
       provider?.address,
@@ -387,7 +380,7 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
     <zkpContext.Provider
       value={{
         identityIdString,
-        identityBigIntString,
+        identityIdBigIntString,
         verifiableCredentials,
         isZKPRequestPending,
         isProveRequestPending,
@@ -402,7 +395,6 @@ const ZkpContextProvider: FC<Props> = ({ children, ...rest }) => {
         getZkProof,
         submitZkp,
         getIsIdentityProvedMsg,
-        parseDIDToIdentityBigIntString,
       }}
       {...rest}
     >

src/helpers/index.ts

@@ -5,7 +5,6 @@ export * from './device.helpers'
 export * from './error-handler'
 export * from './ethereum.helpers'
 export * from './event-bus'
-export * from './file.helpers'
 export * from './ga.helpers'
 export * from './kyc.helpers'
 export * from './promise.helpers'

src/pages/MainPage/MainPage.tsx

@@ -24,6 +24,17 @@ const mainContentAnimationVariants: Variants = {
   },
 }
 
+const mainContentFillAnimationVariants: Variants = {
+  open: {
+    width: '100%',
+    overflowX: 'hidden',
+  },
+  collapsed: {
+    width: '100%',
+    overflowX: 'hidden',
+  },
+}
+
 const sidebarAnimationVariants: Variants = {
   open: {
     width: '33.3%',
@@ -124,7 +135,11 @@ const MainPage: FC<Props> = ({ className, ...rest }) => {
             <motion.div
               className='main-page__content'
               key={mainContentUuid}
-              variants={mainContentAnimationVariants}
+              variants={
+                isSidebarOpen && SidebarComponent
+                  ? mainContentAnimationVariants
+                  : mainContentFillAnimationVariants
+              }
               initial='open'
               animate='collapsed'
               exit='open'