Compare commits
No commits in common. "5ffedb68d67a1a60177861d0897341ab10741558" and "115a3974e278c137aa2d490327bcc92e4ed0c492" have entirely different histories.
5ffedb68d6
...
115a3974e2
@ -1,6 +1,9 @@
|
|||||||
import { Meta } from '../../types'
|
import { useEffect, useState } from 'react'
|
||||||
|
import { Meta, ProfileMetadata } from '../../types'
|
||||||
import { SigitCardDisplayInfo, SigitStatus } from '../../utils'
|
import { SigitCardDisplayInfo, SigitStatus } from '../../utils'
|
||||||
|
import { Event, kinds } from 'nostr-tools'
|
||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
|
import { MetadataController } from '../../controllers'
|
||||||
import { formatTimestamp, hexToNpub, npubToHex, shorten } from '../../utils'
|
import { formatTimestamp, hexToNpub, npubToHex, shorten } from '../../utils'
|
||||||
import { appPublicRoutes, appPrivateRoutes } from '../../routes'
|
import { appPublicRoutes, appPrivateRoutes } from '../../routes'
|
||||||
import { Button, Divider, Tooltip } from '@mui/material'
|
import { Button, Divider, Tooltip } from '@mui/material'
|
||||||
@ -19,7 +22,6 @@ import { UserAvatarGroup } from '../UserAvatarGroup'
|
|||||||
import styles from './style.module.scss'
|
import styles from './style.module.scss'
|
||||||
import { TooltipChild } from '../TooltipChild'
|
import { TooltipChild } from '../TooltipChild'
|
||||||
import { getExtensionIconLabel } from '../getExtensionIconLabel'
|
import { getExtensionIconLabel } from '../getExtensionIconLabel'
|
||||||
import { useSigitProfiles } from '../../hooks/useSigitProfiles'
|
|
||||||
|
|
||||||
type SigitProps = {
|
type SigitProps = {
|
||||||
meta: Meta
|
meta: Meta
|
||||||
@ -36,10 +38,61 @@ export const DisplaySigit = ({ meta, parsedMeta }: SigitProps) => {
|
|||||||
fileExtensions
|
fileExtensions
|
||||||
} = parsedMeta
|
} = parsedMeta
|
||||||
|
|
||||||
const profiles = useSigitProfiles([
|
const [profiles, setProfiles] = useState<{ [key: string]: ProfileMetadata }>(
|
||||||
...(submittedBy ? [submittedBy] : []),
|
{}
|
||||||
...signers
|
)
|
||||||
])
|
|
||||||
|
useEffect(() => {
|
||||||
|
const hexKeys = new Set<string>([
|
||||||
|
...signers.map((signer) => npubToHex(signer)!)
|
||||||
|
])
|
||||||
|
|
||||||
|
if (submittedBy) {
|
||||||
|
hexKeys.add(npubToHex(submittedBy)!)
|
||||||
|
}
|
||||||
|
|
||||||
|
const metadataController = new MetadataController()
|
||||||
|
|
||||||
|
const handleMetadataEvent = (key: string) => (event: Event) => {
|
||||||
|
const metadataContent =
|
||||||
|
metadataController.extractProfileMetadataContent(event)
|
||||||
|
|
||||||
|
if (metadataContent) {
|
||||||
|
setProfiles((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[key]: metadataContent
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const handleEventListener =
|
||||||
|
(key: string) => (kind: number, event: Event) => {
|
||||||
|
if (kind === kinds.Metadata) {
|
||||||
|
handleMetadataEvent(key)(event)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
hexKeys.forEach((key) => {
|
||||||
|
if (!(key in profiles)) {
|
||||||
|
metadataController.on(key, handleEventListener(key))
|
||||||
|
|
||||||
|
metadataController
|
||||||
|
.findMetadata(key)
|
||||||
|
.then((metadataEvent) => {
|
||||||
|
if (metadataEvent) handleMetadataEvent(key)(metadataEvent)
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(`error occurred in finding metadata for: ${key}`, err)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
hexKeys.forEach((key) => {
|
||||||
|
metadataController.off(key, handleEventListener(key))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [submittedBy, signers, profiles])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={styles.itemWrapper}>
|
<div className={styles.itemWrapper}>
|
||||||
@ -77,7 +130,7 @@ export const DisplaySigit = ({ meta, parsedMeta }: SigitProps) => {
|
|||||||
{submittedBy && signers.length ? (
|
{submittedBy && signers.length ? (
|
||||||
<Divider orientation="vertical" flexItem />
|
<Divider orientation="vertical" flexItem />
|
||||||
) : null}
|
) : null}
|
||||||
<UserAvatarGroup max={7}>
|
<UserAvatarGroup className={styles.signers} max={7}>
|
||||||
{signers.map((signer) => {
|
{signers.map((signer) => {
|
||||||
const pubkey = npubToHex(signer)!
|
const pubkey = npubToHex(signer)!
|
||||||
const profile = profiles[pubkey]
|
const profile = profiles[pubkey]
|
||||||
|
@ -93,6 +93,26 @@
|
|||||||
grid-gap: 10px;
|
grid-gap: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.signers {
|
||||||
|
padding: 0 0 0 10px;
|
||||||
|
|
||||||
|
> * {
|
||||||
|
transition: margin ease 0.2s;
|
||||||
|
margin: 0 0 0 -10px;
|
||||||
|
position: relative;
|
||||||
|
z-index: 1;
|
||||||
|
&:first-child {
|
||||||
|
margin-left: -10px !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
> *:hover,
|
||||||
|
> *:focus-within {
|
||||||
|
margin: 0 15px 0 5px;
|
||||||
|
z-index: 2;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.details {
|
.details {
|
||||||
color: rgba(0, 0, 0, 0.3);
|
color: rgba(0, 0, 0, 0.3);
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
|
@ -1,246 +0,0 @@
|
|||||||
import { CheckCircle, Cancel } from '@mui/icons-material'
|
|
||||||
import { Divider, Tooltip } from '@mui/material'
|
|
||||||
import { verifyEvent } from 'nostr-tools'
|
|
||||||
import { useSigitProfiles } from '../../hooks/useSigitProfiles'
|
|
||||||
import { Meta, SignedEventContent } from '../../types'
|
|
||||||
import {
|
|
||||||
extractFileExtensions,
|
|
||||||
formatTimestamp,
|
|
||||||
fromUnixTimestamp,
|
|
||||||
hexToNpub,
|
|
||||||
npubToHex,
|
|
||||||
shorten
|
|
||||||
} from '../../utils'
|
|
||||||
import { UserAvatar } from '../UserAvatar'
|
|
||||||
import { useSigitMeta } from '../../hooks/useSigitMeta'
|
|
||||||
import { UserAvatarGroup } from '../UserAvatarGroup'
|
|
||||||
|
|
||||||
import styles from './style.module.scss'
|
|
||||||
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
|
|
||||||
import {
|
|
||||||
faCalendar,
|
|
||||||
faCalendarCheck,
|
|
||||||
faCalendarPlus,
|
|
||||||
faEye,
|
|
||||||
faFile,
|
|
||||||
faFileCircleExclamation
|
|
||||||
} from '@fortawesome/free-solid-svg-icons'
|
|
||||||
import { getExtensionIconLabel } from '../getExtensionIconLabel'
|
|
||||||
import { useSelector } from 'react-redux'
|
|
||||||
import { State } from '../../store/rootReducer'
|
|
||||||
|
|
||||||
interface FileUsersProps {
|
|
||||||
meta: Meta
|
|
||||||
}
|
|
||||||
|
|
||||||
export const FileUsers = ({ meta }: FileUsersProps) => {
|
|
||||||
const { usersPubkey } = useSelector((state: State) => state.auth)
|
|
||||||
const {
|
|
||||||
submittedBy,
|
|
||||||
signers,
|
|
||||||
viewers,
|
|
||||||
fileHashes,
|
|
||||||
sig,
|
|
||||||
docSignatures,
|
|
||||||
parsedSignatureEvents,
|
|
||||||
createdAt,
|
|
||||||
signedStatus,
|
|
||||||
completedAt
|
|
||||||
} = useSigitMeta(meta)
|
|
||||||
const profiles = useSigitProfiles([
|
|
||||||
...(submittedBy ? [submittedBy] : []),
|
|
||||||
...signers,
|
|
||||||
...viewers
|
|
||||||
])
|
|
||||||
const userCanSign =
|
|
||||||
typeof usersPubkey !== 'undefined' &&
|
|
||||||
signers.includes(hexToNpub(usersPubkey))
|
|
||||||
|
|
||||||
const ext = extractFileExtensions(Object.keys(fileHashes))
|
|
||||||
|
|
||||||
const getPrevSignersSig = (npub: string) => {
|
|
||||||
// if user is first signer then use creator's signature
|
|
||||||
if (signers[0] === npub) {
|
|
||||||
return sig
|
|
||||||
}
|
|
||||||
|
|
||||||
// find the index of signer
|
|
||||||
const currentSignerIndex = signers.findIndex((signer) => signer === npub)
|
|
||||||
// return null if could not found user in signer's list
|
|
||||||
if (currentSignerIndex === -1) return null
|
|
||||||
// find prev signer
|
|
||||||
const prevSigner = signers[currentSignerIndex - 1]
|
|
||||||
|
|
||||||
// get the signature of prev signer
|
|
||||||
try {
|
|
||||||
const prevSignersEvent = parsedSignatureEvents[prevSigner]
|
|
||||||
return prevSignersEvent.sig
|
|
||||||
} catch (error) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const displayUser = (pubkey: string, verifySignature = false) => {
|
|
||||||
const profile = profiles[pubkey]
|
|
||||||
|
|
||||||
let isValidSignature = false
|
|
||||||
|
|
||||||
if (verifySignature) {
|
|
||||||
const npub = hexToNpub(pubkey)
|
|
||||||
const signedEventString = docSignatures[npub]
|
|
||||||
if (signedEventString) {
|
|
||||||
try {
|
|
||||||
const signedEvent = JSON.parse(signedEventString)
|
|
||||||
const isVerifiedEvent = verifyEvent(signedEvent)
|
|
||||||
|
|
||||||
if (isVerifiedEvent) {
|
|
||||||
// get the actual signature of prev signer
|
|
||||||
const prevSignersSig = getPrevSignersSig(npub)
|
|
||||||
|
|
||||||
// get the signature of prev signer from the content of current signers signedEvent
|
|
||||||
|
|
||||||
try {
|
|
||||||
const obj: SignedEventContent = JSON.parse(signedEvent.content)
|
|
||||||
if (
|
|
||||||
obj.prevSig &&
|
|
||||||
prevSignersSig &&
|
|
||||||
obj.prevSig === prevSignersSig
|
|
||||||
) {
|
|
||||||
isValidSignature = true
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
isValidSignature = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (error) {
|
|
||||||
console.error(
|
|
||||||
`An error occurred in parsing and verifying the signature event for ${pubkey}`,
|
|
||||||
error
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<>
|
|
||||||
<UserAvatar
|
|
||||||
pubkey={pubkey}
|
|
||||||
name={
|
|
||||||
profile?.display_name || profile?.name || shorten(hexToNpub(pubkey))
|
|
||||||
}
|
|
||||||
image={profile?.picture}
|
|
||||||
/>
|
|
||||||
|
|
||||||
{verifySignature && (
|
|
||||||
<>
|
|
||||||
{isValidSignature && (
|
|
||||||
<Tooltip title="Valid signature">
|
|
||||||
<CheckCircle sx={{ color: 'green' }} />
|
|
||||||
</Tooltip>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{!isValidSignature && (
|
|
||||||
<Tooltip title="Invalid signature">
|
|
||||||
<Cancel sx={{ color: 'red' }} />
|
|
||||||
</Tooltip>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return submittedBy ? (
|
|
||||||
<div className={styles.container}>
|
|
||||||
<div className={styles.section}>
|
|
||||||
<p>Signers</p>
|
|
||||||
{displayUser(submittedBy)}
|
|
||||||
{submittedBy && signers.length ? (
|
|
||||||
<Divider orientation="vertical" flexItem />
|
|
||||||
) : null}
|
|
||||||
<UserAvatarGroup max={7}>
|
|
||||||
{signers.length > 0 &&
|
|
||||||
signers.map((signer) => (
|
|
||||||
<span key={signer}>{displayUser(npubToHex(signer)!, true)}</span>
|
|
||||||
))}
|
|
||||||
{viewers.length > 0 &&
|
|
||||||
viewers.map((viewer) => (
|
|
||||||
<span key={viewer}>{displayUser(npubToHex(viewer)!)}</span>
|
|
||||||
))}
|
|
||||||
</UserAvatarGroup>
|
|
||||||
</div>
|
|
||||||
<div className={styles.section}>
|
|
||||||
<p>Details</p>
|
|
||||||
|
|
||||||
<Tooltip
|
|
||||||
title={'Publication date'}
|
|
||||||
placement="top"
|
|
||||||
arrow
|
|
||||||
disableInteractive
|
|
||||||
>
|
|
||||||
<span className={styles.detailsItem}>
|
|
||||||
<FontAwesomeIcon icon={faCalendarPlus} />{' '}
|
|
||||||
{createdAt ? formatTimestamp(createdAt) : <>—</>}
|
|
||||||
</span>
|
|
||||||
</Tooltip>
|
|
||||||
|
|
||||||
<Tooltip
|
|
||||||
title={'Completion date'}
|
|
||||||
placement="top"
|
|
||||||
arrow
|
|
||||||
disableInteractive
|
|
||||||
>
|
|
||||||
<span className={styles.detailsItem}>
|
|
||||||
<FontAwesomeIcon icon={faCalendarCheck} />{' '}
|
|
||||||
{completedAt ? formatTimestamp(completedAt) : <>—</>}
|
|
||||||
</span>
|
|
||||||
</Tooltip>
|
|
||||||
|
|
||||||
{/* User signed date */}
|
|
||||||
{userCanSign ? (
|
|
||||||
<Tooltip
|
|
||||||
title={'Your signature date'}
|
|
||||||
placement="top"
|
|
||||||
arrow
|
|
||||||
disableInteractive
|
|
||||||
>
|
|
||||||
<span className={styles.detailsItem}>
|
|
||||||
<FontAwesomeIcon icon={faCalendar} />{' '}
|
|
||||||
{hexToNpub(usersPubkey) in parsedSignatureEvents ? (
|
|
||||||
parsedSignatureEvents[hexToNpub(usersPubkey)].created_at ? (
|
|
||||||
formatTimestamp(
|
|
||||||
fromUnixTimestamp(
|
|
||||||
parsedSignatureEvents[hexToNpub(usersPubkey)].created_at
|
|
||||||
)
|
|
||||||
)
|
|
||||||
) : (
|
|
||||||
<>—</>
|
|
||||||
)
|
|
||||||
) : (
|
|
||||||
<>—</>
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
</Tooltip>
|
|
||||||
) : null}
|
|
||||||
<span className={styles.detailsItem}>
|
|
||||||
<FontAwesomeIcon icon={faEye} /> {signedStatus}
|
|
||||||
</span>
|
|
||||||
{ext.length > 0 ? (
|
|
||||||
<span className={styles.detailsItem}>
|
|
||||||
{ext.length > 1 ? (
|
|
||||||
<>
|
|
||||||
<FontAwesomeIcon icon={faFile} /> Multiple File Types
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
getExtensionIconLabel(ext[0])
|
|
||||||
)}
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<FontAwesomeIcon icon={faFileCircleExclamation} /> —
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
) : undefined
|
|
||||||
}
|
|
@ -1,41 +0,0 @@
|
|||||||
@import '../../styles/colors.scss';
|
|
||||||
|
|
||||||
.container {
|
|
||||||
border-radius: 4px;
|
|
||||||
background: $overlay-background-color;
|
|
||||||
padding: 15px;
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
grid-gap: 25px;
|
|
||||||
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.section {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
grid-gap: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.detailsItem {
|
|
||||||
transition: ease 0.2s;
|
|
||||||
color: rgba(0, 0, 0, 0.5);
|
|
||||||
font-size: 14px;
|
|
||||||
align-items: center;
|
|
||||||
border-radius: 4px;
|
|
||||||
padding: 5px;
|
|
||||||
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: start;
|
|
||||||
|
|
||||||
> :first-child {
|
|
||||||
padding: 5px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
&:hover {
|
|
||||||
background: $primary-main;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
}
|
|
@ -28,7 +28,7 @@ export const UserAvatarGroup = ({
|
|||||||
|
|
||||||
const childrenArray = Children.toArray(children)
|
const childrenArray = Children.toArray(children)
|
||||||
return (
|
return (
|
||||||
<div className={styles.container} {...rest}>
|
<div {...rest}>
|
||||||
{surplus > 1
|
{surplus > 1
|
||||||
? childrenArray.slice(0, surplus * -1).map((c) => c)
|
? childrenArray.slice(0, surplus * -1).map((c) => c)
|
||||||
: children}
|
: children}
|
||||||
|
@ -1,25 +1,5 @@
|
|||||||
@import '../../styles/colors.scss';
|
@import '../../styles/colors.scss';
|
||||||
|
|
||||||
.container {
|
|
||||||
padding: 0 0 0 10px;
|
|
||||||
|
|
||||||
> * {
|
|
||||||
transition: margin ease 0.2s;
|
|
||||||
margin: 0 0 0 -10px;
|
|
||||||
position: relative;
|
|
||||||
z-index: 1;
|
|
||||||
&:first-child {
|
|
||||||
margin-left: -10px !important;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
> *:hover,
|
|
||||||
> *:focus-within {
|
|
||||||
margin: 0 15px 0 5px;
|
|
||||||
z-index: 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.icon {
|
.icon {
|
||||||
width: 40px;
|
width: 40px;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
|
@ -3,8 +3,7 @@ import { CreateSignatureEventContent, Meta } from '../types'
|
|||||||
import { Mark } from '../types/mark'
|
import { Mark } from '../types/mark'
|
||||||
import {
|
import {
|
||||||
fromUnixTimestamp,
|
fromUnixTimestamp,
|
||||||
hexToNpub,
|
parseCreateSignatureEvent,
|
||||||
parseNostrEvent,
|
|
||||||
parseCreateSignatureEventContent,
|
parseCreateSignatureEventContent,
|
||||||
SigitMetaParseError,
|
SigitMetaParseError,
|
||||||
SigitStatus,
|
SigitStatus,
|
||||||
@ -13,36 +12,11 @@ import {
|
|||||||
import { toast } from 'react-toastify'
|
import { toast } from 'react-toastify'
|
||||||
import { verifyEvent } from 'nostr-tools'
|
import { verifyEvent } from 'nostr-tools'
|
||||||
import { Event } from 'nostr-tools'
|
import { Event } from 'nostr-tools'
|
||||||
import store from '../store/store'
|
|
||||||
import { AuthState } from '../store/auth/types'
|
|
||||||
import { NostrController } from '../controllers'
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Flattened interface that combines properties `Meta`, `CreateSignatureEventContent`,
|
|
||||||
* and `Event` (event's fields are made optional and pubkey and created_at replaced with our versions)
|
|
||||||
*/
|
|
||||||
export interface FlatMeta
|
|
||||||
extends Meta,
|
|
||||||
CreateSignatureEventContent,
|
|
||||||
Partial<Omit<Event, 'pubkey' | 'created_at'>> {
|
|
||||||
// Remove pubkey and use submittedBy as `npub1${string}`
|
|
||||||
submittedBy?: `npub1${string}`
|
|
||||||
|
|
||||||
// Remove created_at and replace with createdAt
|
|
||||||
createdAt?: number
|
|
||||||
|
|
||||||
|
interface FlatMeta extends Meta, CreateSignatureEventContent, Partial<Event> {
|
||||||
// Validated create signature event
|
// Validated create signature event
|
||||||
isValid: boolean
|
isValid: boolean
|
||||||
|
|
||||||
// Decryption
|
|
||||||
encryptionKey: string | null
|
|
||||||
|
|
||||||
// Parsed Document Signatures
|
|
||||||
parsedSignatureEvents: { [signer: `npub1${string}`]: Event }
|
|
||||||
|
|
||||||
// Calculated completion time
|
|
||||||
completedAt?: number
|
|
||||||
|
|
||||||
// Calculated status fields
|
// Calculated status fields
|
||||||
signedStatus: SigitStatus
|
signedStatus: SigitStatus
|
||||||
signersStatus: {
|
signersStatus: {
|
||||||
@ -59,8 +33,8 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
const [isValid, setIsValid] = useState(false)
|
const [isValid, setIsValid] = useState(false)
|
||||||
const [kind, setKind] = useState<number>()
|
const [kind, setKind] = useState<number>()
|
||||||
const [tags, setTags] = useState<string[][]>()
|
const [tags, setTags] = useState<string[][]>()
|
||||||
const [createdAt, setCreatedAt] = useState<number>()
|
const [created_at, setCreatedAt] = useState<number>()
|
||||||
const [submittedBy, setSubmittedBy] = useState<`npub1${string}`>() // submittedBy, pubkey from nostr event
|
const [pubkey, setPubkey] = useState<string>() // submittedBy, pubkey from nostr event
|
||||||
const [id, setId] = useState<string>()
|
const [id, setId] = useState<string>()
|
||||||
const [sig, setSig] = useState<string>()
|
const [sig, setSig] = useState<string>()
|
||||||
|
|
||||||
@ -73,12 +47,6 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
const [title, setTitle] = useState<string>('')
|
const [title, setTitle] = useState<string>('')
|
||||||
const [zipUrl, setZipUrl] = useState<string>('')
|
const [zipUrl, setZipUrl] = useState<string>('')
|
||||||
|
|
||||||
const [parsedSignatureEvents, setParsedSignatureEvents] = useState<{
|
|
||||||
[signer: `npub1${string}`]: Event
|
|
||||||
}>({})
|
|
||||||
|
|
||||||
const [completedAt, setCompletedAt] = useState<number>()
|
|
||||||
|
|
||||||
const [signedStatus, setSignedStatus] = useState<SigitStatus>(
|
const [signedStatus, setSignedStatus] = useState<SigitStatus>(
|
||||||
SigitStatus.Partial
|
SigitStatus.Partial
|
||||||
)
|
)
|
||||||
@ -86,13 +54,13 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
[signer: `npub1${string}`]: SignStatus
|
[signer: `npub1${string}`]: SignStatus
|
||||||
}>({})
|
}>({})
|
||||||
|
|
||||||
const [encryptionKey, setEncryptionKey] = useState<string | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!meta) return
|
if (!meta) return
|
||||||
;(async function () {
|
;(async function () {
|
||||||
try {
|
try {
|
||||||
const createSignatureEvent = await parseNostrEvent(meta.createSignature)
|
const createSignatureEvent = await parseCreateSignatureEvent(
|
||||||
|
meta.createSignature
|
||||||
|
)
|
||||||
|
|
||||||
const { kind, tags, created_at, pubkey, id, sig, content } =
|
const { kind, tags, created_at, pubkey, id, sig, content } =
|
||||||
createSignatureEvent
|
createSignatureEvent
|
||||||
@ -102,7 +70,7 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
setTags(tags)
|
setTags(tags)
|
||||||
// created_at in nostr events are stored in seconds
|
// created_at in nostr events are stored in seconds
|
||||||
setCreatedAt(fromUnixTimestamp(created_at))
|
setCreatedAt(fromUnixTimestamp(created_at))
|
||||||
setSubmittedBy(pubkey as `npub1${string}`)
|
setPubkey(pubkey)
|
||||||
setId(id)
|
setId(id)
|
||||||
setSig(sig)
|
setSig(sig)
|
||||||
|
|
||||||
@ -116,47 +84,13 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
setMarkConfig(markConfig)
|
setMarkConfig(markConfig)
|
||||||
setZipUrl(zipUrl)
|
setZipUrl(zipUrl)
|
||||||
|
|
||||||
if (meta.keys) {
|
// Parse each signature event and set signer status
|
||||||
const { sender, keys } = meta.keys
|
|
||||||
|
|
||||||
// Retrieve the user's public key from the state
|
|
||||||
const usersPubkey = (store.getState().auth as AuthState).usersPubkey!
|
|
||||||
const usersNpub = hexToNpub(usersPubkey)
|
|
||||||
|
|
||||||
// Check if the user's public key is in the keys object
|
|
||||||
if (usersNpub in keys) {
|
|
||||||
// Instantiate the NostrController to decrypt the encryption key
|
|
||||||
const nostrController = NostrController.getInstance()
|
|
||||||
const decrypted = await nostrController
|
|
||||||
.nip04Decrypt(sender, keys[usersNpub])
|
|
||||||
.catch((err) => {
|
|
||||||
console.log(
|
|
||||||
'An error occurred in decrypting encryption key',
|
|
||||||
err
|
|
||||||
)
|
|
||||||
return null
|
|
||||||
})
|
|
||||||
|
|
||||||
setEncryptionKey(decrypted)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Temp. map to hold events
|
|
||||||
const parsedSignatureEventsMap = new Map<`npub1${string}`, Event>()
|
|
||||||
for (const npub in meta.docSignatures) {
|
for (const npub in meta.docSignatures) {
|
||||||
try {
|
try {
|
||||||
// Parse each signature event
|
const event = await parseCreateSignatureEvent(
|
||||||
const event = await parseNostrEvent(
|
|
||||||
meta.docSignatures[npub as `npub1${string}`]
|
meta.docSignatures[npub as `npub1${string}`]
|
||||||
)
|
)
|
||||||
|
|
||||||
const isValidSignature = verifyEvent(event)
|
const isValidSignature = verifyEvent(event)
|
||||||
|
|
||||||
// Save events to a map, to save all at once outside loop
|
|
||||||
// We need the object to find completedAt
|
|
||||||
// Avoided using parsedSignatureEvents due to useEffect deps
|
|
||||||
parsedSignatureEventsMap.set(npub as `npub1${string}`, event)
|
|
||||||
|
|
||||||
setSignersStatus((prev) => {
|
setSignersStatus((prev) => {
|
||||||
return {
|
return {
|
||||||
...prev,
|
...prev,
|
||||||
@ -174,11 +108,6 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
setParsedSignatureEvents(
|
|
||||||
Object.fromEntries(parsedSignatureEventsMap.entries())
|
|
||||||
)
|
|
||||||
|
|
||||||
const signedBy = Object.keys(meta.docSignatures) as `npub1${string}`[]
|
const signedBy = Object.keys(meta.docSignatures) as `npub1${string}`[]
|
||||||
const isCompletelySigned = signers.every((signer) =>
|
const isCompletelySigned = signers.every((signer) =>
|
||||||
signedBy.includes(signer)
|
signedBy.includes(signer)
|
||||||
@ -186,20 +115,6 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
setSignedStatus(
|
setSignedStatus(
|
||||||
isCompletelySigned ? SigitStatus.Complete : SigitStatus.Partial
|
isCompletelySigned ? SigitStatus.Complete : SigitStatus.Partial
|
||||||
)
|
)
|
||||||
|
|
||||||
// Check if all signers signed and are valid
|
|
||||||
if (isCompletelySigned) {
|
|
||||||
setCompletedAt(
|
|
||||||
fromUnixTimestamp(
|
|
||||||
signedBy.reduce((p, c) => {
|
|
||||||
return Math.max(
|
|
||||||
p,
|
|
||||||
parsedSignatureEventsMap.get(c)?.created_at || 0
|
|
||||||
)
|
|
||||||
}, 0)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof SigitMetaParseError) {
|
if (error instanceof SigitMetaParseError) {
|
||||||
toast.error(error.message)
|
toast.error(error.message)
|
||||||
@ -210,15 +125,15 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
}, [meta])
|
}, [meta])
|
||||||
|
|
||||||
return {
|
return {
|
||||||
modifiedAt: meta?.modifiedAt,
|
modifiedAt: meta.modifiedAt,
|
||||||
createSignature: meta?.createSignature,
|
createSignature: meta.createSignature,
|
||||||
docSignatures: meta?.docSignatures,
|
docSignatures: meta.docSignatures,
|
||||||
keys: meta?.keys,
|
keys: meta.keys,
|
||||||
isValid,
|
isValid,
|
||||||
kind,
|
kind,
|
||||||
tags,
|
tags,
|
||||||
createdAt,
|
created_at,
|
||||||
submittedBy,
|
pubkey,
|
||||||
id,
|
id,
|
||||||
sig,
|
sig,
|
||||||
signers,
|
signers,
|
||||||
@ -227,10 +142,7 @@ export const useSigitMeta = (meta: Meta): FlatMeta => {
|
|||||||
markConfig,
|
markConfig,
|
||||||
title,
|
title,
|
||||||
zipUrl,
|
zipUrl,
|
||||||
parsedSignatureEvents,
|
|
||||||
completedAt,
|
|
||||||
signedStatus,
|
signedStatus,
|
||||||
signersStatus,
|
signersStatus
|
||||||
encryptionKey
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,70 +0,0 @@
|
|||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { ProfileMetadata } from '../types'
|
|
||||||
import { MetadataController } from '../controllers'
|
|
||||||
import { npubToHex } from '../utils'
|
|
||||||
import { Event, kinds } from 'nostr-tools'
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extracts profiles from metadata events
|
|
||||||
* @param pubkeys Array of npubs to check
|
|
||||||
* @returns ProfileMetadata
|
|
||||||
*/
|
|
||||||
export const useSigitProfiles = (
|
|
||||||
pubkeys: `npub1${string}`[]
|
|
||||||
): { [key: string]: ProfileMetadata } => {
|
|
||||||
const [profileMetadata, setProfileMetadata] = useState<{
|
|
||||||
[key: string]: ProfileMetadata
|
|
||||||
}>({})
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (pubkeys.length) {
|
|
||||||
const metadataController = new MetadataController()
|
|
||||||
|
|
||||||
// Remove duplicate keys
|
|
||||||
const users = new Set<string>([...pubkeys])
|
|
||||||
|
|
||||||
const handleMetadataEvent = (key: string) => (event: Event) => {
|
|
||||||
const metadataContent =
|
|
||||||
metadataController.extractProfileMetadataContent(event)
|
|
||||||
|
|
||||||
if (metadataContent) {
|
|
||||||
setProfileMetadata((prev) => ({
|
|
||||||
...prev,
|
|
||||||
[key]: metadataContent
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
users.forEach((user) => {
|
|
||||||
const hexKey = npubToHex(user)
|
|
||||||
if (hexKey && !(hexKey in profileMetadata)) {
|
|
||||||
metadataController.on(hexKey, (kind: number, event: Event) => {
|
|
||||||
if (kind === kinds.Metadata) {
|
|
||||||
handleMetadataEvent(hexKey)(event)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
metadataController
|
|
||||||
.findMetadata(hexKey)
|
|
||||||
.then((metadataEvent) => {
|
|
||||||
if (metadataEvent) handleMetadataEvent(hexKey)(metadataEvent)
|
|
||||||
})
|
|
||||||
.catch((err) => {
|
|
||||||
console.error(
|
|
||||||
`error occurred in finding metadata for: ${user}`,
|
|
||||||
err
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
users.forEach((key) => {
|
|
||||||
metadataController.off(key, handleMetadataEvent(key))
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}, [pubkeys, profileMetadata])
|
|
||||||
|
|
||||||
return profileMetadata
|
|
||||||
}
|
|
@ -1,29 +0,0 @@
|
|||||||
@import '../styles/colors.scss';
|
|
||||||
@import '../styles/sizes.scss';
|
|
||||||
|
|
||||||
.container {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: 0.75fr 1.5fr 0.75fr;
|
|
||||||
grid-gap: 30px;
|
|
||||||
flex-grow: 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sidesWrap {
|
|
||||||
position: relative;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sides {
|
|
||||||
position: sticky;
|
|
||||||
top: $header-height + $body-vertical-padding;
|
|
||||||
}
|
|
||||||
|
|
||||||
.files {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
grid-gap: 15px;
|
|
||||||
}
|
|
||||||
.content {
|
|
||||||
max-width: 550px;
|
|
||||||
width: 100%;
|
|
||||||
margin: 0 auto;
|
|
||||||
}
|
|
@ -1,26 +0,0 @@
|
|||||||
import { PropsWithChildren, ReactNode } from 'react'
|
|
||||||
|
|
||||||
import styles from './StickySideColumns.module.scss'
|
|
||||||
|
|
||||||
interface StickySideColumnsProps {
|
|
||||||
left?: ReactNode
|
|
||||||
right?: ReactNode
|
|
||||||
}
|
|
||||||
|
|
||||||
export const StickySideColumns = ({
|
|
||||||
left,
|
|
||||||
right,
|
|
||||||
children
|
|
||||||
}: PropsWithChildren<StickySideColumnsProps>) => {
|
|
||||||
return (
|
|
||||||
<div className={styles.container}>
|
|
||||||
<div className={`${styles.sidesWrap} ${styles.files}`}>
|
|
||||||
<div className={styles.sides}>{left}</div>
|
|
||||||
</div>
|
|
||||||
<div className={styles.content}>{children}</div>
|
|
||||||
<div className={styles.sidesWrap}>
|
|
||||||
<div className={styles.sides}>{right}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
@ -1,20 +1,38 @@
|
|||||||
import { Box, Button, Tooltip, Typography, useTheme } from '@mui/material'
|
import {
|
||||||
|
Box,
|
||||||
|
Button,
|
||||||
|
List,
|
||||||
|
ListItem,
|
||||||
|
ListSubheader,
|
||||||
|
Tooltip,
|
||||||
|
Typography,
|
||||||
|
useTheme
|
||||||
|
} from '@mui/material'
|
||||||
import JSZip from 'jszip'
|
import JSZip from 'jszip'
|
||||||
import { MuiFileInput } from 'mui-file-input'
|
import { MuiFileInput } from 'mui-file-input'
|
||||||
import { Event, verifyEvent } from 'nostr-tools'
|
import { Event, kinds, verifyEvent } from 'nostr-tools'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { toast } from 'react-toastify'
|
import { toast } from 'react-toastify'
|
||||||
import { LoadingSpinner } from '../../components/LoadingSpinner'
|
import { LoadingSpinner } from '../../components/LoadingSpinner'
|
||||||
import { NostrController } from '../../controllers'
|
import { UserAvatar } from '../../components/UserAvatar'
|
||||||
import { CreateSignatureEventContent, Meta } from '../../types'
|
import { MetadataController, NostrController } from '../../controllers'
|
||||||
|
import {
|
||||||
|
CreateSignatureEventContent,
|
||||||
|
Meta,
|
||||||
|
ProfileMetadata,
|
||||||
|
SignedEventContent
|
||||||
|
} from '../../types'
|
||||||
import {
|
import {
|
||||||
decryptArrayBuffer,
|
decryptArrayBuffer,
|
||||||
extractMarksFromSignedMeta,
|
extractMarksFromSignedMeta,
|
||||||
|
extractZipUrlAndEncryptionKey,
|
||||||
getHash,
|
getHash,
|
||||||
hexToNpub,
|
hexToNpub,
|
||||||
unixNow,
|
unixNow,
|
||||||
|
npubToHex,
|
||||||
parseJson,
|
parseJson,
|
||||||
readContentOfZipEntry,
|
readContentOfZipEntry,
|
||||||
|
shorten,
|
||||||
signEventForMetaFile
|
signEventForMetaFile
|
||||||
} from '../../utils'
|
} from '../../utils'
|
||||||
import styles from './style.module.scss'
|
import styles from './style.module.scss'
|
||||||
@ -33,9 +51,6 @@ import { useSelector } from 'react-redux'
|
|||||||
import { getLastSignersSig } from '../../utils/sign.ts'
|
import { getLastSignersSig } from '../../utils/sign.ts'
|
||||||
import { saveAs } from 'file-saver'
|
import { saveAs } from 'file-saver'
|
||||||
import { Container } from '../../components/Container'
|
import { Container } from '../../components/Container'
|
||||||
import { useSigitMeta } from '../../hooks/useSigitMeta.tsx'
|
|
||||||
import { Files } from '../../layouts/Files.tsx'
|
|
||||||
import { FileUsers } from '../../components/FilesUsers.tsx/index.tsx'
|
|
||||||
|
|
||||||
export const VerifyPage = () => {
|
export const VerifyPage = () => {
|
||||||
const theme = useTheme()
|
const theme = useTheme()
|
||||||
@ -48,30 +63,52 @@ export const VerifyPage = () => {
|
|||||||
* uploadedZip will be received from home page when a user uploads a sigit zip wrapper that contains meta.json
|
* uploadedZip will be received from home page when a user uploads a sigit zip wrapper that contains meta.json
|
||||||
* meta will be received in navigation from create & home page in online mode
|
* meta will be received in navigation from create & home page in online mode
|
||||||
*/
|
*/
|
||||||
const { uploadedZip, meta } = location.state || {}
|
const { uploadedZip, meta: metaInNavState } = location.state || {}
|
||||||
|
|
||||||
const { submittedBy, zipUrl, encryptionKey, signers, viewers, fileHashes } =
|
|
||||||
useSigitMeta(meta)
|
|
||||||
|
|
||||||
const [isLoading, setIsLoading] = useState(false)
|
const [isLoading, setIsLoading] = useState(false)
|
||||||
const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState('')
|
const [loadingSpinnerDesc, setLoadingSpinnerDesc] = useState('')
|
||||||
|
|
||||||
const [selectedFile, setSelectedFile] = useState<File | null>(null)
|
const [selectedFile, setSelectedFile] = useState<File | null>(null)
|
||||||
|
const [meta, setMeta] = useState<Meta | null>(null)
|
||||||
|
|
||||||
|
const [submittedBy, setSubmittedBy] = useState<string>()
|
||||||
|
|
||||||
|
const [signers, setSigners] = useState<`npub1${string}`[]>([])
|
||||||
|
const [viewers, setViewers] = useState<`npub1${string}`[]>([])
|
||||||
|
const [creatorFileHashes, setCreatorFileHashes] = useState<{
|
||||||
|
[key: string]: string
|
||||||
|
}>({})
|
||||||
const [currentFileHashes, setCurrentFileHashes] = useState<{
|
const [currentFileHashes, setCurrentFileHashes] = useState<{
|
||||||
[key: string]: string | null
|
[key: string]: string | null
|
||||||
}>(fileHashes)
|
}>({})
|
||||||
const [files, setFiles] = useState<{ [filename: string]: PdfFile }>({})
|
const [files, setFiles] = useState<{ [filename: string]: PdfFile }>({})
|
||||||
|
|
||||||
|
const [metadata, setMetadata] = useState<{ [key: string]: ProfileMetadata }>(
|
||||||
|
{}
|
||||||
|
)
|
||||||
const usersPubkey = useSelector((state: State) => state.auth.usersPubkey)
|
const usersPubkey = useSelector((state: State) => state.auth.usersPubkey)
|
||||||
const nostrController = NostrController.getInstance()
|
const nostrController = NostrController.getInstance()
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (uploadedZip) {
|
if (uploadedZip) {
|
||||||
setSelectedFile(uploadedZip)
|
setSelectedFile(uploadedZip)
|
||||||
} else if (meta && encryptionKey) {
|
} else if (metaInNavState) {
|
||||||
const processSigit = async () => {
|
const processSigit = async () => {
|
||||||
setIsLoading(true)
|
setIsLoading(true)
|
||||||
|
setLoadingSpinnerDesc('Extracting zipUrl and encryption key from meta')
|
||||||
|
|
||||||
|
const res = await extractZipUrlAndEncryptionKey(metaInNavState)
|
||||||
|
if (!res) {
|
||||||
|
setIsLoading(false)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
zipUrl,
|
||||||
|
encryptionKey,
|
||||||
|
createSignatureEvent,
|
||||||
|
createSignatureContent
|
||||||
|
} = res
|
||||||
|
|
||||||
setLoadingSpinnerDesc('Fetching file from file server')
|
setLoadingSpinnerDesc('Fetching file from file server')
|
||||||
axios
|
axios
|
||||||
@ -138,6 +175,12 @@ export const VerifyPage = () => {
|
|||||||
setCurrentFileHashes(fileHashes)
|
setCurrentFileHashes(fileHashes)
|
||||||
setFiles(files)
|
setFiles(files)
|
||||||
|
|
||||||
|
setSigners(createSignatureContent.signers)
|
||||||
|
setViewers(createSignatureContent.viewers)
|
||||||
|
setCreatorFileHashes(createSignatureContent.fileHashes)
|
||||||
|
setSubmittedBy(createSignatureEvent.pubkey)
|
||||||
|
|
||||||
|
setMeta(metaInNavState)
|
||||||
setIsLoading(false)
|
setIsLoading(false)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -154,7 +197,49 @@ export const VerifyPage = () => {
|
|||||||
|
|
||||||
processSigit()
|
processSigit()
|
||||||
}
|
}
|
||||||
}, [encryptionKey, meta, uploadedZip, zipUrl])
|
}, [uploadedZip, metaInNavState])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (submittedBy) {
|
||||||
|
const metadataController = new MetadataController()
|
||||||
|
|
||||||
|
const users = [submittedBy, ...signers, ...viewers]
|
||||||
|
|
||||||
|
users.forEach((user) => {
|
||||||
|
const pubkey = npubToHex(user)!
|
||||||
|
|
||||||
|
if (!(pubkey in metadata)) {
|
||||||
|
const handleMetadataEvent = (event: Event) => {
|
||||||
|
const metadataContent =
|
||||||
|
metadataController.extractProfileMetadataContent(event)
|
||||||
|
if (metadataContent)
|
||||||
|
setMetadata((prev) => ({
|
||||||
|
...prev,
|
||||||
|
[pubkey]: metadataContent
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
metadataController.on(pubkey, (kind: number, event: Event) => {
|
||||||
|
if (kind === kinds.Metadata) {
|
||||||
|
handleMetadataEvent(event)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
metadataController
|
||||||
|
.findMetadata(pubkey)
|
||||||
|
.then((metadataEvent) => {
|
||||||
|
if (metadataEvent) handleMetadataEvent(metadataEvent)
|
||||||
|
})
|
||||||
|
.catch((err) => {
|
||||||
|
console.error(
|
||||||
|
`error occurred in finding metadata for: ${user}`,
|
||||||
|
err
|
||||||
|
)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [submittedBy, signers, viewers, metadata])
|
||||||
|
|
||||||
const handleVerify = async () => {
|
const handleVerify = async () => {
|
||||||
if (!selectedFile) return
|
if (!selectedFile) return
|
||||||
@ -260,9 +345,44 @@ export const VerifyPage = () => {
|
|||||||
|
|
||||||
if (!createSignatureContent) return
|
if (!createSignatureContent) return
|
||||||
|
|
||||||
|
setSigners(createSignatureContent.signers)
|
||||||
|
setViewers(createSignatureContent.viewers)
|
||||||
|
setCreatorFileHashes(createSignatureContent.fileHashes)
|
||||||
|
setSubmittedBy(createSignatureEvent.pubkey)
|
||||||
|
|
||||||
|
setMeta(parsedMetaJson)
|
||||||
setIsLoading(false)
|
setIsLoading(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getPrevSignersSig = (npub: string) => {
|
||||||
|
if (!meta) return null
|
||||||
|
|
||||||
|
// if user is first signer then use creator's signature
|
||||||
|
if (signers[0] === npub) {
|
||||||
|
try {
|
||||||
|
const createSignatureEvent: Event = JSON.parse(meta.createSignature)
|
||||||
|
return createSignatureEvent.sig
|
||||||
|
} catch (error) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// find the index of signer
|
||||||
|
const currentSignerIndex = signers.findIndex((signer) => signer === npub)
|
||||||
|
// return null if could not found user in signer's list
|
||||||
|
if (currentSignerIndex === -1) return null
|
||||||
|
// find prev signer
|
||||||
|
const prevSigner = signers[currentSignerIndex - 1]
|
||||||
|
|
||||||
|
// get the signature of prev signer
|
||||||
|
try {
|
||||||
|
const prevSignersEvent: Event = JSON.parse(meta.docSignatures[prevSigner])
|
||||||
|
return prevSignersEvent.sig
|
||||||
|
} catch (error) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const handleExport = async () => {
|
const handleExport = async () => {
|
||||||
if (Object.entries(files).length === 0 || !meta || !usersPubkey) return
|
if (Object.entries(files).length === 0 || !meta || !usersPubkey) return
|
||||||
|
|
||||||
@ -330,6 +450,76 @@ export const VerifyPage = () => {
|
|||||||
setIsLoading(false)
|
setIsLoading(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const displayUser = (pubkey: string, verifySignature = false) => {
|
||||||
|
const profile = metadata[pubkey]
|
||||||
|
|
||||||
|
let isValidSignature = false
|
||||||
|
|
||||||
|
if (verifySignature) {
|
||||||
|
const npub = hexToNpub(pubkey)
|
||||||
|
const signedEventString = meta ? meta.docSignatures[npub] : null
|
||||||
|
if (signedEventString) {
|
||||||
|
try {
|
||||||
|
const signedEvent = JSON.parse(signedEventString)
|
||||||
|
const isVerifiedEvent = verifyEvent(signedEvent)
|
||||||
|
|
||||||
|
if (isVerifiedEvent) {
|
||||||
|
// get the actual signature of prev signer
|
||||||
|
const prevSignersSig = getPrevSignersSig(npub)
|
||||||
|
|
||||||
|
// get the signature of prev signer from the content of current signers signedEvent
|
||||||
|
|
||||||
|
try {
|
||||||
|
const obj: SignedEventContent = JSON.parse(signedEvent.content)
|
||||||
|
if (
|
||||||
|
obj.prevSig &&
|
||||||
|
prevSignersSig &&
|
||||||
|
obj.prevSig === prevSignersSig
|
||||||
|
) {
|
||||||
|
isValidSignature = true
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
isValidSignature = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.error(
|
||||||
|
`An error occurred in parsing and verifying the signature event for ${pubkey}`,
|
||||||
|
error
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<UserAvatar
|
||||||
|
pubkey={pubkey}
|
||||||
|
name={
|
||||||
|
profile?.display_name || profile?.name || shorten(hexToNpub(pubkey))
|
||||||
|
}
|
||||||
|
image={profile?.picture}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{verifySignature && (
|
||||||
|
<>
|
||||||
|
{isValidSignature && (
|
||||||
|
<Tooltip title="Valid signature">
|
||||||
|
<CheckCircle sx={{ color: theme.palette.success.light }} />
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!isValidSignature && (
|
||||||
|
<Tooltip title="Invalid signature">
|
||||||
|
<Cancel sx={{ color: theme.palette.error.main }} />
|
||||||
|
</Tooltip>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const displayExportedBy = () => {
|
const displayExportedBy = () => {
|
||||||
if (!meta || !meta.exportSignature) return null
|
if (!meta || !meta.exportSignature) return null
|
||||||
|
|
||||||
@ -339,7 +529,7 @@ export const VerifyPage = () => {
|
|||||||
const exportSignatureEvent = JSON.parse(exportSignatureString) as Event
|
const exportSignatureEvent = JSON.parse(exportSignatureString) as Event
|
||||||
|
|
||||||
if (verifyEvent(exportSignatureEvent)) {
|
if (verifyEvent(exportSignatureEvent)) {
|
||||||
// return displayUser(exportSignatureEvent.pubkey)
|
return displayUser(exportSignatureEvent.pubkey)
|
||||||
} else {
|
} else {
|
||||||
toast.error(`Invalid export signature!`)
|
toast.error(`Invalid export signature!`)
|
||||||
return (
|
return (
|
||||||
@ -386,13 +576,113 @@ export const VerifyPage = () => {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{meta && (
|
{meta && (
|
||||||
<Files
|
<>
|
||||||
left={
|
<List
|
||||||
<>
|
sx={{
|
||||||
|
bgcolor: 'background.paper',
|
||||||
|
marginTop: 2
|
||||||
|
}}
|
||||||
|
subheader={
|
||||||
|
<ListSubheader className={styles.subHeader}>
|
||||||
|
Meta Info
|
||||||
|
</ListSubheader>
|
||||||
|
}
|
||||||
|
>
|
||||||
|
{submittedBy && (
|
||||||
|
<ListItem
|
||||||
|
sx={{
|
||||||
|
marginTop: 1,
|
||||||
|
gap: '15px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="h6" sx={{ color: textColor }}>
|
||||||
|
Submitted By
|
||||||
|
</Typography>
|
||||||
|
{displayUser(submittedBy)}
|
||||||
|
</ListItem>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<ListItem
|
||||||
|
sx={{
|
||||||
|
marginTop: 1,
|
||||||
|
gap: '15px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="h6" sx={{ color: textColor }}>
|
||||||
|
Exported By
|
||||||
|
</Typography>
|
||||||
|
{displayExportedBy()}
|
||||||
|
<Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
|
||||||
|
<Button onClick={handleExport} variant="contained">
|
||||||
|
Export Sigit
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
</ListItem>
|
||||||
|
|
||||||
|
{signers.length > 0 && (
|
||||||
|
<ListItem
|
||||||
|
sx={{
|
||||||
|
marginTop: 1,
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: 'flex-start'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="h6" sx={{ color: textColor }}>
|
||||||
|
Signers
|
||||||
|
</Typography>
|
||||||
|
<ul className={styles.usersList}>
|
||||||
|
{signers.map((signer) => (
|
||||||
|
<li
|
||||||
|
key={signer}
|
||||||
|
style={{
|
||||||
|
color: textColor,
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
gap: '15px'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{displayUser(npubToHex(signer)!, true)}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</ListItem>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{viewers.length > 0 && (
|
||||||
|
<ListItem
|
||||||
|
sx={{
|
||||||
|
marginTop: 1,
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: 'flex-start'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="h6" sx={{ color: textColor }}>
|
||||||
|
Viewers
|
||||||
|
</Typography>
|
||||||
|
<ul className={styles.usersList}>
|
||||||
|
{viewers.map((viewer) => (
|
||||||
|
<li key={viewer} style={{ color: textColor }}>
|
||||||
|
{displayUser(npubToHex(viewer)!)}
|
||||||
|
</li>
|
||||||
|
))}
|
||||||
|
</ul>
|
||||||
|
</ListItem>
|
||||||
|
)}
|
||||||
|
|
||||||
|
<ListItem
|
||||||
|
sx={{
|
||||||
|
marginTop: 1,
|
||||||
|
flexDirection: 'column',
|
||||||
|
alignItems: 'flex-start'
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Typography variant="h6" sx={{ color: textColor }}>
|
||||||
|
Files
|
||||||
|
</Typography>
|
||||||
<Box className={styles.filesWrapper}>
|
<Box className={styles.filesWrapper}>
|
||||||
{Object.entries(currentFileHashes).map(
|
{Object.entries(currentFileHashes).map(
|
||||||
([filename, hash], index) => {
|
([filename, hash], index) => {
|
||||||
const isValidHash = fileHashes[filename] === hash
|
const isValidHash = creatorFileHashes[filename] === hash
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box key={`file-${index}`} className={styles.file}>
|
<Box key={`file-${index}`} className={styles.file}>
|
||||||
@ -424,17 +714,9 @@ export const VerifyPage = () => {
|
|||||||
}
|
}
|
||||||
)}
|
)}
|
||||||
</Box>
|
</Box>
|
||||||
{displayExportedBy()}
|
</ListItem>
|
||||||
<Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
|
</List>
|
||||||
<Button onClick={handleExport} variant="contained">
|
</>
|
||||||
Export Sigit
|
|
||||||
</Button>
|
|
||||||
</Box>
|
|
||||||
</>
|
|
||||||
}
|
|
||||||
right={<FileUsers meta={meta} />}
|
|
||||||
content={<div style={{ height: '300vh' }}></div>}
|
|
||||||
/>
|
|
||||||
)}
|
)}
|
||||||
</Container>
|
</Container>
|
||||||
</>
|
</>
|
||||||
|
@ -62,33 +62,38 @@ function handleError(error: unknown): Error {
|
|||||||
|
|
||||||
// Reuse common error messages for meta parsing
|
// Reuse common error messages for meta parsing
|
||||||
export enum SigitMetaParseErrorType {
|
export enum SigitMetaParseErrorType {
|
||||||
'PARSE_ERROR_EVENT' = 'error occurred in parsing the create signature event',
|
'PARSE_ERROR_SIGNATURE_EVENT' = 'error occurred in parsing the create signature event',
|
||||||
'PARSE_ERROR_SIGNATURE_EVENT_CONTENT' = "err in parsing the createSignature event's content"
|
'PARSE_ERROR_SIGNATURE_EVENT_CONTENT' = "err in parsing the createSignature event's content"
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SigitCardDisplayInfo {
|
export interface SigitCardDisplayInfo {
|
||||||
createdAt?: number
|
createdAt?: number
|
||||||
title?: string
|
title?: string
|
||||||
submittedBy?: `npub1${string}`
|
submittedBy?: string
|
||||||
signers: `npub1${string}`[]
|
signers: `npub1${string}`[]
|
||||||
fileExtensions: string[]
|
fileExtensions: string[]
|
||||||
signedStatus: SigitStatus
|
signedStatus: SigitStatus
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper for event parser that throws custom SigitMetaParseError with cause and context
|
* Wrapper for createSignatureEvent parse that throws custom SigitMetaParseError with cause and context
|
||||||
* @param raw Raw string for parsing
|
* @param raw Raw string for parsing
|
||||||
* @returns parsed Event
|
* @returns parsed Event
|
||||||
*/
|
*/
|
||||||
export const parseNostrEvent = async (raw: string): Promise<Event> => {
|
export const parseCreateSignatureEvent = async (
|
||||||
|
raw: string
|
||||||
|
): Promise<Event> => {
|
||||||
try {
|
try {
|
||||||
const event = await parseJson<Event>(raw)
|
const createSignatureEvent = await parseJson<Event>(raw)
|
||||||
return event
|
return createSignatureEvent
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
throw new SigitMetaParseError(SigitMetaParseErrorType.PARSE_ERROR_EVENT, {
|
throw new SigitMetaParseError(
|
||||||
cause: handleError(error),
|
SigitMetaParseErrorType.PARSE_ERROR_SIGNATURE_EVENT,
|
||||||
context: raw
|
{
|
||||||
})
|
cause: handleError(error),
|
||||||
|
context: raw
|
||||||
|
}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,7 +135,9 @@ export const extractSigitCardDisplayInfo = async (meta: Meta) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const createSignatureEvent = await parseNostrEvent(meta.createSignature)
|
const createSignatureEvent = await parseCreateSignatureEvent(
|
||||||
|
meta.createSignature
|
||||||
|
)
|
||||||
|
|
||||||
// created_at in nostr events are stored in seconds
|
// created_at in nostr events are stored in seconds
|
||||||
sigitInfo.createdAt = fromUnixTimestamp(createSignatureEvent.created_at)
|
sigitInfo.createdAt = fromUnixTimestamp(createSignatureEvent.created_at)
|
||||||
@ -140,7 +147,13 @@ export const extractSigitCardDisplayInfo = async (meta: Meta) => {
|
|||||||
)
|
)
|
||||||
|
|
||||||
const files = Object.keys(createSignatureContent.fileHashes)
|
const files = Object.keys(createSignatureContent.fileHashes)
|
||||||
const extensions = extractFileExtensions(files)
|
const extensions = files.reduce((result: string[], file: string) => {
|
||||||
|
const extension = file.split('.').pop()
|
||||||
|
if (extension) {
|
||||||
|
result.push(extension)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}, [])
|
||||||
|
|
||||||
const signedBy = Object.keys(meta.docSignatures) as `npub1${string}`[]
|
const signedBy = Object.keys(meta.docSignatures) as `npub1${string}`[]
|
||||||
const isCompletelySigned = createSignatureContent.signers.every((signer) =>
|
const isCompletelySigned = createSignatureContent.signers.every((signer) =>
|
||||||
@ -148,7 +161,7 @@ export const extractSigitCardDisplayInfo = async (meta: Meta) => {
|
|||||||
)
|
)
|
||||||
|
|
||||||
sigitInfo.title = createSignatureContent.title
|
sigitInfo.title = createSignatureContent.title
|
||||||
sigitInfo.submittedBy = createSignatureEvent.pubkey as `npub1${string}`
|
sigitInfo.submittedBy = createSignatureEvent.pubkey
|
||||||
sigitInfo.signers = createSignatureContent.signers
|
sigitInfo.signers = createSignatureContent.signers
|
||||||
sigitInfo.fileExtensions = extensions
|
sigitInfo.fileExtensions = extensions
|
||||||
|
|
||||||
@ -166,15 +179,3 @@ export const extractSigitCardDisplayInfo = async (meta: Meta) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export const extractFileExtensions = (fileNames: string[]) => {
|
|
||||||
const extensions = fileNames.reduce((result: string[], file: string) => {
|
|
||||||
const extension = file.split('.').pop()
|
|
||||||
if (extension) {
|
|
||||||
result.push(extension)
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
return extensions
|
|
||||||
}
|
|
||||||
|
Loading…
Reference in New Issue
Block a user