DM3 Name @@ -167,7 +146,7 @@ export function MobileView() {
{ensDomainName} Name @@ -232,7 +211,7 @@ export function MobileView() {
- {isProfileNotUpdatedForEnsName() && ( + {!isProfileUpdatedForEnsName() && ( diff --git a/packages/messenger-widget/src/components/ConfigureProfile/NormalView.tsx b/packages/messenger-widget/src/components/ConfigureProfile/NormalView.tsx index 4fdfdba8b..19d05b6b5 100644 --- a/packages/messenger-widget/src/components/ConfigureProfile/NormalView.tsx +++ b/packages/messenger-widget/src/components/ConfigureProfile/NormalView.tsx @@ -44,32 +44,11 @@ export function NormalView() { const { dm3Configuration } = useContext(DM3ConfigurationContext); const { - nodes, updateProfileWithTransaction, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, } = useContext(DM3UserProfileContext); - const isProfileNotUpdatedForDm3Name = (): boolean => { - return nodes.filter( - (n) => - isDm3NameConfigured && - (!n.dm3Name?.isActive || !n.opName?.isActive), - ).length - ? true - : false; - }; - - const isProfileNotUpdatedForEnsName = (): boolean => { - return nodes.filter( - (n) => - isEnsNameConfigured && - (!n.ensName?.isActive || !n.gnosisName?.isActive), - ).length - ? true - : false; - }; - const ensDomainName = (existingDm3Name && (existingEnsName?.endsWith('.gno') || @@ -147,7 +126,7 @@ export function NormalView() { setShowDeleteConfirmation(true)} /> - {isProfileNotUpdatedForDm3Name() && ( + {!isProfileUpdatedForDm3Name() && ( @@ -214,7 +193,7 @@ export function NormalView() { {existingEnsName} - {isProfileNotUpdatedForEnsName() && ( + {!isProfileUpdatedForEnsName() && ( diff --git a/packages/messenger-widget/src/components/Preferences/Network/Network.tsx b/packages/messenger-widget/src/components/Preferences/Network/Network.tsx index 38690c9de..e74ee83b2 100644 --- a/packages/messenger-widget/src/components/Preferences/Network/Network.tsx +++ b/packages/messenger-widget/src/components/Preferences/Network/Network.tsx @@ -1,8 +1,6 @@ import './Network.css'; import { Heading } from '../Heading/Heading'; import deleteIcon from '../../../assets/images/delete.svg'; -import activeNodeIcon from '../../../assets/images/active-node.svg'; -import inactiveNodeIcon from '../../../assets/images/inactive-node.svg'; import { useContext, useEffect } from 'react'; import { DM3UserProfileContext } from '../../../context/DM3UserProfileContext'; import { ModalContext } from '../../../context/ModalContext'; @@ -21,9 +19,7 @@ export function Network() { nodeName, addNode, handleNodeNameChange, - changeOrder, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, } = useContext(DM3UserProfileContext); const { setPreferencesOptionSelected } = useContext(ModalContext); @@ -43,7 +39,7 @@ export function Network() { - {nodes.map((data, index) => { + {nodes.dsNames.map((data, index) => { return ( {index + 1}. - {data.dsName} + {data} {/* Delete node option is shown only when more than 1 nodes exists */} - {nodes.length > 1 && ( + {nodes.dsNames.length > 1 && ( )} - - {/* Change order option is shown only when more than 1 nodes exists */} - {nodes.length > 1 && ( - { - if (index) { - changeOrder(index); - } - }} - /> - )} ); })} - {nodes.filter( - (n) => - (isDm3NameConfigured && - (!n.dm3Name?.isActive || - !n.opName?.isActive)) || - (isEnsNameConfigured && - (!n.ensName?.isActive || - !n.gnosisName?.isActive)), - ).length >= 1 && ( + + {!isProfileUpdated() && ( diff --git a/packages/messenger-widget/src/context/DM3UserProfileContext.tsx b/packages/messenger-widget/src/context/DM3UserProfileContext.tsx index 8991eb75f..24364030a 100644 --- a/packages/messenger-widget/src/context/DM3UserProfileContext.tsx +++ b/packages/messenger-widget/src/context/DM3UserProfileContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { + INameProfile, INodeDetails, useDm3UserProfile, } from '../hooks/userProfile/useDm3UserProfile'; @@ -9,16 +10,16 @@ export type DM3UserProfileContextType = { updateProfileWithTransaction: (existingName: string) => void; addNode: () => void; deleteNode: (id: number) => void; - changeOrder: (index: number) => void; - nodes: INodeDetails[]; + nodes: INodeDetails; isModalOpenToAddNode: boolean; setIsModalOpenToAddNode: (action: boolean) => void; error: string | null; setError: (msg: string) => void; nodeName: string; handleNodeNameChange: (e: React.ChangeEvent) => void; - isDm3NameConfigured: boolean; - isEnsNameConfigured: boolean; + isProfileUpdated: () => boolean; + isProfileUpdatedForDm3Name: () => boolean; + isProfileUpdatedForEnsName: () => boolean; }; export const DM3UserProfileContext = @@ -27,16 +28,23 @@ export const DM3UserProfileContext = updateProfileWithTransaction: (existingName: string) => {}, addNode: () => {}, deleteNode: (id: number) => {}, - changeOrder: (index: number) => {}, - nodes: [], + nodes: { + dsNames: [''], + profile: { + publicSigningKey: '', + publicEncryptionKey: '', + deliveryServices: [''], + }, + }, isModalOpenToAddNode: false, setIsModalOpenToAddNode: (action: boolean) => {}, error: null, setError: (msg: string) => {}, nodeName: '', handleNodeNameChange: (e: React.ChangeEvent) => {}, - isDm3NameConfigured: false, - isEnsNameConfigured: false, + isProfileUpdated: () => true, + isProfileUpdatedForDm3Name: () => true, + isProfileUpdatedForEnsName: () => true, }); export const DM3UserProfileContextProvider = ({ @@ -49,7 +57,6 @@ export const DM3UserProfileContextProvider = ({ addNode, updateProfileWithTransaction, deleteNode, - changeOrder, nodes, isModalOpenToAddNode, setIsModalOpenToAddNode, @@ -57,8 +64,9 @@ export const DM3UserProfileContextProvider = ({ setError, nodeName, handleNodeNameChange, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, } = useDm3UserProfile(); return ( @@ -68,7 +76,6 @@ export const DM3UserProfileContextProvider = ({ addNode, updateProfileWithTransaction, deleteNode, - changeOrder, nodes, isModalOpenToAddNode, setIsModalOpenToAddNode, @@ -76,8 +83,9 @@ export const DM3UserProfileContextProvider = ({ setError, nodeName, handleNodeNameChange, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, }} > {children} diff --git a/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx b/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx index 5bfa8e81d..1fbaf14bc 100644 --- a/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx +++ b/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx @@ -1,10 +1,14 @@ -import { useContext, useEffect, useState } from 'react'; +import { useCallback, useContext, useEffect, useState } from 'react'; import { AuthContext } from '../../context/AuthContext'; import { isValidName } from 'ethers/lib/utils'; import { updateProfile } from './../../adapters/offchainResolverApi'; import { DM3ConfigurationContext } from '../../context/DM3ConfigurationContext'; import { ethers } from 'ethers'; -import { Account, getUserProfile, UserProfile } from '@dm3-org/dm3-lib-profile'; +import { + Account, + getUserProfile, + UserProfile, +} from '@dm3-org/dm3-lib-profile'; import { useMainnetProvider } from '../mainnetprovider/useMainnetProvider'; import { fetchExistingDM3Name, @@ -27,7 +31,11 @@ import { } from '../../components/ConfigureProfile/bl'; export interface INodeDetails { - dsName: string; + dsNames: string[]; + profile: UserProfile; +} + +export interface INameProfile { addrName: { profile: null | UserProfile; isActive: boolean; @@ -67,7 +75,10 @@ export const useDm3UserProfile = () => { const { setLoaderContent } = useContext(ModalContext); - const [nodes, setNodes] = useState([]); + const [nodes, setNodes] = useState({ + dsNames: account?.profile?.deliveryServices as string[], + profile: account?.profile as UserProfile, + }); const [isModalOpenToAddNode, setIsModalOpenToAddNode] = useState(false); @@ -78,11 +89,13 @@ export const useDm3UserProfile = () => { const [profileName, setProfileName] = useState(null); - const [isDm3NameConfigured, setIsDm3NameConfigured] = - useState(false); - - const [isEnsNameConfigured, setIsEnsNameConfigured] = - useState(false); + const [namesWithProfile, setNamesWithProfile] = useState({ + addrName: null, + dm3Name: null, + opName: null, + gnosisName: null, + ensName: null, + }); // adds DS nodes in local storage of browser const setDsNodesInLocalStorage = (data: any) => { @@ -91,38 +104,39 @@ export const useDm3UserProfile = () => { }; // retrieves DS nodes from local storage of browser - const getDsNodesFromLocalStorage = (): INodeDetails[] => { + const getDsNodesFromLocalStorage = (): INodeDetails => { const data = localStorage.getItem('ds_nodes'); - return data ? JSON.parse(data) : []; + return data ? JSON.parse(data) : null; }; - const fetchUserProfileForAllNames = async ( - dsNodes: INodeDetails[], - isLocalStorageData: boolean, - ): Promise => { - if (ethAddress && dsNodes.length) { + const fetchUserProfileForAllNames = async (dsNodes: INodeDetails) => { + if (ethAddress && dsNodes) { // fetch ADDR name, DM3 name, OP name, GNO name & ENS name const addressName = ethAddress.concat( dm3Configuration.addressEnsSubdomain, ); + const dm3Name = await fetchExistingDM3Name( account as Account, mainnetProvider, dm3Configuration, addressName, ); + const opName = await fetchExistingOpName( account as Account, mainnetProvider, dm3Configuration, addressName, ); + const ensName = await fetchExistingEnsName( account as Account, mainnetProvider, dm3Configuration, addressName, ); + const gnosisName = await fetchExistingGnosisName( account as Account, mainnetProvider, @@ -130,141 +144,60 @@ export const useDm3UserProfile = () => { addressName, ); - setIsDm3NameConfigured(dm3Name || opName ? true : false); - setIsEnsNameConfigured(ensName || gnosisName ? true : false); - // fetch user profiles for ADDR name, DM3 name, OP name, GNO name & ENS name const addressNameProfile = await getUserProfile( mainnetProvider, addressName, ).catch((e) => null); + const dm3NameProfile = dm3Name ? await getUserProfile(mainnetProvider, dm3Name).catch( - (e) => null, - ) + (e) => null, + ) : null; + const opNameProfile = opName ? await getUserProfile(mainnetProvider, opName).catch( - (e) => null, - ) + (e) => null, + ) : null; + const ensNameProfile = ensName ? await getUserProfile(mainnetProvider, ensName).catch( - (e) => null, - ) + (e) => null, + ) : null; + const gnosisNameProfile = gnosisName ? await getUserProfile(mainnetProvider, gnosisName).catch( - (e) => null, - ) + (e) => null, + ) : null; - let isAddressNameActive: boolean = false; - let isDm3NameActive: boolean = false; - let isOpNameActive: boolean = false; - let isEnsNameActive: boolean = false; - let isGnosisNameActive: boolean = false; - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - dsNodes[dsNodes.length - 1].addrName?.profile === - addressNameProfile?.profile) || - (!isLocalStorageData && addressNameProfile) - ) { - isAddressNameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - dm3NameProfile && - dsNodes[dsNodes.length - 1].dm3Name?.profile === - dm3NameProfile.profile) || - (!isLocalStorageData && dm3NameProfile) - ) { - isDm3NameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - opNameProfile && - dsNodes[dsNodes.length - 1].opName?.profile === - opNameProfile.profile) || - (!isLocalStorageData && opNameProfile) - ) { - isOpNameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - ensNameProfile && - dsNodes[dsNodes.length - 1].ensName?.profile === - ensNameProfile.profile) || - (!isLocalStorageData && ensNameProfile) - ) { - isEnsNameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - gnosisNameProfile && - dsNodes[dsNodes.length - 1].gnosisName?.profile === - gnosisNameProfile.profile) || - (!isLocalStorageData && gnosisNameProfile) - ) { - isGnosisNameActive = true; - } - - const updatedProfile: INodeDetails[] = dsNodes.map((data) => { - return { - dsName: data.dsName, - addrName: isAddressNameActive - ? { - profile: - addressNameProfile?.profile as UserProfile, - isActive: true, - } - : data.addrName, - dm3Name: isDm3NameActive - ? { - profile: dm3NameProfile?.profile as UserProfile, - isActive: true, - } - : data.dm3Name, - opName: isOpNameActive - ? { - profile: opNameProfile?.profile as UserProfile, - isActive: true, - } - : data.opName, - gnosisName: isGnosisNameActive - ? { - profile: - gnosisNameProfile?.profile as UserProfile, - isActive: true, - } - : data.gnosisName, - ensName: isEnsNameActive - ? { - profile: ensNameProfile?.profile as UserProfile, - isActive: true, - } - : data.ensName, - }; + // update states to store the profle for each name + setNamesWithProfile({ + addrName: { + profile: addressNameProfile?.profile ?? null, + isActive: !!addressNameProfile?.profile, + }, + dm3Name: { + profile: dm3NameProfile?.profile ?? null, + isActive: !!dm3NameProfile?.profile, + }, + opName: { + profile: opNameProfile?.profile ?? null, + isActive: !!opNameProfile?.profile, + }, + ensName: { + profile: ensNameProfile?.profile ?? null, + isActive: !!ensNameProfile?.profile, + }, + gnosisName: { + profile: gnosisNameProfile?.profile ?? null, + isActive: !!gnosisNameProfile?.profile, + }, }); - - return updatedProfile; } - return []; }; // Initializes user delivery services to show on Network screen @@ -272,18 +205,10 @@ export const useDm3UserProfile = () => { if (account?.profile) { // fetch DS nodes from profile const profileData = account.profile; - const dsNodesFromProfile = profileData.deliveryServices.map( - (dsNode) => { - return { - dsName: dsNode, - addrName: null, - dm3Name: null, - opName: null, - gnosisName: null, - ensName: null, - }; - }, - ); + const dsNodesFromProfile = { + dsNames: profileData.deliveryServices, + profile: account.profile, + }; // fetch DS nodes from local storage const dsNodeFromLocalStorage = getDsNodesFromLocalStorage(); @@ -292,25 +217,16 @@ export const useDm3UserProfile = () => { const profileDsNodes = dsNodeFromLocalStorage ? dsNodeFromLocalStorage : dsNodesFromProfile; - // const profileDsNodes = dsNodesFromProfile.filter((d) => !storageNodes.find((s) => s.dsName)); - const updatedDsNodes = await fetchUserProfileForAllNames( - profileDsNodes, - dsNodeFromLocalStorage ? true : false, - ); + await fetchUserProfileForAllNames(profileDsNodes); // set nodes in the list to show on Network UI - setNodes(updatedDsNodes); + setNodes(profileDsNodes); return; } - - setNodes([]); }; - const updateProfileForDm3AndAddressName = async () => { - // extract array of delivery service nodes names - const newNodes = nodes.map((n) => n.dsName); - + const updateProfileForDm3AndAddressName = async (newNodes: string[]) => { // add those nodes to new profile const newProfile = { ...account?.profile! }; newProfile.deliveryServices = newNodes; @@ -321,45 +237,20 @@ export const useDm3UserProfile = () => { signature: account?.profileSignature!, }; - let response: { - addrName: { - profile: UserProfile | null; - isActive: boolean; - }; - dm3Name: { - profile: UserProfile | null; - isActive: boolean; - }; - opName: null; - gnosisName: null; - ensName: null; - } = { - addrName: { - profile: null, - isActive: false, - }, - dm3Name: { - profile: null, - isActive: false, - }, - opName: null, - gnosisName: null, - ensName: null, - }; - // update profile for address name const addrSubdomain = dm3Configuration.addressEnsSubdomain.substring(1); - response.addrName.isActive = await updateProfile( + await updateProfile( ethAddress as string, dm3Configuration.resolverBackendUrl, addrSubdomain, signedUserProfile, ); - response.addrName.profile = newProfile as UserProfile; const addressName = ethAddress?.concat( dm3Configuration.addressEnsSubdomain, ); + + // fetch existing DM3 name const dm3Name = await fetchExistingDM3Name( account as Account, mainnetProvider, @@ -367,33 +258,27 @@ export const useDm3UserProfile = () => { addressName as string, ); - // if DM3 name is not set, no need to update the profile for DM3 name - if (!dm3Name) { - response.dm3Name.isActive = false; - } - if (dm3Name && dm3Name.endsWith(dm3Configuration.userEnsSubdomain)) { //removes the leading . from the subdomain. //This is necessary as the resolver does not support subdomains with leading dots const dm3NameSubdomain = dm3Configuration.userEnsSubdomain.substring(1); - response.dm3Name.isActive = await updateProfile( + await updateProfile( ethAddress as string, dm3Configuration.resolverBackendUrl, dm3NameSubdomain, signedUserProfile, ); - response.dm3Name.profile = newProfile as UserProfile; } - return response; + return signedUserProfile.profile; }; const updateProfileWithTransaction = async ( existingName: string | null, ) => { // extract array of delivery service nodes names - const newNodes = nodes.map((n) => n.dsName); + const newNodes = nodes.dsNames.map((n) => n); // add those nodes to new profile const newProfile: UserProfile = { ...account?.profile! }; @@ -446,7 +331,7 @@ export const useDm3UserProfile = () => { const executeTransaction = async () => { // extract array of delivery service nodes names - const newNodes = nodes.map((n) => n.dsName); + const newNodes = nodes.dsNames.map((n) => n); // add those nodes to new profile const newProfile: UserProfile = { ...account?.profile! }; @@ -465,19 +350,18 @@ export const useDm3UserProfile = () => { return; } - // check its OPTIMISM name + // check if its OPTIMISM name if (profileName.endsWith('.op.dm3.eth')) { // start loader setLoaderContent('Updating profile...'); startLoader(); try { - await registerOpName(provider, () => {}, profileName); + await registerOpName(provider, () => { }, profileName); // do transaction await publishProfile(provider, updatedAccount, profileName); - updateNodeList('OPTIMISM', newProfile); setProfileName(null); closeLoader(); } catch (error) { @@ -486,7 +370,7 @@ export const useDm3UserProfile = () => { } } - // check its GNOSIS name + // check if its GNOSIS name if ( profileName?.endsWith('.gno') || profileName?.endsWith('.gnosis.eth') @@ -502,11 +386,10 @@ export const useDm3UserProfile = () => { setLoaderContent, profileName, ethAddress!, - () => {}, - () => {}, + () => { }, + () => { }, ); - updateNodeList('GNOSIS', newProfile); setProfileName(null); closeLoader(); } catch (error) { @@ -515,7 +398,7 @@ export const useDm3UserProfile = () => { } } - // check its ENS name + // check if its ENS name if (profileName?.endsWith('.eth')) { // start loader setLoaderContent('Updating profile...'); @@ -528,11 +411,10 @@ export const useDm3UserProfile = () => { ethAddress!, setLoaderContent, profileName, - () => {}, - () => {}, + () => { }, + () => { }, ); - updateNodeList('ENS', newProfile); setProfileName(null); closeLoader(); } catch (error) { @@ -542,45 +424,6 @@ export const useDm3UserProfile = () => { } }; - const updateNodeList = (name: string, newProfile: UserProfile) => { - // fetch DS nodes from local storage - const dsNodeFromLocalStorage = getDsNodesFromLocalStorage(); - - const profileObject = { - profile: newProfile, - isActive: true, - }; - - const updatedProperty = - name === 'ENS' - ? { ensName: profileObject } - : name === 'GNOSIS' - ? { gnosisName: profileObject } - : { opName: profileObject }; - - // update the DS nodes in local storage - const updatedNodes = dsNodeFromLocalStorage - ? dsNodeFromLocalStorage.map((d) => { - return { - ...d, - ...updatedProperty, - }; - }) - : []; - - setDsNodesInLocalStorage(updatedNodes); - - // update node list - setNodes((prev) => { - return prev.map((d) => { - return { - ...d, - ...updatedProperty, - }; - }); - }); - }; - // Adds new node locally, whose profle has to be published const addNode = async () => { let result: boolean = true; @@ -602,56 +445,105 @@ export const useDm3UserProfile = () => { } // set error if node already exists - if (nodes.filter((data) => data.dsName === nodeName).length) { + if (nodes.dsNames.filter((data) => data === nodeName).length) { setError('ENS name already exists'); return; } - const namesResponse = await updateProfileForDm3AndAddressName(); + // validate DS node by looking into ENS record + if (!(await checkDsNameValidity(nodeName))) { + setError('Invalid DS node name'); + return; + } - // fetch DS nodes from local storage - const dsNodeFromLocalStorage = getDsNodesFromLocalStorage(); + const updatedProfile = await updateProfileForDm3AndAddressName([ + ...nodes.dsNames, + nodeName, + ]); // update the DS nodes in local storage - const updatedNodes = dsNodeFromLocalStorage - ? [ - ...dsNodeFromLocalStorage, - { dsName: nodeName, ...namesResponse }, - ] - : [{ dsName: nodeName, ...namesResponse }]; + const updatedNodes = { + dsNames: [...nodes.dsNames, nodeName], + profile: updatedProfile, + }; + // update nodes in local storage setDsNodesInLocalStorage(updatedNodes); // update node list - setNodes((prev) => { - return [...prev, { dsName: nodeName, ...namesResponse }]; - }); + setNodes(updatedNodes); // clear the input field setNodeName(''); + // clear all errors setError(null); + // close the input field window setIsModalOpenToAddNode(false); }; - // TODO: Call backend function const deleteNode = async (id: number) => { - const updatedNodes = nodes.filter((d, i) => i !== id); - setNodes(updatedNodes); + // filter out node to delete + const updatedNodes = nodes.dsNames.filter((d, i) => i !== id); + + // update profile for address and DM3 name + const updatedProfile = await updateProfileForDm3AndAddressName( + updatedNodes, + ); + + // updated nodes + const newNodes = { dsNames: updatedNodes, profile: updatedProfile }; + + // clear the input field + setNodeName(''); + + // clear all errors + setError(null); + + // close the input field window + setIsModalOpenToAddNode(false); + + // update nodes in local storage + setDsNodesInLocalStorage(newNodes); + + // update node list + setNodes(newNodes); }; - // TODO: Call backend function - const changeOrder = async (index: number) => { - setNodes((prevState) => { - const data = [...prevState]; - const temp = data[index - 1]; - data[index - 1] = data[index]; - data[index] = temp; - return data; - }); + const checkIsProfileUpdated = (): boolean => { + const { addrName, dm3Name, opName } = namesWithProfile; + if ( + addrName && + addrName.isActive && + addrName.profile && + addrName.profile != nodes.profile + ) { + return false; + } + if ( + dm3Name && + dm3Name.isActive && + dm3Name.profile && + dm3Name.profile != nodes.profile + ) { + return false; + } + if ( + opName && + opName.isActive && + opName.profile && + opName.profile != nodes.profile + ) { + return false; + } + return isProfileUpdatedForEnsName(); }; + const isProfileUpdated = useCallback(() => { + return checkIsProfileUpdated(); + }, [nodes]); + const handleNodeNameChange = (e: React.ChangeEvent) => { setError(null); setNodeName(e.target.value); @@ -663,6 +555,56 @@ export const useDm3UserProfile = () => { } }; + const checkDsNameValidity = async (dsName: string): Promise => { + try { + const resolver = await mainnetProvider.getResolver(dsName); + if (resolver) { + const dsProfile = await resolver.getText( + 'network.dm3.deliveryService', + ); + return !!dsProfile; + } + return false; + } catch (error) { + console.log('Invalid DN node : ', error); + return false; + } + }; + + const isProfileUpdatedForDm3Name = () => { + const { opName } = namesWithProfile; + if ( + opName && + opName.isActive && + opName.profile && + opName.profile != nodes.profile + ) { + return false; + } + return true; + }; + + const isProfileUpdatedForEnsName = () => { + const { ensName, gnosisName } = namesWithProfile; + if ( + ensName && + ensName.isActive && + ensName.profile && + ensName.profile != nodes.profile + ) { + return false; + } + if ( + gnosisName && + gnosisName.isActive && + gnosisName.profile && + gnosisName.profile != nodes.profile + ) { + return false; + } + return true; + }; + useEffect(() => { initialize(); }, [account?.ensName]); @@ -672,7 +614,6 @@ export const useDm3UserProfile = () => { addNode, updateProfileWithTransaction, deleteNode, - changeOrder, nodes, isModalOpenToAddNode, setIsModalOpenToAddNode, @@ -682,7 +623,8 @@ export const useDm3UserProfile = () => { setNodeName, handleNodeNameChange, updateProfileForDm3AndAddressName, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, }; }; diff --git a/packages/offchain-resolver/src/http/profile.ts b/packages/offchain-resolver/src/http/profile.ts index 7b53f803d..301ab596c 100644 --- a/packages/offchain-resolver/src/http/profile.ts +++ b/packages/offchain-resolver/src/http/profile.ts @@ -267,19 +267,6 @@ export function profile(web3Provider: ethers.providers.BaseProvider) { return res.status(400).send({ error: 'invalid profile' }); } - /** - * On update of a profile for adding new delivery service nodes can have same subdomain - */ - // const hasAddressProfile = - // !!(await req.app.locals.db.getProfileContainer(address)); - - //One address can only claim one subdomain - // if (hasAddressProfile) { - // return res.status(400).send({ - // error: 'address has already claimed a subdomain', - // }); - // } - const name = `${address}.${subdomain}`; //ask the subdomain manager if the names subdomain is supported @@ -289,18 +276,6 @@ export function profile(web3Provider: ethers.providers.BaseProvider) { }); } - /** - * On update of a profile for adding new delivery service nodes can have same subdomain - */ - // const profileExists = - // !!(await req.app.locals.db.getProfileContainer(name)); - - // if (profileExists) { - // return res - // .status(400) - // .send({ error: 'subdomain already claimed' }); - // } - await req.app.locals.db.setUserProfile( name, signedUserProfile,
setShowDeleteConfirmation(true)} /> - {isProfileNotUpdatedForDm3Name() && ( + {!isProfileUpdatedForDm3Name() && ( @@ -214,7 +193,7 @@ export function NormalView() { {existingEnsName} - {isProfileNotUpdatedForEnsName() && ( + {!isProfileUpdatedForEnsName() && ( diff --git a/packages/messenger-widget/src/components/Preferences/Network/Network.tsx b/packages/messenger-widget/src/components/Preferences/Network/Network.tsx index 38690c9de..e74ee83b2 100644 --- a/packages/messenger-widget/src/components/Preferences/Network/Network.tsx +++ b/packages/messenger-widget/src/components/Preferences/Network/Network.tsx @@ -1,8 +1,6 @@ import './Network.css'; import { Heading } from '../Heading/Heading'; import deleteIcon from '../../../assets/images/delete.svg'; -import activeNodeIcon from '../../../assets/images/active-node.svg'; -import inactiveNodeIcon from '../../../assets/images/inactive-node.svg'; import { useContext, useEffect } from 'react'; import { DM3UserProfileContext } from '../../../context/DM3UserProfileContext'; import { ModalContext } from '../../../context/ModalContext'; @@ -21,9 +19,7 @@ export function Network() { nodeName, addNode, handleNodeNameChange, - changeOrder, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, } = useContext(DM3UserProfileContext); const { setPreferencesOptionSelected } = useContext(ModalContext); @@ -43,7 +39,7 @@ export function Network() { - {nodes.map((data, index) => { + {nodes.dsNames.map((data, index) => { return ( {index + 1}. - {data.dsName} + {data} {/* Delete node option is shown only when more than 1 nodes exists */} - {nodes.length > 1 && ( + {nodes.dsNames.length > 1 && ( )} - - {/* Change order option is shown only when more than 1 nodes exists */} - {nodes.length > 1 && ( - { - if (index) { - changeOrder(index); - } - }} - /> - )} ); })} - {nodes.filter( - (n) => - (isDm3NameConfigured && - (!n.dm3Name?.isActive || - !n.opName?.isActive)) || - (isEnsNameConfigured && - (!n.ensName?.isActive || - !n.gnosisName?.isActive)), - ).length >= 1 && ( + + {!isProfileUpdated() && ( diff --git a/packages/messenger-widget/src/context/DM3UserProfileContext.tsx b/packages/messenger-widget/src/context/DM3UserProfileContext.tsx index 8991eb75f..24364030a 100644 --- a/packages/messenger-widget/src/context/DM3UserProfileContext.tsx +++ b/packages/messenger-widget/src/context/DM3UserProfileContext.tsx @@ -1,5 +1,6 @@ import React from 'react'; import { + INameProfile, INodeDetails, useDm3UserProfile, } from '../hooks/userProfile/useDm3UserProfile'; @@ -9,16 +10,16 @@ export type DM3UserProfileContextType = { updateProfileWithTransaction: (existingName: string) => void; addNode: () => void; deleteNode: (id: number) => void; - changeOrder: (index: number) => void; - nodes: INodeDetails[]; + nodes: INodeDetails; isModalOpenToAddNode: boolean; setIsModalOpenToAddNode: (action: boolean) => void; error: string | null; setError: (msg: string) => void; nodeName: string; handleNodeNameChange: (e: React.ChangeEvent) => void; - isDm3NameConfigured: boolean; - isEnsNameConfigured: boolean; + isProfileUpdated: () => boolean; + isProfileUpdatedForDm3Name: () => boolean; + isProfileUpdatedForEnsName: () => boolean; }; export const DM3UserProfileContext = @@ -27,16 +28,23 @@ export const DM3UserProfileContext = updateProfileWithTransaction: (existingName: string) => {}, addNode: () => {}, deleteNode: (id: number) => {}, - changeOrder: (index: number) => {}, - nodes: [], + nodes: { + dsNames: [''], + profile: { + publicSigningKey: '', + publicEncryptionKey: '', + deliveryServices: [''], + }, + }, isModalOpenToAddNode: false, setIsModalOpenToAddNode: (action: boolean) => {}, error: null, setError: (msg: string) => {}, nodeName: '', handleNodeNameChange: (e: React.ChangeEvent) => {}, - isDm3NameConfigured: false, - isEnsNameConfigured: false, + isProfileUpdated: () => true, + isProfileUpdatedForDm3Name: () => true, + isProfileUpdatedForEnsName: () => true, }); export const DM3UserProfileContextProvider = ({ @@ -49,7 +57,6 @@ export const DM3UserProfileContextProvider = ({ addNode, updateProfileWithTransaction, deleteNode, - changeOrder, nodes, isModalOpenToAddNode, setIsModalOpenToAddNode, @@ -57,8 +64,9 @@ export const DM3UserProfileContextProvider = ({ setError, nodeName, handleNodeNameChange, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, } = useDm3UserProfile(); return ( @@ -68,7 +76,6 @@ export const DM3UserProfileContextProvider = ({ addNode, updateProfileWithTransaction, deleteNode, - changeOrder, nodes, isModalOpenToAddNode, setIsModalOpenToAddNode, @@ -76,8 +83,9 @@ export const DM3UserProfileContextProvider = ({ setError, nodeName, handleNodeNameChange, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, }} > {children} diff --git a/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx b/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx index 5bfa8e81d..1fbaf14bc 100644 --- a/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx +++ b/packages/messenger-widget/src/hooks/userProfile/useDm3UserProfile.tsx @@ -1,10 +1,14 @@ -import { useContext, useEffect, useState } from 'react'; +import { useCallback, useContext, useEffect, useState } from 'react'; import { AuthContext } from '../../context/AuthContext'; import { isValidName } from 'ethers/lib/utils'; import { updateProfile } from './../../adapters/offchainResolverApi'; import { DM3ConfigurationContext } from '../../context/DM3ConfigurationContext'; import { ethers } from 'ethers'; -import { Account, getUserProfile, UserProfile } from '@dm3-org/dm3-lib-profile'; +import { + Account, + getUserProfile, + UserProfile, +} from '@dm3-org/dm3-lib-profile'; import { useMainnetProvider } from '../mainnetprovider/useMainnetProvider'; import { fetchExistingDM3Name, @@ -27,7 +31,11 @@ import { } from '../../components/ConfigureProfile/bl'; export interface INodeDetails { - dsName: string; + dsNames: string[]; + profile: UserProfile; +} + +export interface INameProfile { addrName: { profile: null | UserProfile; isActive: boolean; @@ -67,7 +75,10 @@ export const useDm3UserProfile = () => { const { setLoaderContent } = useContext(ModalContext); - const [nodes, setNodes] = useState([]); + const [nodes, setNodes] = useState({ + dsNames: account?.profile?.deliveryServices as string[], + profile: account?.profile as UserProfile, + }); const [isModalOpenToAddNode, setIsModalOpenToAddNode] = useState(false); @@ -78,11 +89,13 @@ export const useDm3UserProfile = () => { const [profileName, setProfileName] = useState(null); - const [isDm3NameConfigured, setIsDm3NameConfigured] = - useState(false); - - const [isEnsNameConfigured, setIsEnsNameConfigured] = - useState(false); + const [namesWithProfile, setNamesWithProfile] = useState({ + addrName: null, + dm3Name: null, + opName: null, + gnosisName: null, + ensName: null, + }); // adds DS nodes in local storage of browser const setDsNodesInLocalStorage = (data: any) => { @@ -91,38 +104,39 @@ export const useDm3UserProfile = () => { }; // retrieves DS nodes from local storage of browser - const getDsNodesFromLocalStorage = (): INodeDetails[] => { + const getDsNodesFromLocalStorage = (): INodeDetails => { const data = localStorage.getItem('ds_nodes'); - return data ? JSON.parse(data) : []; + return data ? JSON.parse(data) : null; }; - const fetchUserProfileForAllNames = async ( - dsNodes: INodeDetails[], - isLocalStorageData: boolean, - ): Promise => { - if (ethAddress && dsNodes.length) { + const fetchUserProfileForAllNames = async (dsNodes: INodeDetails) => { + if (ethAddress && dsNodes) { // fetch ADDR name, DM3 name, OP name, GNO name & ENS name const addressName = ethAddress.concat( dm3Configuration.addressEnsSubdomain, ); + const dm3Name = await fetchExistingDM3Name( account as Account, mainnetProvider, dm3Configuration, addressName, ); + const opName = await fetchExistingOpName( account as Account, mainnetProvider, dm3Configuration, addressName, ); + const ensName = await fetchExistingEnsName( account as Account, mainnetProvider, dm3Configuration, addressName, ); + const gnosisName = await fetchExistingGnosisName( account as Account, mainnetProvider, @@ -130,141 +144,60 @@ export const useDm3UserProfile = () => { addressName, ); - setIsDm3NameConfigured(dm3Name || opName ? true : false); - setIsEnsNameConfigured(ensName || gnosisName ? true : false); - // fetch user profiles for ADDR name, DM3 name, OP name, GNO name & ENS name const addressNameProfile = await getUserProfile( mainnetProvider, addressName, ).catch((e) => null); + const dm3NameProfile = dm3Name ? await getUserProfile(mainnetProvider, dm3Name).catch( - (e) => null, - ) + (e) => null, + ) : null; + const opNameProfile = opName ? await getUserProfile(mainnetProvider, opName).catch( - (e) => null, - ) + (e) => null, + ) : null; + const ensNameProfile = ensName ? await getUserProfile(mainnetProvider, ensName).catch( - (e) => null, - ) + (e) => null, + ) : null; + const gnosisNameProfile = gnosisName ? await getUserProfile(mainnetProvider, gnosisName).catch( - (e) => null, - ) + (e) => null, + ) : null; - let isAddressNameActive: boolean = false; - let isDm3NameActive: boolean = false; - let isOpNameActive: boolean = false; - let isEnsNameActive: boolean = false; - let isGnosisNameActive: boolean = false; - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - dsNodes[dsNodes.length - 1].addrName?.profile === - addressNameProfile?.profile) || - (!isLocalStorageData && addressNameProfile) - ) { - isAddressNameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - dm3NameProfile && - dsNodes[dsNodes.length - 1].dm3Name?.profile === - dm3NameProfile.profile) || - (!isLocalStorageData && dm3NameProfile) - ) { - isDm3NameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - opNameProfile && - dsNodes[dsNodes.length - 1].opName?.profile === - opNameProfile.profile) || - (!isLocalStorageData && opNameProfile) - ) { - isOpNameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - ensNameProfile && - dsNodes[dsNodes.length - 1].ensName?.profile === - ensNameProfile.profile) || - (!isLocalStorageData && ensNameProfile) - ) { - isEnsNameActive = true; - } - - // 1. local storage has ds node and login account profile matches with localsotrage profile - // 2. OR local storage is empty & DS from logged in profile has to be checked for updated profile - if ( - (isLocalStorageData && - gnosisNameProfile && - dsNodes[dsNodes.length - 1].gnosisName?.profile === - gnosisNameProfile.profile) || - (!isLocalStorageData && gnosisNameProfile) - ) { - isGnosisNameActive = true; - } - - const updatedProfile: INodeDetails[] = dsNodes.map((data) => { - return { - dsName: data.dsName, - addrName: isAddressNameActive - ? { - profile: - addressNameProfile?.profile as UserProfile, - isActive: true, - } - : data.addrName, - dm3Name: isDm3NameActive - ? { - profile: dm3NameProfile?.profile as UserProfile, - isActive: true, - } - : data.dm3Name, - opName: isOpNameActive - ? { - profile: opNameProfile?.profile as UserProfile, - isActive: true, - } - : data.opName, - gnosisName: isGnosisNameActive - ? { - profile: - gnosisNameProfile?.profile as UserProfile, - isActive: true, - } - : data.gnosisName, - ensName: isEnsNameActive - ? { - profile: ensNameProfile?.profile as UserProfile, - isActive: true, - } - : data.ensName, - }; + // update states to store the profle for each name + setNamesWithProfile({ + addrName: { + profile: addressNameProfile?.profile ?? null, + isActive: !!addressNameProfile?.profile, + }, + dm3Name: { + profile: dm3NameProfile?.profile ?? null, + isActive: !!dm3NameProfile?.profile, + }, + opName: { + profile: opNameProfile?.profile ?? null, + isActive: !!opNameProfile?.profile, + }, + ensName: { + profile: ensNameProfile?.profile ?? null, + isActive: !!ensNameProfile?.profile, + }, + gnosisName: { + profile: gnosisNameProfile?.profile ?? null, + isActive: !!gnosisNameProfile?.profile, + }, }); - - return updatedProfile; } - return []; }; // Initializes user delivery services to show on Network screen @@ -272,18 +205,10 @@ export const useDm3UserProfile = () => { if (account?.profile) { // fetch DS nodes from profile const profileData = account.profile; - const dsNodesFromProfile = profileData.deliveryServices.map( - (dsNode) => { - return { - dsName: dsNode, - addrName: null, - dm3Name: null, - opName: null, - gnosisName: null, - ensName: null, - }; - }, - ); + const dsNodesFromProfile = { + dsNames: profileData.deliveryServices, + profile: account.profile, + }; // fetch DS nodes from local storage const dsNodeFromLocalStorage = getDsNodesFromLocalStorage(); @@ -292,25 +217,16 @@ export const useDm3UserProfile = () => { const profileDsNodes = dsNodeFromLocalStorage ? dsNodeFromLocalStorage : dsNodesFromProfile; - // const profileDsNodes = dsNodesFromProfile.filter((d) => !storageNodes.find((s) => s.dsName)); - const updatedDsNodes = await fetchUserProfileForAllNames( - profileDsNodes, - dsNodeFromLocalStorage ? true : false, - ); + await fetchUserProfileForAllNames(profileDsNodes); // set nodes in the list to show on Network UI - setNodes(updatedDsNodes); + setNodes(profileDsNodes); return; } - - setNodes([]); }; - const updateProfileForDm3AndAddressName = async () => { - // extract array of delivery service nodes names - const newNodes = nodes.map((n) => n.dsName); - + const updateProfileForDm3AndAddressName = async (newNodes: string[]) => { // add those nodes to new profile const newProfile = { ...account?.profile! }; newProfile.deliveryServices = newNodes; @@ -321,45 +237,20 @@ export const useDm3UserProfile = () => { signature: account?.profileSignature!, }; - let response: { - addrName: { - profile: UserProfile | null; - isActive: boolean; - }; - dm3Name: { - profile: UserProfile | null; - isActive: boolean; - }; - opName: null; - gnosisName: null; - ensName: null; - } = { - addrName: { - profile: null, - isActive: false, - }, - dm3Name: { - profile: null, - isActive: false, - }, - opName: null, - gnosisName: null, - ensName: null, - }; - // update profile for address name const addrSubdomain = dm3Configuration.addressEnsSubdomain.substring(1); - response.addrName.isActive = await updateProfile( + await updateProfile( ethAddress as string, dm3Configuration.resolverBackendUrl, addrSubdomain, signedUserProfile, ); - response.addrName.profile = newProfile as UserProfile; const addressName = ethAddress?.concat( dm3Configuration.addressEnsSubdomain, ); + + // fetch existing DM3 name const dm3Name = await fetchExistingDM3Name( account as Account, mainnetProvider, @@ -367,33 +258,27 @@ export const useDm3UserProfile = () => { addressName as string, ); - // if DM3 name is not set, no need to update the profile for DM3 name - if (!dm3Name) { - response.dm3Name.isActive = false; - } - if (dm3Name && dm3Name.endsWith(dm3Configuration.userEnsSubdomain)) { //removes the leading . from the subdomain. //This is necessary as the resolver does not support subdomains with leading dots const dm3NameSubdomain = dm3Configuration.userEnsSubdomain.substring(1); - response.dm3Name.isActive = await updateProfile( + await updateProfile( ethAddress as string, dm3Configuration.resolverBackendUrl, dm3NameSubdomain, signedUserProfile, ); - response.dm3Name.profile = newProfile as UserProfile; } - return response; + return signedUserProfile.profile; }; const updateProfileWithTransaction = async ( existingName: string | null, ) => { // extract array of delivery service nodes names - const newNodes = nodes.map((n) => n.dsName); + const newNodes = nodes.dsNames.map((n) => n); // add those nodes to new profile const newProfile: UserProfile = { ...account?.profile! }; @@ -446,7 +331,7 @@ export const useDm3UserProfile = () => { const executeTransaction = async () => { // extract array of delivery service nodes names - const newNodes = nodes.map((n) => n.dsName); + const newNodes = nodes.dsNames.map((n) => n); // add those nodes to new profile const newProfile: UserProfile = { ...account?.profile! }; @@ -465,19 +350,18 @@ export const useDm3UserProfile = () => { return; } - // check its OPTIMISM name + // check if its OPTIMISM name if (profileName.endsWith('.op.dm3.eth')) { // start loader setLoaderContent('Updating profile...'); startLoader(); try { - await registerOpName(provider, () => {}, profileName); + await registerOpName(provider, () => { }, profileName); // do transaction await publishProfile(provider, updatedAccount, profileName); - updateNodeList('OPTIMISM', newProfile); setProfileName(null); closeLoader(); } catch (error) { @@ -486,7 +370,7 @@ export const useDm3UserProfile = () => { } } - // check its GNOSIS name + // check if its GNOSIS name if ( profileName?.endsWith('.gno') || profileName?.endsWith('.gnosis.eth') @@ -502,11 +386,10 @@ export const useDm3UserProfile = () => { setLoaderContent, profileName, ethAddress!, - () => {}, - () => {}, + () => { }, + () => { }, ); - updateNodeList('GNOSIS', newProfile); setProfileName(null); closeLoader(); } catch (error) { @@ -515,7 +398,7 @@ export const useDm3UserProfile = () => { } } - // check its ENS name + // check if its ENS name if (profileName?.endsWith('.eth')) { // start loader setLoaderContent('Updating profile...'); @@ -528,11 +411,10 @@ export const useDm3UserProfile = () => { ethAddress!, setLoaderContent, profileName, - () => {}, - () => {}, + () => { }, + () => { }, ); - updateNodeList('ENS', newProfile); setProfileName(null); closeLoader(); } catch (error) { @@ -542,45 +424,6 @@ export const useDm3UserProfile = () => { } }; - const updateNodeList = (name: string, newProfile: UserProfile) => { - // fetch DS nodes from local storage - const dsNodeFromLocalStorage = getDsNodesFromLocalStorage(); - - const profileObject = { - profile: newProfile, - isActive: true, - }; - - const updatedProperty = - name === 'ENS' - ? { ensName: profileObject } - : name === 'GNOSIS' - ? { gnosisName: profileObject } - : { opName: profileObject }; - - // update the DS nodes in local storage - const updatedNodes = dsNodeFromLocalStorage - ? dsNodeFromLocalStorage.map((d) => { - return { - ...d, - ...updatedProperty, - }; - }) - : []; - - setDsNodesInLocalStorage(updatedNodes); - - // update node list - setNodes((prev) => { - return prev.map((d) => { - return { - ...d, - ...updatedProperty, - }; - }); - }); - }; - // Adds new node locally, whose profle has to be published const addNode = async () => { let result: boolean = true; @@ -602,56 +445,105 @@ export const useDm3UserProfile = () => { } // set error if node already exists - if (nodes.filter((data) => data.dsName === nodeName).length) { + if (nodes.dsNames.filter((data) => data === nodeName).length) { setError('ENS name already exists'); return; } - const namesResponse = await updateProfileForDm3AndAddressName(); + // validate DS node by looking into ENS record + if (!(await checkDsNameValidity(nodeName))) { + setError('Invalid DS node name'); + return; + } - // fetch DS nodes from local storage - const dsNodeFromLocalStorage = getDsNodesFromLocalStorage(); + const updatedProfile = await updateProfileForDm3AndAddressName([ + ...nodes.dsNames, + nodeName, + ]); // update the DS nodes in local storage - const updatedNodes = dsNodeFromLocalStorage - ? [ - ...dsNodeFromLocalStorage, - { dsName: nodeName, ...namesResponse }, - ] - : [{ dsName: nodeName, ...namesResponse }]; + const updatedNodes = { + dsNames: [...nodes.dsNames, nodeName], + profile: updatedProfile, + }; + // update nodes in local storage setDsNodesInLocalStorage(updatedNodes); // update node list - setNodes((prev) => { - return [...prev, { dsName: nodeName, ...namesResponse }]; - }); + setNodes(updatedNodes); // clear the input field setNodeName(''); + // clear all errors setError(null); + // close the input field window setIsModalOpenToAddNode(false); }; - // TODO: Call backend function const deleteNode = async (id: number) => { - const updatedNodes = nodes.filter((d, i) => i !== id); - setNodes(updatedNodes); + // filter out node to delete + const updatedNodes = nodes.dsNames.filter((d, i) => i !== id); + + // update profile for address and DM3 name + const updatedProfile = await updateProfileForDm3AndAddressName( + updatedNodes, + ); + + // updated nodes + const newNodes = { dsNames: updatedNodes, profile: updatedProfile }; + + // clear the input field + setNodeName(''); + + // clear all errors + setError(null); + + // close the input field window + setIsModalOpenToAddNode(false); + + // update nodes in local storage + setDsNodesInLocalStorage(newNodes); + + // update node list + setNodes(newNodes); }; - // TODO: Call backend function - const changeOrder = async (index: number) => { - setNodes((prevState) => { - const data = [...prevState]; - const temp = data[index - 1]; - data[index - 1] = data[index]; - data[index] = temp; - return data; - }); + const checkIsProfileUpdated = (): boolean => { + const { addrName, dm3Name, opName } = namesWithProfile; + if ( + addrName && + addrName.isActive && + addrName.profile && + addrName.profile != nodes.profile + ) { + return false; + } + if ( + dm3Name && + dm3Name.isActive && + dm3Name.profile && + dm3Name.profile != nodes.profile + ) { + return false; + } + if ( + opName && + opName.isActive && + opName.profile && + opName.profile != nodes.profile + ) { + return false; + } + return isProfileUpdatedForEnsName(); }; + const isProfileUpdated = useCallback(() => { + return checkIsProfileUpdated(); + }, [nodes]); + const handleNodeNameChange = (e: React.ChangeEvent) => { setError(null); setNodeName(e.target.value); @@ -663,6 +555,56 @@ export const useDm3UserProfile = () => { } }; + const checkDsNameValidity = async (dsName: string): Promise => { + try { + const resolver = await mainnetProvider.getResolver(dsName); + if (resolver) { + const dsProfile = await resolver.getText( + 'network.dm3.deliveryService', + ); + return !!dsProfile; + } + return false; + } catch (error) { + console.log('Invalid DN node : ', error); + return false; + } + }; + + const isProfileUpdatedForDm3Name = () => { + const { opName } = namesWithProfile; + if ( + opName && + opName.isActive && + opName.profile && + opName.profile != nodes.profile + ) { + return false; + } + return true; + }; + + const isProfileUpdatedForEnsName = () => { + const { ensName, gnosisName } = namesWithProfile; + if ( + ensName && + ensName.isActive && + ensName.profile && + ensName.profile != nodes.profile + ) { + return false; + } + if ( + gnosisName && + gnosisName.isActive && + gnosisName.profile && + gnosisName.profile != nodes.profile + ) { + return false; + } + return true; + }; + useEffect(() => { initialize(); }, [account?.ensName]); @@ -672,7 +614,6 @@ export const useDm3UserProfile = () => { addNode, updateProfileWithTransaction, deleteNode, - changeOrder, nodes, isModalOpenToAddNode, setIsModalOpenToAddNode, @@ -682,7 +623,8 @@ export const useDm3UserProfile = () => { setNodeName, handleNodeNameChange, updateProfileForDm3AndAddressName, - isDm3NameConfigured, - isEnsNameConfigured, + isProfileUpdated, + isProfileUpdatedForDm3Name, + isProfileUpdatedForEnsName, }; }; diff --git a/packages/offchain-resolver/src/http/profile.ts b/packages/offchain-resolver/src/http/profile.ts index 7b53f803d..301ab596c 100644 --- a/packages/offchain-resolver/src/http/profile.ts +++ b/packages/offchain-resolver/src/http/profile.ts @@ -267,19 +267,6 @@ export function profile(web3Provider: ethers.providers.BaseProvider) { return res.status(400).send({ error: 'invalid profile' }); } - /** - * On update of a profile for adding new delivery service nodes can have same subdomain - */ - // const hasAddressProfile = - // !!(await req.app.locals.db.getProfileContainer(address)); - - //One address can only claim one subdomain - // if (hasAddressProfile) { - // return res.status(400).send({ - // error: 'address has already claimed a subdomain', - // }); - // } - const name = `${address}.${subdomain}`; //ask the subdomain manager if the names subdomain is supported @@ -289,18 +276,6 @@ export function profile(web3Provider: ethers.providers.BaseProvider) { }); } - /** - * On update of a profile for adding new delivery service nodes can have same subdomain - */ - // const profileExists = - // !!(await req.app.locals.db.getProfileContainer(name)); - - // if (profileExists) { - // return res - // .status(400) - // .send({ error: 'subdomain already claimed' }); - // } - await req.app.locals.db.setUserProfile( name, signedUserProfile,
{existingEnsName}