Allow adding users via scoutgame admin (#4934)

* organize some packages

* add aws package

* organize more code

* ..

* fix many imports

* fix farcaster

* search by display name too

* search by name case insensitive

* add builder icon

* add approve builder in the callback

* .

* .

* fix mocks

* add nft assets

* fix nft assets

* fix package

* fix imports

* .

* fix imports

* .

* fix it

* remove

@connect-shared/hooks/useS3UploadInput.ts

@@ -1,10 +1,11 @@
 import { log } from '@charmverse/core/log';
-import { uploadToS3 } from '@root/lib/aws/uploadToS3Browser';
 import { DEFAULT_MAX_FILE_SIZE_MB } from '@root/lib/file/constants';
 import { encodeFilename } from '@root/lib/utils/encodeFilename';
 import { replaceS3Domain } from '@root/lib/utils/url';
 import { useState } from 'react';
 
+import { uploadToS3 } from '../../packages/aws/src/uploadToS3Browser';
+
 import { useFilePicker } from './useFilePicker';
 import { useGetUploadToken } from './useGetUploadToken';
 

@connect-shared/lib/attestations/storeProjectMetadataAndPublishToGitcoin.ts

@@ -2,7 +2,7 @@ import { DataNotFoundError } from '@charmverse/core/errors';
 import { log } from '@charmverse/core/log';
 import type { GitcoinProjectAttestation } from '@charmverse/core/prisma-client';
 import { prisma } from '@charmverse/core/prisma-client';
-import { resolveENSName } from '@root/lib/blockchain/getENSName';
+import { resolveENSName } from '@packages/blockchain/getENSName';
 import { attestOnchain } from '@root/lib/credentials/attestOnchain';
 import { gitcoinProjectCredentialSchemaId } from '@root/lib/credentials/schemas/gitcoinProjectSchema';
 import { storeProjectInS3 } from '@root/lib/credentials/storeProjectInS3';

@connect-shared/lib/farcaster/uuidFromFid.ts

@@ -4,6 +4,7 @@ import { log } from '@charmverse/core/log';
 import { v4 as uuid } from 'uuid';
 
 // Function to generate a deterministic UUID v4 based on an integer input
+/** @deprecated Use uuidFromNumber from @packages/utils/uuid instead */
 export function deterministicV4UUIDFromFid(num: number | string): string {
   // Create a hash of the input number to generate more uniformly distributed random bytes
   const hash = createHash('sha256').update(num.toString()).digest();

@connect-shared/package.json

@@ -13,6 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@mui/material-nextjs": "^6.1.0",
+    "@packages/aws": "file:../packages/aws",
     "framer-motion": "^11.3.17",
     "next-safe-action": "~7.4.2"
   }

apps/scoutgame/app/api/aws/upload-token/route.ts

@@ -1,5 +1,5 @@
-import { uploadToken } from '@connect-shared/lib/aws/uploadToken';
 import { getSession } from '@connect-shared/lib/session/getSession';
+import { uploadToken } from '@packages/aws/uploadToken';
 
 export async function GET(request: Request) {
   const { searchParams } = new URL(request.url);
@@ -15,7 +15,7 @@ export async function GET(request: Request) {
   }
 
   try {
-    const tokenData = await uploadToken(filename, userId);
+    const tokenData = await uploadToken({ filename, userId });
 
     return Response.json(tokenData);
   } catch (error) {

apps/scoutgame/components/common/NFTPurchaseDialog/hooks/useGetERC20Allowance.tsx

@@ -1,5 +1,5 @@
-import { getChainById } from '@packages/onchain/chains';
-import { getPublicClient } from '@packages/onchain/getPublicClient';
+import { getChainById } from '@packages/blockchain/chains';
+import { getPublicClient } from '@packages/blockchain/getPublicClient';
 import { UsdcErc20ABIClient } from '@packages/scoutgame/builderNfts/usdcContractApiClient';
 import useSWR from 'swr';
 import type { Address, Chain } from 'viem';

apps/scoutgame/components/common/NFTPurchaseDialog/hooks/useUpdateERC20Allowance.tsx

@@ -1,4 +1,4 @@
-import { getChainById } from '@packages/onchain/chains';
+import { getChainById } from '@packages/blockchain/chains';
 import { UsdcErc20ABIClient } from '@packages/scoutgame/builderNfts/usdcContractApiClient';
 import useSWRMutation from 'swr/mutation';
 import { publicActions, type Address, type Chain } from 'viem';

apps/scoutgame/hooks/useS3UploadInput.ts

@@ -1,5 +1,5 @@
 import { log } from '@charmverse/core/log';
-import { uploadToS3 } from '@root/lib/aws/uploadToS3Browser';
+import { uploadToS3 } from '@packages/aws/uploadToS3Browser';
 import { DEFAULT_MAX_FILE_SIZE_MB } from '@root/lib/file/constants';
 import { encodeFilename } from '@root/lib/utils/encodeFilename';
 import { replaceS3Domain } from '@root/lib/utils/url';

apps/scoutgame/lib/blockchain/findOrCreateWalletUser.ts

@@ -1,10 +1,10 @@
 import { log } from '@charmverse/core/log';
+import { getENSDetails, getENSName } from '@packages/blockchain/getENSName';
 import { getFarcasterUsersByAddresses } from '@packages/farcaster/getFarcasterUsersByAddresses';
-import { getENSDetails, getENSName } from '@root/lib/blockchain/getENSName';
+import { findOrCreateUser } from '@packages/scoutgame/users/findOrCreateUser';
+import type { FindOrCreateUserResult } from '@packages/scoutgame/users/findOrCreateUser';
 import { getAddress } from 'viem';
 
-import type { FindOrCreateUserResult } from 'lib/users/findOrCreateUser';
-import { findOrCreateUser } from 'lib/users/findOrCreateUser';
 import { generateUserPath } from 'lib/users/generateUserPath';
 import { generateRandomName } from 'lib/utils/generateRandomName';
 

apps/scoutgame/lib/session/getPendingNftTransactions.tsx

@@ -1,7 +1,7 @@
 import type { PendingNftTransaction, TransactionStatus } from '@charmverse/core/prisma-client';
 import { prisma } from '@charmverse/core/prisma-client';
-import { getPublicClient } from '@packages/onchain/getPublicClient';
-import { waitForDecentTransactionSettlement } from '@packages/onchain/waitForDecentTransactionSettlement';
+import { getPublicClient } from '@packages/blockchain/getPublicClient';
+import { waitForDecentTransactionSettlement } from '@packages/blockchain/waitForDecentTransactionSettlement';
 
 export type TxResponse = Pick<PendingNftTransaction, 'id' | 'sourceChainTxHash' | 'destinationChainTxHash' | 'status'>;
 

apps/scoutgame/lib/session/loginWithFarcasterAction.ts

@@ -1,12 +1,12 @@
 'use server';
 
 import { log } from '@charmverse/core/log';
+import { findOrCreateFarcasterUser } from '@packages/scoutgame/users/findOrCreateFarcasterUser';
 import { authSecret } from '@root/config/constants';
 import { sealData } from 'iron-session';
 import { cookies } from 'next/headers';
 
 import { actionClient } from 'lib/actions/actionClient';
-import { findOrCreateFarcasterUser } from 'lib/farcaster/findOrCreateFarcasterUser';
 import { verifyFarcasterUser } from 'lib/farcaster/verifyFarcasterUser';
 
 import { authSchema } from '../farcaster/config';

apps/scoutgame/lib/session/loginWithWalletAction.ts

@@ -1,5 +1,7 @@
 'use server';
 
+import { trackUserAction } from '@packages/mixpanel/trackUserAction';
+
 import { actionClient } from 'lib/actions/actionClient';
 import { findOrCreateWalletUser } from 'lib/blockchain/findOrCreateWalletUser';
 import { loginWithWalletSchema } from 'lib/blockchain/schema';
@@ -20,6 +22,16 @@ export const loginWithWalletAction = actionClient
     await saveSession(ctx, { scoutId: user.id });
     const sessionUser = (await getUserFromSession()) as SessionUser;
 
+    if (user.isNew) {
+      trackUserAction('sign_up', {
+        userId: user.id
+      });
+    } else {
+      trackUserAction('sign_in', {
+        userId: user.id
+      });
+    }
+
     return {
       user: sessionUser,
       success: true,

apps/scoutgame/tsconfig.json

@@ -41,6 +41,6 @@
       "@charmverse/core/errors": ["../../node_modules/@charmverse/core/dist/cjs/errors"]
     }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts", "../../packages/scoutgame/src/users/generateRandomAvatar.ts", "../../packages/scoutgame/src/users/findOrCreateUser.ts"],
   "exclude": ["../../node_modules", ".next/", "public/sw.js", "sw.js"]
 }

apps/scoutgameadmin/app/api/onchain/transaction-status/route.ts → apps/scoutgameadmin/app/api/blockchain/transaction-status/route.ts

@@ -1,4 +1,4 @@
-import { getTransactionStatusFromDecent } from '@packages/onchain/waitForDecentTransactionSettlement';
+import { getTransactionStatusFromDecent } from '@packages/blockchain/waitForDecentTransactionSettlement';
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
 

apps/scoutgameadmin/app/api/users/create-builder/route.ts

@@ -0,0 +1,12 @@
+import { log } from '@charmverse/core/log';
+import type { NextRequest } from 'next/server';
+import { NextResponse } from 'next/server';
+
+import { createBuilder } from 'lib/users/createBuilder';
+
+export async function POST(request: NextRequest) {
+  const params = await request.json();
+  const newUser = await createBuilder(params);
+  log.info('Approved new builder', { newUser });
+  return NextResponse.json({ success: true });
+}

apps/scoutgameadmin/app/api/users/get-user/route.ts

@@ -5,7 +5,10 @@ import { getUser } from 'lib/users/getUser';
 
 export async function GET(request: NextRequest) {
   const { searchParams } = new URL(request.url);
-  const searchString = searchParams.get('searchString');
-  const repos = await getUser({ searchString: searchString || '' });
-  return NextResponse.json(repos);
+  const userId = searchParams.get('userId');
+  if (!userId) {
+    return NextResponse.json({ error: 'userId is required' }, { status: 400 });
+  }
+  const user = await getUser(userId);
+  return NextResponse.json(user);
 }

apps/scoutgameadmin/app/api/users/route.ts

@@ -1,10 +1,11 @@
 import { log } from '@charmverse/core/log';
-import { importReposByUser } from '@packages/scoutgame/importReposByUser';
 import type { NextRequest } from 'next/server';
 import { NextResponse } from 'next/server';
 
+import { createUser } from 'lib/users/createUser';
 import type { SortOrder, SortField } from 'lib/users/getUsers';
 import { getUsers } from 'lib/users/getUsers';
+import { searchForUser } from 'lib/users/searchForUser';
 
 export async function GET(request: NextRequest) {
   const { searchParams } = new URL(request.url);
@@ -16,9 +17,12 @@ export async function GET(request: NextRequest) {
 }
 
 export async function POST(request: NextRequest) {
-  const { owner } = await request.json();
-
-  await importReposByUser(owner);
-
+  const params = await request.json();
+  const user = await searchForUser(params);
+  if (!user) {
+    throw new Error(`User not found: ${params.searchString}`);
+  }
+  const newUser = await createUser(user);
+  log.info('Created new user', { newUser });
   return NextResponse.json({ success: true });
 }

apps/scoutgameadmin/app/api/users/search-for-user/route.ts

@@ -0,0 +1,11 @@
+import type { NextRequest } from 'next/server';
+import { NextResponse } from 'next/server';
+
+import { searchForUser } from 'lib/users/searchForUser';
+
+export async function GET(request: NextRequest) {
+  const { searchParams } = new URL(request.url);
+  const searchString = searchParams.get('searchString');
+  const user = await searchForUser({ searchString: searchString || '' });
+  return NextResponse.json(user);
+}

apps/scoutgameadmin/components/repos/components/AddRepoButton/AddRepoModal.tsx

@@ -15,7 +15,7 @@ import {
 import React, { useState } from 'react';
 import { mutate } from 'swr';
 
-import { useCreateRepo, useSearchReposByOwnerFromGithub } from 'hooks/api/repos';
+import { useCreateRepos, useSearchReposByOwnerFromGithub } from 'hooks/api/repos';
 import { useDebouncedValue } from 'hooks/useDebouncedValue';
 
 type Props = {
@@ -26,7 +26,7 @@ type Props = {
 
 export function AddRepoModal({ open, onClose, onAdd }: Props) {
   const [repoInput, setRepoInput] = useState('');
-  const { trigger: addGithubRepo, isMutating: isImporting } = useCreateRepo();
+  const { trigger: createRepos, isMutating: isImporting } = useCreateRepos();
   const debouncedFilterString = useDebouncedValue(repoInput);
   const {
     data: reposFromGithub,
@@ -39,7 +39,7 @@ export function AddRepoModal({ open, onClose, onAdd }: Props) {
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
-    await addGithubRepo({ owner: repoInput });
+    await createRepos({ owner: repoInput });
     onAdd();
     onClose();
     setRepoInput('');
@@ -55,7 +55,7 @@ export function AddRepoModal({ open, onClose, onAdd }: Props) {
     <Dialog open={open} onClose={onClose} PaperProps={{ sx: { maxWidth: 400 } }} fullWidth>
       <DialogTitle>Add new repos by owner</DialogTitle>
       <form onSubmit={handleSubmit}>
-        <DialogContent sx={{ pt: 0 }}>
+        <DialogContent>
           <TextField
             autoFocus
             margin='dense'

apps/scoutgameadmin/components/users/AddUserButton/AddUserModal.tsx

@@ -16,7 +16,7 @@ import {
 import React, { useState } from 'react';
 import { mutate } from 'swr';
 
-import { useCreateUser, useGetUser } from 'hooks/api/users';
+import { useCreateUser, useSearchForUser } from 'hooks/api/users';
 import { useDebouncedValue } from 'hooks/useDebouncedValue';
 
 type Props = {
@@ -26,16 +26,16 @@ type Props = {
 };
 
 export function AddUserModal({ open, onClose, onAdd }: Props) {
-  const [repoInput, setRepoInput] = useState('');
+  const [repoInput, setTextInput] = useState('');
   const { trigger: createUser, isMutating: isCreating } = useCreateUser();
   const debouncedFilterString = useDebouncedValue(repoInput);
-  const { data: user, error, isValidating, isLoading } = useGetUser(debouncedFilterString);
+  const { data: user, error, isValidating, isLoading } = useSearchForUser(debouncedFilterString);
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     await createUser({ searchString: repoInput });
     onAdd();
     onClose();
-    setRepoInput('');
+    setTextInput('');
     // clear SWR cache
     mutate(
       (key) => true, // which cache keys are updated
@@ -46,17 +46,17 @@ export function AddUserModal({ open, onClose, onAdd }: Props) {
 
   return (
     <Dialog open={open} onClose={onClose} PaperProps={{ sx: { maxWidth: 400 } }} fullWidth>
-      <DialogTitle>Add or manage user</DialogTitle>
+      <DialogTitle>Add scout</DialogTitle>
       <form onSubmit={handleSubmit}>
-        <DialogContent sx={{ pt: 0 }}>
+        <DialogContent>
           <TextField
             autoFocus
-            margin='dense'
             label='User identifier'
             type='text'
+            placeholder='Farcaster id, username or Github username'
             fullWidth
             value={repoInput}
-            onChange={(e) => setRepoInput(e.target.value)}
+            onChange={(e) => setTextInput(e.target.value)}
             required
             slotProps={{
               input: {
@@ -98,11 +98,11 @@ export function AddUserModal({ open, onClose, onAdd }: Props) {
                 <Typography>
                   <span style={{ fontWeight: 'bold' }}>Points Balance:</span> {user.scout.currentBalance}
                 </Typography>
-                {user.scout.farcasterId && (
+                {user.scout.farcasterName && (
                   <Typography>
                     <span style={{ fontWeight: 'bold' }}>Farcaster:</span>{' '}
-                    <Link href={`https://warpcast.com/${user.scout.path}`} target='_blank'>
-                      {user.scout.path}
+                    <Link href={`https://warpcast.com/${user.scout.farcasterName}`} target='_blank'>
+                      {user.scout.farcasterName}
                     </Link>
                   </Typography>
                 )}
@@ -126,7 +126,9 @@ export function AddUserModal({ open, onClose, onAdd }: Props) {
                 </Typography>
               </Box>
               <Stack direction='row' spacing={2} justifyContent='flex-end'>
-                <Button onClick={onClose}>Cancel</Button>
+                <Button variant='outlined' color='secondary' onClick={onClose}>
+                  Cancel
+                </Button>
                 {user.scout.builderStatus === 'applied' && (
                   <LoadingButton disabled loading={isCreating} type='submit' color='primary' variant='contained'>
                     Approve builder
@@ -164,7 +166,9 @@ export function AddUserModal({ open, onClose, onAdd }: Props) {
                 </Typography>
               </Box>
               <Stack direction='row' spacing={2} justifyContent='flex-end'>
-                <Button onClick={onClose}>Cancel</Button>
+                <Button variant='outlined' color='secondary' onClick={onClose}>
+                  Cancel
+                </Button>
                 <LoadingButton loading={isCreating} type='submit' color='primary' variant='contained'>
                   Add {user.waitlistUser.githubLogin ? 'builder' : 'scout'}
                 </LoadingButton>
@@ -186,7 +190,9 @@ export function AddUserModal({ open, onClose, onAdd }: Props) {
                 <Typography>Following: {user.farcasterUser.following_count}</Typography>
               </Box>
               <Stack direction='row' spacing={2} justifyContent='flex-end'>
-                <Button onClick={onClose}>Cancel</Button>
+                <Button variant='outlined' color='secondary' onClick={onClose}>
+                  Cancel
+                </Button>
                 <LoadingButton loading={isCreating} type='submit' color='primary' variant='contained'>
                   Add scout
                 </LoadingButton>