Merge pull request #1 from dylibso/mo/register-command

feat: /register now properly registers the user

migrations/0003-discord-credentials.sql

@@ -0,0 +1 @@
+alter type credential_type add value 'discord';

migrations/0004-discord-credentials-p2.sql

@@ -0,0 +1 @@
+create index "credentials_discord_idx" on "credentials" using gin("data") where "deleted_at" is null and "type" = 'discord' and "data" ? 'id';

package.json

@@ -34,7 +34,7 @@
     "typescript": "^5.5.3"
   },
   "dependencies": {
-    "@dylibso/xtp": "0.0.0-rc4",
+    "@dylibso/xtp": "^0.0.0-rc5",
     "@extism/extism": "^1.0.3",
     "@fastify/cookie": "^9.3.1",
     "@fastify/oauth2": "^7.8.0",

src/client.ts

@@ -3,20 +3,22 @@ import { Client, CommandInteraction, GatewayIntentBits, REST, Routes } from 'dis
 import { DISCORD_BOT_TOKEN, DISCORD_BOT_CLIENT_ID } from './config';
 import { findMatchingMessageHandlers } from './domain/message-handlers';
 import { getXtp } from './db';
+import { getXtpData, registerUser } from './domain/users';
 
 export async function startDiscordClient() {
   if (!DISCORD_BOT_TOKEN) {
     return;
   }
 
-  await refreshCommands(DISCORD_BOT_TOKEN);
+  const rest = new REST({ version: '9' }).setToken(DISCORD_BOT_TOKEN);
+  await refreshCommands(rest);
 
   const client = new Client({
     intents: [
       GatewayIntentBits.Guilds,
       GatewayIntentBits.GuildMessages,
-      GatewayIntentBits.MessageContent
-    ]
+      GatewayIntentBits.MessageContent,
+    ],
   });
 
   client.on('ready', () => {
@@ -28,13 +30,13 @@ export async function startDiscordClient() {
       return;
     }
 
-    const guild = message.guild || {name: "", id: ""};
+    const guild = message.guild || { name: "", id: "" };
 
     console.log(`Incoming message in ${guild.name} (${guild.id}): `, message.content);
     const xtp = await getXtp();
     const handlers = await findMatchingMessageHandlers(guild.id, message.content);
 
-    for (let i = 0; i < handlers.length; i++){
+    for (let i = 0; i < handlers.length; i++) {
       const handler = handlers[i];
       console.log("Found matching handler: ", handler.id, "regex=" + handler.regex);
       try {
@@ -45,7 +47,7 @@ export async function startDiscordClient() {
           default: ""
         });
 
-        if (result !== null && result!.length > 0){
+        if (result !== null && result!.length > 0) {
           await message.reply(result!);
         }
       } catch (err) {
@@ -71,21 +73,45 @@ export async function startDiscordClient() {
         break;
 
       case 'register':
-        await command.reply('Please register your account at https://www.youtube.com/watch?v=EE-xtCF3T94');
+        const discordUser = command.user;
+
+        const dbUser = await registerUser({
+          username: discordUser.tag,
+          discord: {
+            id: discordUser.id,
+            discriminator: discordUser.discriminator,
+            username: discordUser.username,
+            avatar: discordUser.avatar,
+            hexAccentColor: discordUser.accentColor || undefined,
+          }
+        })
+
+        const xtp = getXtpData(dbUser);
+
+        await command.reply({
+          content: `To get started, please activate your new XTP Host by clicking the link below.
+  
+  ${xtp.inviteLink}
+  Once your account is active, you can dive right in and start building your first plugin.
+  
+  XTP Product docs can be found here: https://docs.xtp.dylibso.com/
+  
+  TODO: Add more helpful information here.`,
+          ephemeral: true,
+        });
+
         break;
     }
   })
 
   client.login(DISCORD_BOT_TOKEN);
 }
 
-async function refreshCommands(token: string) {
+async function refreshCommands(rest: REST) {
   if (!DISCORD_BOT_CLIENT_ID) {
     return;
   }
 
-  const rest = new REST({ version: '9' }).setToken(token);
-
   const commands = [
     {
       name: 'ping',

src/domain/users.ts

@@ -6,14 +6,30 @@ export interface User {
   data: Record<string, any>,
   created_at: Date,
   updated_at: Date,
-  deleted_at?: Date | null
+  deleted_at?: Date | null,
+}
+
+export interface XtpData {
+  inviteLink?: string
+}
+
+export function getXtpData(user: User) {
+  return user.data.xtp as XtpData
+}
+
+function patchXtpData(user: User, data: Partial<XtpData>) {
+  user.data.xtp = { ...getXtpData(user), ...data }
 }
 
 export interface OAuthGitHubCredentials {
   oauth: { access_token: string, scope: string, token_type: string },
   user: { login: string, avatar_url: string, name: string, [k: string]: any },
 }
 
+export interface DiscordCredentials {
+  id: string, username: string, discriminator: string, avatar?: string | null, hexAccentColor?: number, [k: string]: any
+}
+
 export interface EmailPassword {
   email: string,
   password: string
@@ -23,6 +39,7 @@ export interface RegisterUser {
   username: string,
   github?: OAuthGitHubCredentials
   emailPassword?: EmailPassword
+  discord?: DiscordCredentials
 }
 
 export async function findUserByGithubLogin(githubLogin: string) {
@@ -44,51 +61,107 @@ export async function findUserByGithubLogin(githubLogin: string) {
   return user
 }
 
+export async function findUserByUsername(username: string) {
+  const db = await getDatabaseConnection()
+
+  const { rows: [user = null] } = await db.query(`
+    SELECT
+      "users".*
+    FROM "users"
+    WHERE
+      "users"."username" = $1
+    LIMIT 1
+  `, [username])
+
+  return user
+}
+
+export async function updateUser(db: any, user: User) {
+  const { rows: [updatedUser] } = await db.query(`
+    UPDATE "users"
+    SET
+      username = $2,
+      data = $3
+    WHERE
+      id = $1
+    RETURNING *;
+  `, [user.id, user.username, user.data])
+
+  return updatedUser
+}
+
 export async function registerUser(registration: RegisterUser): Promise<User> {
   const db = await getDatabaseConnection()
   const xtp = await getXtp()
 
-  return await db.transaction(async (db: any) => {
-    console.log('running create user row', registration)
-    const result = await db.query(`
-      INSERT INTO "users" (
-        username
-      ) VALUES (
-        $1
-      ) RETURNING *;
-    `, [registration.username])
-
-    const { rows: [user] } = result
-
-    if (registration.github) {
-      console.log('running create credential row')
-      await db.query(`
-        INSERT INTO "credentials" (
-          user_id,
-          "type",
-          data
+  try {
+    return await db.transaction(async (db: any) => {
+      console.log('running create user row', registration)
+      const result = await db.query(`
+        INSERT INTO "users" (
+          username
         ) VALUES (
-          $1,
-          'oauth-github',
-          $2::jsonb
-        );
-      `, [user.id, JSON.stringify(registration.github.user)])
-
-      console.log('sending guest invite')
-      await xtp.inviteGuest({
-        name: registration.github.user.name,
-        email: registration.github.user.email,
-        guestKey: user.id
-      }).catch(err => {
-        console.error(err)
-      })
-    }
+          $1
+        ) RETURNING *;
+      `, [registration.username])
 
-    if (registration.emailPassword) {
-      // TODO
-    }
+      const { rows: [user] } = result
+
+      if (registration.github) {
+        console.log('running create credential row')
+        await db.query(`
+          INSERT INTO "credentials" (
+            user_id,
+            "type",
+            data
+          ) VALUES (
+            $1,
+            'oauth-github',
+            $2::jsonb
+          );
+        `, [user.id, JSON.stringify(registration.github.user)])
+
+        console.log('sending guest invite')
+        await xtp.inviteGuest({
+          name: registration.github.user.name,
+          email: registration.github.user.email,
+          guestKey: user.id,
+          deliveryMethod: 'email'
+        }).catch(err => {
+          console.error(err)
+        })
+      } else if (registration.discord) {
+        console.log('running create credential row')
+        await db.query(`
+          INSERT INTO "credentials" (
+            user_id,
+            "type",
+            data
+          ) VALUES (
+            $1,
+            'discord',
+            $2::jsonb
+          );
+        `, [user.id, JSON.stringify(registration.discord)])
+
+        const response = await xtp.inviteGuest({ guestKey: user.id, deliveryMethod: 'link' });
+        patchXtpData(user, { inviteLink: response.link.link })
 
+        await updateUser(db, user)
+      }
+
+      if (registration.emailPassword) {
+        // TODO
+      }
+
+
+      return user
+    })
+  } catch (e: any) {
+    if (e.code === '23505' && e.constraint === 'users_username_idx') {
+      return await findUserByUsername(registration.username)
+    }
 
-    return user
-  })
+    throw e
+  }
 }