Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ export default defineBuildConfig({
builder: 'mkdist',
outDir : 'dist/core',
},
{
input : './src/server/',
builder: 'mkdist',
outDir : 'dist/server',
},
],
externals : ['#imports'],
declaration: true,
Expand Down
18 changes: 12 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@
"./core": {
"import": "./dist/core/index.mjs",
"types": "./dist/core/index.d.ts"
},
"./server": {
"import": "./dist/server/index.mjs",
"types": "./dist/server/index.d.ts"
}
},
"typesVersions": {
"*": {
"core": [
"./dist/core/index.d.ts"
],
"utils": [
"./dist/utils.d.ts"
"server": [
"./dist/server/index.d.ts"
]
}
},
Expand All @@ -41,17 +45,19 @@
"dev:prepare": "nuxt-module-build build --stub && nuxi prepare playground"
},
"dependencies": {
"@nuxt/kit": "^3.13.2",
"@nuxt/kit": "^3.17.4",
"cookie-es": "^2.0.0",
"defu": "^6.1.2",
"destr": "^2.0.0",
"h3": "^1.6.4",
"html-escaper": "^3.0.3",
"escape-goat": "^4.0.0",
"h3": "^1.15.3",
"hookable": "^5.5.3",
"ohash": "^2.0.0",
"requrl": "^3.0.2",
"simple-oauth2": "^5.0.0",
"std-env": "^3.9.0",
"type-fest": "^4.8.2",
"ufo": "^1.0.1"
"ufo": "^1.6.1"
},
"devDependencies": {
"@nuxt/module-builder": "0.8.4",
Expand Down
10 changes: 6 additions & 4 deletions playground/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ import { fileURLToPath } from 'node:url'
import { defineNuxtConfig } from 'nuxt/config'

export default defineNuxtConfig({
modules : ['../src/module'],
alias : { '@privyid/nuauth/core': fileURLToPath(new URL('../src/core', import.meta.url)) },
compatibilityDate: '2024-09-13',
modules : ['../src/module'],
alias : {
'@privyid/nuauth/core' : fileURLToPath(new URL('../src/core', import.meta.url)),
'@privyid/nuauth/server': fileURLToPath(new URL('../src/server', import.meta.url)),
},
typescript: {
tsConfig: {
compilerOptions: {
Expand All @@ -13,6 +17,4 @@ export default defineNuxtConfig({
},
},
nuauth: { profile: { names: ['oauth', 'gitlab'] } },

compatibilityDate: '2024-09-13',
})
9 changes: 9 additions & 0 deletions playground/server/middleware/nuauth-headers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { defineEventHandler } from '#imports'
import { randomUUID } from 'node:crypto'
import { onNuAuth } from '@privyid/nuauth/server'

export default defineEventHandler((event) => {
onNuAuth(event, 'request:token', ({ options }) => {
options.headers.set('X-Request-ID', randomUUID())
})
})
3 changes: 3 additions & 0 deletions playground/server/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"extends": "../.nuxt/tsconfig.server.json"
}
20 changes: 0 additions & 20 deletions src/core/client.ts

This file was deleted.

10 changes: 5 additions & 5 deletions src/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ interface AuthRefreshResponse {
code: number,
message: string,
data: {
access_token: string,
refresh_token: string,
token: string,
refreshToken: string,
expires: string,
},
}
Expand Down Expand Up @@ -105,11 +105,11 @@ export function useNuAuth (authProfile?: string): NuAuth {
query: { profile },
})

token.value = response.data.access_token
refreshToken.value = response.data.refresh_token
token.value = response.data.token
refreshToken.value = response.data.refreshToken
expires.value = response.data.expires

return response.data.access_token
return response.data.token
}

return {
Expand Down
133 changes: 0 additions & 133 deletions src/core/redirect.ts

This file was deleted.

70 changes: 0 additions & 70 deletions src/core/utils.ts

This file was deleted.

13 changes: 8 additions & 5 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
addImports,
addRouteMiddleware,
addServerHandler,
addServerPlugin,
createResolver,
defineNuxtModule,
} from '@nuxt/kit'
Expand Down Expand Up @@ -87,10 +88,12 @@ export default defineNuxtModule<ModuleOptions>({
if (!nuxt.options.build.transpile.includes('@privyid/nuauth'))
nuxt.options.build.transpile.push('@privyid/nuauth')

addServerHandler({ route: '/auth/login', handler: resolve('./runtime/login') })
addServerHandler({ route: '/auth/callback', handler: resolve('./runtime/callback') })
addServerHandler({ route: '/auth/refresh', handler: resolve('./runtime/refresh') })
addServerHandler({ route: '/auth/logout', handler: resolve('./runtime/logout') })
addServerPlugin(resolve('./runtime/server/plugins/nuauth'))

addServerHandler({ route: '/auth/login', handler: resolve('./runtime/server/routes/login') })
addServerHandler({ route: '/auth/callback', handler: resolve('./runtime/server/routes/callback') })
addServerHandler({ route: '/auth/refresh', handler: resolve('./runtime/server/routes/refresh') })
addServerHandler({ route: '/auth/logout', handler: resolve('./runtime/server/routes/logout') })

if (options.autoImport) {
addImports({
Expand All @@ -103,7 +106,7 @@ export default defineNuxtModule<ModuleOptions>({
addRouteMiddleware({
global: true,
name : 'nuauth',
path : resolve('./runtime/middleware'),
path : resolve('./runtime/middleware/nuauth'),
})
}
},
Expand Down
Loading