From ff2ddc9422d237710e02748b22d1dc15c436b8ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Wed, 5 Feb 2025 18:17:16 +0100 Subject: [PATCH 1/2] fix: move atproto util in runtime resolves #341 --- src/module.ts | 4 ++-- src/runtime/server/routes/atproto/client-metadata.json.get.ts | 2 +- src/runtime/server/utils/atproto.ts | 4 ++-- src/{ => runtime}/utils/atproto.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/{ => runtime}/utils/atproto.ts (82%) diff --git a/src/module.ts b/src/module.ts index 133f8fb..9c199fc 100644 --- a/src/module.ts +++ b/src/module.ts @@ -15,7 +15,7 @@ import { defu } from 'defu' import { randomUUID } from 'uncrypto' import type { ScryptConfig } from '@adonisjs/hash/types' import type { SessionConfig } from 'h3' -import { atprotoProviderDefaultClientMetadata, atprotoProviders, getClientMetadataFilename } from './utils/atproto' +import { atprotoProviderDefaultClientMetadata, atprotoProviders, getClientMetadataFilename } from './runtime/utils/atproto' import type { AtprotoProviderClientMetadata } from './runtime/types/atproto' // Module options TypeScript interface definition @@ -269,7 +269,7 @@ export default defineNuxtModule({ for (const provider of atprotoProviders) { addServerHandler({ - handler: resolver.resolve('./runtime/server/routes/atproto/client-metadata.json.get.ts'), + handler: resolver.resolve('./runtime/server/routes/atproto/client-metadata.json.get'), route: '/' + getClientMetadataFilename(provider, runtimeConfig.oauth[provider] as AtprotoProviderClientMetadata), method: 'get', }) diff --git a/src/runtime/server/routes/atproto/client-metadata.json.get.ts b/src/runtime/server/routes/atproto/client-metadata.json.get.ts index 3c55247..86728df 100644 --- a/src/runtime/server/routes/atproto/client-metadata.json.get.ts +++ b/src/runtime/server/routes/atproto/client-metadata.json.get.ts @@ -1,6 +1,6 @@ import { defineEventHandler, createError } from 'h3' import { getAtprotoClientMetadata } from '../../utils/atproto' -import { atprotoProviders, getClientMetadataFilename } from '../../../../utils/atproto' +import { atprotoProviders, getClientMetadataFilename } from '../../../utils/atproto' import type { AtprotoProviderClientMetadata } from '../../../types/atproto' import { useRuntimeConfig } from '#imports' diff --git a/src/runtime/server/utils/atproto.ts b/src/runtime/server/utils/atproto.ts index dce3265..88defb2 100644 --- a/src/runtime/server/utils/atproto.ts +++ b/src/runtime/server/utils/atproto.ts @@ -1,9 +1,9 @@ import type { H3Event } from 'h3' import type { OAuthClientMetadataInput, OAuthGrantType } from '@atproto/oauth-client-node' import type { AtprotoProviderClientMetadata } from '../../types/atproto' -import type { OAuthBlueskyConfig } from '../lib/oauth/bluesky' +import type { OAuthBlueskyConfig } from '../lib/atproto/bluesky' import { getOAuthRedirectURL } from '../lib/utils' -import { getClientMetadataFilename } from '../../../utils/atproto' +import { getClientMetadataFilename } from '../../utils/atproto' import type { ATProtoProvider, OAuthConfig } from '#auth-utils' import { getRequestURL, useRuntimeConfig } from '#imports' diff --git a/src/utils/atproto.ts b/src/runtime/utils/atproto.ts similarity index 82% rename from src/utils/atproto.ts rename to src/runtime/utils/atproto.ts index 9bb755f..aab9175 100644 --- a/src/utils/atproto.ts +++ b/src/runtime/utils/atproto.ts @@ -1,5 +1,5 @@ -import type { ATProtoProvider, OAuthProvider } from '../runtime/types' -import type { AtprotoProviderClientMetadata } from '../runtime/types/atproto' +import type { ATProtoProvider, OAuthProvider } from '../types' +import type { AtprotoProviderClientMetadata } from '../types/atproto' export const atprotoProviders = ['bluesky'] satisfies ATProtoProvider[] From 91a8ae119850aa797cf541861e732edab8dc2ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Wed, 5 Feb 2025 18:17:45 +0100 Subject: [PATCH 2/2] chore(release): v0.5.14 --- CHANGELOG.md | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f55d1d..3c5af2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Changelog +## v0.5.14 + +[compare changes](https://github.com/atinux/nuxt-auth-utils/compare/v0.5.13...v0.5.14) + +### 🩹 Fixes + +- Move atproto util in runtime ([ff2ddc9](https://github.com/atinux/nuxt-auth-utils/commit/ff2ddc9)) + +### ❤️ Contributors + +- Sébastien Chopin + ## v0.5.13 [compare changes](https://github.com/atinux/nuxt-auth-utils/compare/v0.5.12...v0.5.13) diff --git a/package.json b/package.json index fafa985..d9088a7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-auth-utils", - "version": "0.5.13", + "version": "0.5.14", "description": "Add Authentication to Nuxt applications with secured & sealed cookies sessions.", "repository": { "type": "git",