Skip to content

Commit 67f866a

Browse files
committed
fix: user verification
1 parent 27b51ad commit 67f866a

File tree

21 files changed

+2040
-1806
lines changed

21 files changed

+2040
-1806
lines changed

app/yarn.lock

Lines changed: 451 additions & 451 deletions
Large diffs are not rendered by default.

dashboard/src/graphql/queries/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ export const UserDetailsQuery = `
9797
id
9898
email
9999
email_verified
100+
phone_number_verified
100101
given_name
101102
family_name
102103
middle_name

dashboard/src/pages/Users.tsx

Lines changed: 41 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,25 @@ export default function Users() {
165165
};
166166

167167
const userVerificationHandler = async (user: userDataTypes) => {
168-
const { id, email } = user;
168+
const { id, email, phone_number } = user;
169+
let params = {};
170+
if (email) {
171+
params = {
172+
id,
173+
email,
174+
email_verified: true,
175+
};
176+
}
177+
if (phone_number) {
178+
params = {
179+
id,
180+
phone_number,
181+
phone_number_verified: true,
182+
};
183+
}
169184
const res = await client
170185
.mutation(UpdateUser, {
171-
params: {
172-
id,
173-
email,
174-
email_verified: true,
175-
},
186+
params,
176187
})
177188
.toPromise();
178189
if (res.error) {
@@ -298,7 +309,7 @@ export default function Users() {
298309
<Table variant="simple">
299310
<Thead>
300311
<Tr>
301-
<Th>Email</Th>
312+
<Th>Email / Phone</Th>
302313
<Th>Created At</Th>
303314
<Th>Signup Methods</Th>
304315
<Th>Roles</Th>
@@ -314,10 +325,15 @@ export default function Users() {
314325
</Thead>
315326
<Tbody>
316327
{userList.map((user: userDataTypes) => {
317-
const { email_verified, created_at, ...rest }: any = user;
328+
const {
329+
email_verified,
330+
phone_number_verified,
331+
created_at,
332+
...rest
333+
}: any = user;
318334
return (
319335
<Tr key={user.id} style={{ fontSize: 14 }}>
320-
<Td maxW="300">{user.email}</Td>
336+
<Td maxW="300">{user.email || user.phone_number}</Td>
321337
<Td>
322338
{dayjs(user.created_at * 1000).format('MMM DD, YYYY')}
323339
</Td>
@@ -327,9 +343,15 @@ export default function Users() {
327343
<Tag
328344
size="sm"
329345
variant="outline"
330-
colorScheme={user.email_verified ? 'green' : 'yellow'}
346+
colorScheme={
347+
user.email_verified || user.phone_number_verified
348+
? 'green'
349+
: 'yellow'
350+
}
331351
>
332-
{user.email_verified.toString()}
352+
{(
353+
user.email_verified || user.phone_number_verified
354+
).toString()}
333355
</Tag>
334356
</Td>
335357
<Td>
@@ -368,13 +390,14 @@ export default function Users() {
368390
</Flex>
369391
</MenuButton>
370392
<MenuList>
371-
{!user.email_verified && (
372-
<MenuItem
373-
onClick={() => userVerificationHandler(user)}
374-
>
375-
Verify User
376-
</MenuItem>
377-
)}
393+
{!user.email_verified &&
394+
!user.phone_number_verified && (
395+
<MenuItem
396+
onClick={() => userVerificationHandler(user)}
397+
>
398+
Verify User
399+
</MenuItem>
400+
)}
378401
<EditUserModal
379402
user={rest}
380403
updateUserList={updateUserList}

0 commit comments

Comments
 (0)