fix forges tokens refreshing

geprog · Aug 15, 2023 · 3bc5d1e · 3bc5d1e
1 parent 30d6d18
commit 3bc5d1e
Show file tree

Hide file tree

Showing 21 changed files with 156 additions and 856 deletions.
diff --git a/composables/auth.ts b/composables/auth.ts
@@ -25,6 +25,7 @@ export const useAuth = () => {
     }
 
     // TODO: load user data
+    // TODO: fix for SSR
     (async () => {
       user.value = await $fetch('/api/user');
     })();

diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -3,7 +3,7 @@ import type { Config } from 'drizzle-kit';
 // For config references visit  https://orm.drizzle.team/kit-docs/config-reference
 
 export default {
-  schema: ['./server/schemas/schemas.ts'],
+  schema: ['./server/schemas/*schemas.ts'],
   out: './server/db/migrations',
   dbCredentials: {
     url: 'code_captain.db',

diff --git a/server/api/auth/callback.get.ts b/server/api/auth/callback.get.ts
@@ -48,6 +48,7 @@ export default defineEventHandler(async (event) => {
         forgeId: forgeModel.id,
         remoteUserId: oauthUser.remoteUserId,
         accessToken: tokens.accessToken,
+        accessTokenExpiresIn: tokens.accessTokenExpiresIn,
         refreshToken: tokens.refreshToken,
       })
       .onConflictDoNothing()
@@ -101,6 +102,7 @@ export default defineEventHandler(async (event) => {
       forgeId: forgeModel.id,
       remoteUserId: oauthUser.remoteUserId,
       accessToken: tokens.accessToken,
+      accessTokenExpiresIn: tokens.accessTokenExpiresIn,
       refreshToken: tokens.refreshToken,
     })
     .run();

diff --git a/...r/db/migrations/0001_spotty_stone_men.sql → .../migrations/0000_gray_radioactive_man.sql b/...r/db/migrations/0001_spotty_stone_men.sql → .../migrations/0000_gray_radioactive_man.sql
@@ -3,6 +3,7 @@ CREATE TABLE `forges` (
 	`name` text,
 	`type` text NOT NULL,
 	`host` text,
+	`allowLogin` integer,
 	`clientId` text NOT NULL,
 	`clientSecret` text NOT NULL
 );
@@ -11,7 +12,15 @@ CREATE TABLE `userForges` (
 	`id` integer PRIMARY KEY NOT NULL,
 	`userId` integer NOT NULL,
 	`forgeId` integer NOT NULL,
-	`remoteUserId` text NOT NULL
+	`remoteUserId` text NOT NULL,
+	`accessToken` text NOT NULL,
+	`accessTokenExpiresIn` integer NOT NULL,
+	`refreshToken` text
 );
 --> statement-breakpoint
-ALTER TABLE `users` DROP COLUMN `login`;
+CREATE TABLE `users` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`name` text,
+	`avatarUrl` text,
+	`email` text
+);
diff --git a/server/db/migrations/0000_moaning_wendell_vaughn.sql b/server/db/migrations/0000_moaning_wendell_vaughn.sql
diff --git a/server/db/migrations/0002_modern_polaris.sql b/server/db/migrations/0002_modern_polaris.sql
diff --git a/server/db/migrations/0003_worried_aqueduct.sql b/server/db/migrations/0003_worried_aqueduct.sql
diff --git a/server/db/migrations/0004_sweet_mandroid.sql b/server/db/migrations/0004_sweet_mandroid.sql
diff --git a/server/db/migrations/0005_tricky_jack_flag.sql b/server/db/migrations/0005_tricky_jack_flag.sql
diff --git a/server/db/migrations/meta/0000_snapshot.json b/server/db/migrations/meta/0000_snapshot.json
@@ -1,11 +1,11 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "26bc539a-d250-40d4-a924-90bd3ebe405a",
+  "id": "7e38af1c-fd4f-461b-8856-db3d20cd480c",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
-    "users": {
-      "name": "users",
+    "forges": {
+      "name": "forges",
       "columns": {
         "id": {
           "name": "id",
@@ -14,13 +14,122 @@
           "notNull": true,
           "autoincrement": false
         },
-        "login": {
-          "name": "login",
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
           "type": "text",
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
         },
+        "allowLogin": {
+          "name": "allowLogin",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "clientId": {
+          "name": "clientId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "clientSecret": {
+          "name": "clientSecret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "userForges": {
+      "name": "userForges",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "userId": {
+          "name": "userId",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "forgeId": {
+          "name": "forgeId",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remoteUserId": {
+          "name": "remoteUserId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "accessToken": {
+          "name": "accessToken",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "accessTokenExpiresIn": {
+          "name": "accessTokenExpiresIn",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refreshToken": {
+          "name": "refreshToken",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "users": {
+      "name": "users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
         "name": {
           "name": "name",
           "type": "text",

diff --git a/server/db/migrations/meta/0001_snapshot.json b/server/db/migrations/meta/0001_snapshot.json