feat: Make OAuth optional and define it at runtime of the app (#303)

HugoRCD · Nov 11, 2024 · 593eae3 · 593eae3
1 parent 4921241
commit 593eae3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/apps/shelve/app/pages/login.vue b/apps/shelve/app/pages/login.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
-const { title } = useAppConfig()
-const { githubEnabled, googleEnabled } = useRuntimeConfig().public
+const { title, githubEnabled, googleEnabled } = useAppConfig()
 
 definePageMeta({
   layout: 'auth',

diff --git a/apps/shelve/modules/auth/index.ts b/apps/shelve/modules/auth/index.ts
@@ -5,20 +5,20 @@ export default defineNuxtModule({
     name: '@shelve/auth',
   },
   setup(options, nuxt) {
-    const { resolve } = createResolver(import.meta.url)
+    nuxt.hook('ready', () => {
+      let isGithubEnabled = false
+      let isGoogleEnabled = false
 
-    let isGithubEnabled = false
-    let isGoogleEnabled = false
+      if (process.env.NUXT_OAUTH_GITHUB_CLIENT_ID && process.env.NUXT_OAUTH_GITHUB_CLIENT_SECRET)
+        isGithubEnabled = true
+      if (process.env.NUXT_OAUTH_GOOGLE_CLIENT_ID && process.env.NUXT_OAUTH_GOOGLE_CLIENT_SECRET)
+        isGoogleEnabled = true
 
-    if (process.env.NUXT_OAUTH_GITHUB_CLIENT_ID && process.env.NUXT_OAUTH_GITHUB_CLIENT_SECRET)
-      isGithubEnabled = true
-    if (process.env.NUXT_OAUTH_GOOGLE_CLIENT_ID && process.env.NUXT_OAUTH_GOOGLE_CLIENT_SECRET)
-      isGoogleEnabled = true
+      nuxt.options.appConfig.googleEnabled = isGoogleEnabled
+      nuxt.options.appConfig.githubEnabled = isGithubEnabled
+    })
 
-    nuxt.options.runtimeConfig.public.googleEnabled = isGoogleEnabled
-    nuxt.options.runtimeConfig.public.githubEnabled = isGithubEnabled
-
-    if (isGithubEnabled) {
+    /*if (isGithubEnabled) {
       addServerHandler({
         route: '/auth/github',
         handler: resolve('./runtime/github')
@@ -30,6 +30,6 @@ export default defineNuxtModule({
         route: '/auth/google',
         handler: resolve('./runtime/google')
       })
-    }
+    }*/
   }
 })
diff --git a/apps/shelve/modules/auth/runtime/github.ts → apps/shelve/server/routes/github.ts b/apps/shelve/modules/auth/runtime/github.ts → apps/shelve/server/routes/github.ts
diff --git a/apps/shelve/modules/auth/runtime/google.ts → apps/shelve/server/routes/google.ts b/apps/shelve/modules/auth/runtime/google.ts → apps/shelve/server/routes/google.ts