Merge branch 'main' of https://github.com/Atinux/nuxt-auth-utils

Author: Azurency

CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 
 
+## v0.0.6
+
+[compare changes](https://github.com/Atinux/nuxt-auth-utils/compare/v0.0.5...v0.0.6)
+
+### 🚀 Enhancements
+
+- Added discord auth provider ([#7](https://github.com/Atinux/nuxt-auth-utils/pull/7))
+- Added oauth battle.net ([#11](https://github.com/Atinux/nuxt-auth-utils/pull/11))
+- Refactor login buttons to use dropdown ([#14](https://github.com/Atinux/nuxt-auth-utils/pull/14))
+
+### 🏡 Chore
+
+- Update deps ([05f4a9c](https://github.com/Atinux/nuxt-auth-utils/commit/05f4a9c))
+
+### ❤️ Contributors
+
+- Sébastien Chopin ([@Atinux](http://github.com/Atinux))
+- Arash 
+- Samuel LEFEVRE 
+- H+ <[email protected]>
+
 ## v0.0.5
 
 [compare changes](https://github.com/Atinux/nuxt-auth-utils/compare/v0.0.4...v0.0.5)

README.md

@@ -142,6 +142,7 @@ export default defineNuxtConfig({
 ```
 
 It can also be set using environment variables:
+
 - `NUXT_OAUTH_<PROVIDER>_CLIENT_ID`
 - `NUXT_OAUTH_<PROVIDER>_CLIENT_SECRET`
 
@@ -153,6 +154,7 @@ It can also be set using environment variables:
 - Google
 - Spotify
 - Twitch
+- Battle.net
 
 You can add your favorite provider by creating a new file in [src/runtime/server/lib/oauth/](./src/runtime/server/lib/oauth/).
 
@@ -183,7 +185,6 @@ export default oauth.githubEventHandler({
 
 Make sure to set the callback URL in your OAuth app settings as `<your-domain>/auth/github`.
 
-
 ## Development
 
 ```bash

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-auth-utils",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Minimalist Auth module for Nuxt with SSR",
   "repository": "Atinux/nuxt-auth-utils",
   "license": "MIT",
@@ -36,20 +36,20 @@
     "ohash": "^1.1.3"
   },
   "devDependencies": {
-    "@iconify-json/simple-icons": "^1.1.76",
+    "@iconify-json/simple-icons": "^1.1.78",
     "@nuxt/devtools": "latest",
     "@nuxt/eslint-config": "^0.2.0",
-    "@nuxt/module-builder": "^0.5.2",
+    "@nuxt/module-builder": "^0.5.4",
     "@nuxt/schema": "^3.8.1",
     "@nuxt/test-utils": "^3.8.1",
     "@nuxt/ui": "^2.10.0",
     "@nuxt/ui-pro": "^0.4.2",
-    "@types/node": "^20.8.9",
+    "@types/node": "^20.9.0",
     "changelogen": "^0.5.5",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "nuxt": "^3.8.1",
     "typescript": "^5.2.2",
-    "vitest": "^0.33.0",
+    "vitest": "^0.34.6",
     "vue-tsc": "^1.8.22"
   }
 }

playground/.env.example

@@ -18,3 +18,6 @@ NUXT_OAUTH_AUTH0_DOMAIN=
 # Discord
 NUXT_OAUTH_DISCORD_CLIENT_ID=
 NUXT_OAUTH_DISCORD_CLIENT_SECRET=
+# Battle.net OAuth
+NUXT_OAUTH_BATTLEDOTNET_CLIENT_ID=
+NUXT_OAUTH_BATTLEDOTNET_CLIENT_SECRET=

playground/app.vue

@@ -1,70 +1,69 @@
-<script setup>
-const { loggedIn, session, clear } = useUserSession()
+<script setup lang="ts">
+const { loggedIn, user, session, clear } = useUserSession()
+
+const providers = computed(() => [
+  {
+    label: session.value.user?.github?.login || 'GitHub',
+    to: '/auth/github',
+    disabled: Boolean(user.value?.github),
+    icon: 'i-simple-icons-github',
+  },
+  {
+    label: session.value.user?.spotify?.display_name || 'Spotify',
+    to: '/auth/spotify',
+    disabled: Boolean(user.value?.spotify),
+    icon: 'i-simple-icons-spotify',
+  },
+  {
+    label: session.value.user?.google?.email || 'Google',
+    to: '/auth/google',
+    disabled: Boolean(user.value?.google),
+    icon: 'i-simple-icons-google',
+  },
+  {
+    label: session.value.user?.twitch?.login || 'Twitch',
+    to: '/auth/twitch',
+    disabled: Boolean(user.value?.twitch),
+    icon: 'i-simple-icons-twitch',
+  },
+  {
+    label: user.value?.auth0?.email || 'Auth0',
+    to: '/auth/auth0',
+    disabled: Boolean(user.value?.auth0),
+    icon: 'i-simple-icons-auth0',
+  },
+  {
+    label: user.value?.discord?.username || 'Discord',
+    to: '/auth/discord',
+    disabled: Boolean(user.value?.discord),
+    icon: 'i-simple-icons-discord',
+  },
+  {
+    label: user.value?.battledotnet?.battletag || 'Battle.net',
+    to: '/auth/battledotnet',
+    disabled: Boolean(user.value?.battledotnet),
+    icon: 'i-simple-icons-battledotnet',
+  },
+].map(p => ({
+  ...p,
+  prefetch: false,
+  external: true,
+})))
 </script>
 
 <template>
   <UHeader>
     <template #right>
-      <UButton
-        v-if="!loggedIn || !session.user.github"
-        to="/auth/github"
-        icon="i-simple-icons-github"
-        external
-        color="gray"
-        size="xs"
-      >
-        Login with GitHub
-      </UButton>
-      <UButton
-        v-if="!loggedIn || !session.user.spotify"
-        to="/auth/spotify"
-        icon="i-simple-icons-spotify"
-        external
-        color="gray"
-        size="xs"
-      >
-        Login with Spotify
-      </UButton>
-      <UButton
-        v-if="!loggedIn || !session.user.google"
-        to="/auth/google"
-        icon="i-simple-icons-google"
-        external
-        color="gray"
-        size="xs"
-      >
-        Login with Google
-      </UButton>
-      <UButton
-        v-if="!loggedIn || !session.user.twitch"
-        to="/auth/twitch"
-        icon="i-simple-icons-twitch"
-        external
-        color="gray"
-        size="xs"
-      >
-        Login with Twitch
-      </UButton>
-      <UButton
-        v-if="!loggedIn || !session.user.auth0"
-        to="/auth/auth0"
-        icon="i-simple-icons-auth0"
-        external
-        color="gray"
-        size="xs"
-      >
-        Login with Auth0
-      </UButton>
-      <UButton
-        v-if="!loggedIn || !session.user.discord"
-        to="/auth/discord"
-        icon="i-simple-icons-discord"
-        external
-        color="gray"
-        size="xs"
-      >
-        Login with Discord
-      </UButton>
+      <UDropdown :items="[providers]">
+        <UButton
+          icon="i-heroicons-chevron-down"
+          trailing
+          color="gray"
+          size="xs"
+        >
+          Login with
+        </UButton>
+      </UDropdown>
       <UButton
         v-if="loggedIn"
         color="gray"

playground/auth.d.ts

@@ -7,6 +7,7 @@ declare module '#auth-utils' {
       twitch?: any
       auth0?: any
       discord?: any
+      battledotnet?: any
     }
     loggedInAt: number
   }

playground/server/routes/auth/battledotnet.get.ts

@@ -0,0 +1,12 @@
+export default oauth.battledotnetEventHandler({
+  async onSuccess(event, { user }) {
+    await setUserSession(event, {
+      user: {
+        battledotnet: user,
+      },
+      loggedInAt: Date.now()
+    })
+
+    return sendRedirect(event, '/')
+  }
+})