Merge pull request #289 from nevermined-io/feat/set-user-state-no-login

add new state notSigned

Author: spielcrypto

catalog/CHANGELOG.md

@@ -1,11 +1,11 @@
 {
   "name": "@nevermined-io/catalog",
-  "version": "1.3.8",
+  "version": "1.4.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@nevermined-io/sdk-dtp": "^0.4.7",
-    "@nevermined-io/sdk": "^1.3.6",
+    "@nevermined-io/sdk-dtp": "^0.4.8",
+    "@nevermined-io/sdk": "^1.3.7",
     "@types/jsonwebtoken": "^8.5.8",
     "axios": "^0.27.2",
     "axios-retry": "^3.3.1",

catalog/package.json

@@ -313,7 +313,7 @@ export const useUserProfile = (
   /** Submit user profile */
   submitUserProfile: () => Promise<void>
   /** Indicates current user profile loading status */
-  userProfileLoadingStatus: null | 'loading' | 'loaded' | 'failed'
+  userProfileLoadingStatus: null | 'loading' | 'loaded' | 'failed' | 'notSigned'
   /** Reload current user profile */
   reloadUserProfile: () => void
 } => {
@@ -325,7 +325,7 @@ export const useUserProfile = (
   const [isAddressAdded, setIsAddressAdded] = useState(false)
   const [isTokenGenerated, setIsTokenGenerated] = useState(false)
   const [userProfileLoadingStatus, setUserProfileLoadingStatus] = useState<
-    null | 'loading' | 'loaded' | 'failed'
+    null | 'loading' | 'loaded' | 'failed' | 'notSigned'
   >(null)
 
   const [userId, setUserId] = useState('')
@@ -343,14 +343,17 @@ export const useUserProfile = (
   const [reloadTrigger, setReloadTrigger] = useState<Date>()
 
   const checkAuth = async () => {
+    let tokenObject = { token: '' }
     if (!account.isTokenValid()) {
       setIsTokenGenerated(false)
       setErrorMessage(
         'Your login is expired. Please first sign with your wallet before to continue',
       )
-      await account.generateToken()
-      setIsTokenGenerated(true)
+      tokenObject = await account.generateToken()
+      setIsTokenGenerated(Boolean(tokenObject.token))
     }
+
+    return tokenObject.token
   }
 
   const addAddress = async () => {
@@ -425,7 +428,7 @@ export const useUserProfile = (
           setNewAddress('')
         }
 
-        await checkAuth()
+        const tokenAuth = await checkAuth()
 
         setAddresses([...userProfileData.addresses])
 
@@ -439,7 +442,7 @@ export const useUserProfile = (
           additionalInformation: userProfileData.additionalInformation,
         })
 
-        setUserProfileLoadingStatus('loaded')
+        setUserProfileLoadingStatus(tokenAuth ? 'loaded' : 'notSigned')
       } catch (error: any) {
         if (addresses?.length && !addresses.some((a) => a.toLowerCase() === walletAddress)) {
           setNewAddress(walletAddress)

catalog/src/services/account.ts

@@ -1,7 +1,7 @@
 {
   "name": "@nevermined-io/providers",
   "private": false,
-  "version": "1.3.8",
+  "version": "1.4.0",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {

providers/package.json

@@ -11,7 +11,7 @@ import {
 } from 'wagmi'
 import { Provider } from '@wagmi/core'
 import { ConnectKitProvider } from 'connectkit'
-import { ConnectKitProviderProps } from './types'
+import { ConnectKitProviderProps, DataStatus, ProviderStatus } from './types'
 
 /**
  * This component is a layer of [Wagmi](https://wagmi.sh/docs/getting-started) and [ConnectKit](https://docs.family.co/connectkit)
@@ -38,6 +38,8 @@ export interface WalletProviderState {
   login: (connector: Connector<any, any, any>) => void // eslint-disable-line
   /** If chain is between the available networks supported */
   checkIsChainCorrect: () => boolean
+  /** get data status including message*/
+  dataStatus: DataStatus
 }
 
 export const WalletContext = createContext({} as WalletProviderState)
@@ -55,27 +57,52 @@ export const ClientComp = ({
 }) => {
   const [walletAddress, setWalletAddress] = useState<string>('')
   const { address, status } = useAccount()
+  const [dataStatus, setDataStatus] = useState<DataStatus>({} as DataStatus)
   const { connect, connectors } = useConnect({
     onError(error) {
+      setDataStatus({
+        message: error.message,
+        status: ProviderStatus.ErrorConnect
+      })
       console.error(`Error connect: ${error}`)
     },
     onSuccess(data) {
+      setDataStatus({
+        message: data,
+        status: ProviderStatus.SuccessConnect
+      })
       console.log(`Wallet is connected: ${data}`)
     },
   })
   const { disconnect } = useDisconnect({
     onError(error) {
+      setDataStatus({
+        message: error.message,
+        status: ProviderStatus.ErrorDisconnect
+      })
       console.error(`Error disconnect: ${error}`)
     },
-    onSuccess() {
+    onSuccess(data) {
+      setDataStatus({
+        message: data,
+        status: ProviderStatus.SuccessDisconnect
+      })
       console.log(`Wallet is disconnected`)
     },
   })
   const { switchNetwork } = useSwitchNetwork({
     onError(error) {
+      setDataStatus({
+        message: error.message,
+        status: ProviderStatus.ErrorSwitchNetwork
+      })
       console.error(`Error switch network: ${error}`)
     },
     onSuccess(data) {
+      setDataStatus({
+        message: data,
+        status: ProviderStatus.SuccessSwitchNetwork
+      })
       console.log(`New network is selected: ${data.name}`)
     },
   })
@@ -112,6 +139,7 @@ export const ClientComp = ({
         value={{
           client,
           walletAddress,
+          dataStatus,
           login,
           getConnectors,
           logout,

providers/src/client.tsx

@@ -2,26 +2,42 @@ import { ReactNode } from 'react'
 import { Languages, Theme, Mode, CustomTheme, CustomAvatarProps } from 'connectkit/build/types'
 
 export type ConnectKitOptions = {
-  language?: Languages;
-  hideTooltips?: boolean;
-  hideQuestionMarkCTA?: boolean;
-  hideNoWalletCTA?: boolean;
-  walletConnectCTA?: 'modal' | 'link' | 'both';
-  avoidLayoutShift?: boolean; // Avoids layout shift when the ConnectKit modal is open by adding padding to the body
-  embedGoogleFonts?: boolean; // Automatically embeds Google Font of the current theme. Does not work with custom themes
-  truncateLongENSAddress?: boolean;
-  walletConnectName?: string;
-  reducedMotion?: boolean;
-  disclaimer?: ReactNode | string;
-  bufferPolyfill?: boolean;
-  customAvatar?: React.FC<CustomAvatarProps>;
-  initialChainId?: number;
+  language?: Languages
+  hideTooltips?: boolean
+  hideQuestionMarkCTA?: boolean
+  hideNoWalletCTA?: boolean
+  walletConnectCTA?: 'modal' | 'link' | 'both'
+  avoidLayoutShift?: boolean // Avoids layout shift when the ConnectKit modal is open by adding padding to the body
+  embedGoogleFonts?: boolean // Automatically embeds Google Font of the current theme. Does not work with custom themes
+  truncateLongENSAddress?: boolean
+  walletConnectName?: string
+  reducedMotion?: boolean
+  disclaimer?: ReactNode | string
+  bufferPolyfill?: boolean
+  customAvatar?: React.FC<CustomAvatarProps>
+  initialChainId?: number
 }
 
 export type ConnectKitProviderProps = {
-  children?: React.ReactNode;
-  theme?: Theme;
-  mode?: Mode;
-  customTheme?: CustomTheme;
-  options?: ConnectKitOptions;
-}
+  children?: React.ReactNode
+  theme?: Theme
+  mode?: Mode
+  customTheme?: CustomTheme
+  options?: ConnectKitOptions
+}
+
+export enum ProviderStatus {
+  SuccessConnect = 'SuccessConnect',
+  ErrorConnect = 'ErrorConnect',
+  SuccessDisconnect = 'SuccessDisconnect',
+  ErrorDisconnect = 'ErrorDisconnect',
+  SuccessSwitchNetwork = 'SuccessSwitchNetwork',
+  ErrorSwitchNetwork = 'ErrorSwitchNetwork',
+  SuccessWalletSign = 'SuccessWalletSign',
+  ErrorWalletSign = 'ErrorWalletSign',
+}
+
+export interface DataStatus {
+  message: unknown
+  status: ProviderStatus
+}