add forge

components/Menu.vue

@@ -29,8 +29,8 @@
               <MenuItem
                 v-for="forge in forges"
                 :key="forge.id"
-                to="/"
-                :title="forge.name"
+                :to="forge.owner === user?.id ? `/forges/${forge.id}` : '/'"
+                :title="forge.host"
                 :icon="forge.isConnected ? 'i-ion-code' : 'i-ion-ios-repeat'"
                 @click="!forge.isConnected && login(forge.id)"
               />

contrib/migrate.ts

@@ -20,7 +20,7 @@ async function main() {
       .insert(forgeSchema)
       .values({
         id: forge?.id,
-        name: 'Github',
+        host: 'github.com',
         type: 'github',
         owner: null,
         allowLogin: true,
@@ -30,7 +30,8 @@ async function main() {
       .onConflictDoUpdate({
         target: forgeSchema.id,
         set: {
-          name: 'Github',
+          host: 'github.com',
+          owner: null,
           allowLogin: true,
           clientId: process.env.GITHUB_CLIENT_ID,
           clientSecret: process.env.GITHUB_CLIENT_SECRET,

package.json

@@ -39,13 +39,14 @@
     "@gitbeaker/core": "^39.10.3",
     "@gitbeaker/rest": "^39.10.3",
     "better-sqlite3": "^8.5.0",
-    "drizzle-orm": "^0.27.2",
+    "drizzle-orm": "^0.28.5",
     "jsonwebtoken": "^9.0.1",
     "jwt-decode": "^3.1.2",
     "nuxt-icon": "^0.4.1",
     "octokit": "^2.1.0",
     "simple-git": "^3.19.1",
-    "vue-markdown-render": "^2.0.1"
+    "vue-markdown-render": "^2.0.1",
+    "zod": "^3.22.2"
   },
   "pnpm": {
     "overrides": {

pages/auth/login.vue

@@ -15,7 +15,7 @@
         <UIcon v-if="forge.type === 'github'" name="i-ion-logo-github" class="w-4 h-4 mr-2" />
         <UIcon v-else-if="forge.type === 'gitlab'" name="i-ion-logo-gitlab" class="w-4 h-4 mr-2" />
 
-        {{ forge.name }}
+        {{ forge.host }}
       </button>
     </div>
   </div>

pages/forges/[forgeId]/index.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="flex w-full justify-center">
+    <UForm v-if="forge" ref="form" :schema="schema" :state="forge" @submit.prevent="submit">
+      <UFormGroup label="Host" name="host">
+        <UInput v-model="forge.host" disabled />
+      </UFormGroup>
+
+      <UFormGroup label="Type" name="type">
+        <UInput v-model="forge.type" disabled />
+      </UFormGroup>
+
+      <UFormGroup label="Client ID" name="clientId">
+        <UInput v-model="forge.clientId" />
+      </UFormGroup>
+
+      <UFormGroup label="Client Secret" name="clientSecret">
+        <UInput v-model="forge.clientSecret" />
+      </UFormGroup>
+
+      <div class="flex mt-4 gap-2">
+        <UButton label="Delete forge" icon="i-heroicons-trash" color="red" @click="deleteForge" />
+        <UButton type="submit" label="Update forge" icon="i-heroicons-arrow-path-20-solid" />
+      </div>
+    </UForm>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { z } from 'zod';
+
+const schema = z.object({
+  host: z.string().nonempty(),
+  clientId: z.string().nonempty(),
+  clientSecret: z.string().nonempty(),
+});
+
+const route = useRoute();
+const forgeId = route.params.forgeId;
+const { data: forge } = await useFetch(`/api/forges/${forgeId}`);
+
+const form = ref<HTMLFormElement>();
+
+async function submit() {
+  await form.value!.validate();
+
+  await $fetch(`/api/forges/${forgeId}`, {
+    method: 'POST',
+    body: forge.value,
+  });
+}
+
+async function deleteForge() {
+  await $fetch(`/api/forges/${forgeId}`, {
+    method: 'DELETE',
+  });
+
+  await navigateTo('/');
+}
+</script>

pages/forges/add.vue

@@ -1,3 +1,55 @@
 <template>
-  <div>add forge</div>
+  <div class="flex w-full justify-center">
+    <UForm ref="form" :schema="schema" :state="newForge" @submit.prevent="submit">
+      <UFormGroup label="Host" name="host">
+        <UInput v-model="newForge.host" />
+      </UFormGroup>
+
+      <UFormGroup label="Type" name="type">
+        <USelectMenu v-model="newForge.type" :options="forgeTypes" />
+      </UFormGroup>
+
+      <UFormGroup label="Client ID" name="clientId">
+        <UInput v-model="newForge.clientId" />
+      </UFormGroup>
+
+      <UFormGroup label="Client Secret" name="clientSecret">
+        <UInput v-model="newForge.clientSecret" />
+      </UFormGroup>
+
+      <UButton type="submit" label="Add forge" icon="i-heroicons-plus" class="mt-2" />
+    </UForm>
+  </div>
 </template>
+
+<script setup lang="ts">
+import { z } from 'zod';
+
+const schema = z.object({
+  host: z.string().nonempty(),
+  clientId: z.string().nonempty(),
+  clientSecret: z.string().nonempty(),
+});
+
+const forgeTypes = ['gitlab']; // TODO: support other forges
+
+const newForge = ref({
+  host: undefined,
+  type: forgeTypes[0],
+  clientId: undefined,
+  clientSecret: undefined,
+});
+
+const form = ref<HTMLFormElement>();
+
+async function submit() {
+  await form.value!.validate();
+
+  const forge = await $fetch('/api/forges', {
+    method: 'POST',
+    body: newForge.value,
+  });
+
+  await navigateTo(`/forges/${forge.id}`);
+}
+</script>

server/api/forges/[forge_id]/index.delete.ts

@@ -0,0 +1,25 @@
+import { forgeSchema, userForgesSchema } from '../../../schemas';
+import { eq, and } from 'drizzle-orm';
+
+export default defineEventHandler(async (event) => {
+  const user = await requireUser(event);
+
+  const _forgeId = event.context.params?.forge_id;
+  if (!_forgeId) {
+    throw createError({
+      message: 'Cannot create forge with a forge_id',
+      status: 400,
+    });
+  }
+  const forgeId = parseInt(_forgeId, 10);
+
+  await db.delete(userForgesSchema).where(eq(userForgesSchema.forgeId, forgeId)).run();
+
+  const forge = await db
+    .delete(forgeSchema)
+    .where(and(eq(forgeSchema.owner, user.id), eq(forgeSchema.id, forgeId)))
+    .returning()
+    .get();
+
+  return forge;
+});

server/api/forges/[forge_id]/index.get.ts

@@ -0,0 +1,23 @@
+import { forgeSchema } from '../../../schemas';
+import { eq, and } from 'drizzle-orm';
+
+export default defineEventHandler(async (event) => {
+  const user = await requireUser(event);
+
+  const _forgeId = event.context.params?.forge_id;
+  if (!_forgeId) {
+    throw createError({
+      message: 'Cannot create forge with a forge_id',
+      status: 400,
+    });
+  }
+  const forgeId = parseInt(_forgeId, 10);
+
+  const forge = await db
+    .select()
+    .from(forgeSchema)
+    .where(and(eq(forgeSchema.owner, user.id), eq(forgeSchema.id, forgeId)))
+    .get();
+
+  return forge;
+});

server/api/forges/[forge_id]/index.post.ts

@@ -0,0 +1,26 @@
+import { forgeSchema } from '../../../schemas';
+import { eq, and } from 'drizzle-orm';
+
+export default defineEventHandler(async (event) => {
+  const user = await requireUser(event);
+
+  const forgeData = await readBody(event);
+
+  const _forgeId = event.context.params?.forge_id;
+  if (!_forgeId) {
+    throw createError({
+      message: 'Cannot create forge with a forge_id',
+      status: 400,
+    });
+  }
+  const forgeId = parseInt(_forgeId, 10);
+
+  const forge = await db
+    .update(forgeSchema)
+    .set({ clientId: forgeData.clientId, clientSecret: forgeData.clientSecret })
+    .where(and(eq(forgeSchema.owner, user.id), eq(forgeSchema.id, forgeId)))
+    .returning()
+    .get();
+
+  return forge;
+});

server/api/forges/index.get.ts

@@ -5,5 +5,5 @@ export default defineEventHandler(async (event) => {
   const forges = await db.select().from(forgeSchema).where(isNull(forgeSchema.owner)).all();
 
   // use map to hide client id and secret
-  return forges.map((forge) => ({ id: forge.id, name: forge.name, host: forge.host, type: forge.type }));
+  return forges.map((forge) => ({ id: forge.id, owner: forge.owner, host: forge.host, type: forge.type }));
 });

server/api/forges/index.post.ts

@@ -0,0 +1,15 @@
+import { forgeSchema } from '../../schemas';
+
+export default defineEventHandler(async (event) => {
+  const user = await requireUser(event);
+
+  const forgeData = await readBody(event);
+
+  const forge = await db
+    .insert(forgeSchema)
+    .values({ ...forgeData, allowLogin: false, owner: user.id }) // TODO: allow admins to allow login via their forges
+    .returning()
+    .get();
+
+  return forge;
+});

server/db/migrations/0003_purple_anthem.sql

@@ -0,0 +1,2 @@
+CREATE UNIQUE INDEX `forges_host_unique` ON `forges` (`host`);--> statement-breakpoint
+ALTER TABLE `forges` DROP COLUMN `name`;