feat(auth): enhance tenant context resolution and error logging

- Updated AuthProvider to improve tenant slug resolution by considering requestedSlug alongside tenant slug.
- Enhanced error handling in the OAuth callback by logging detailed error information when encountering authentication errors.
- Modified TenantContextResolver to include requestedSlug in tenant context creation, ensuring accurate context resolution.
- Updated TenantContext interface to include requestedSlug for better clarity in tenant context management.

Signed-off-by: Innei <tukon479@gmail.com>

Author: Innei

be/apps/core/src/modules/platform/auth/auth.provider.ts

@@ -49,8 +49,8 @@ export class AuthProvider implements OnModuleInit {
 
   private resolveTenantSlugFromContext(): string | null {
     try {
-      const tenantContext = HttpContext.getValue('tenant') as { tenant?: { slug?: string | null } } | undefined
-      const slug = tenantContext?.tenant?.slug
+      const tenantContext = HttpContext.getValue('tenant')
+      const slug = tenantContext?.requestedSlug ?? tenantContext?.tenant?.slug
       return slug ? slug.toLowerCase() : null
     } catch {
       return null
@@ -362,6 +362,20 @@ export class AuthProvider implements OnModuleInit {
   }
 
   async handler(context: Context): Promise<Response> {
+    const requestPath = typeof context.req.path === 'string' ? context.req.path : new URL(context.req.url).pathname
+    if (requestPath.startsWith('/api/auth/error')) {
+      const error = context.req.query('error')
+      const errorDescription = context.req.query('error_description')
+      const provider = context.req.query('provider')
+      const debugParts = [
+        '[AuthProvider] OAuth callback error encountered.',
+        error ? `error=${error}` : null,
+        errorDescription ? `description=${errorDescription}` : null,
+        provider ? `provider=${provider}` : null,
+        `url=${context.req.url}`,
+      ].filter(Boolean)
+      logger.error(debugParts.join(' '))
+    }
     const auth = await this.getAuth()
     return auth.handler(context.req.raw)
   }

be/apps/core/src/modules/platform/tenant/tenant-context-resolver.service.ts

@@ -74,6 +74,7 @@ export class TenantContextResolver {
       derivedSlug = ROOT_TENANT_SLUG
     }
 
+    const requestedSlug = derivedSlug ?? tenantSlugHeader ?? null
     if (!derivedSlug) {
       derivedSlug = tenantSlugHeader
     }
@@ -91,12 +92,16 @@ export class TenantContextResolver {
 
     if (!tenantContext && this.shouldFallbackToPlaceholder(tenantId, derivedSlug)) {
       const placeholder = await this.tenantService.ensurePlaceholderTenant()
-      tenantContext = this.asTenantContext(placeholder, true)
+      tenantContext = this.asTenantContext(placeholder, true, requestedSlug)
       this.log.verbose(
         `Applied placeholder tenant context for ${context.req.method} ${context.req.path} (host=${host ?? 'n/a'})`,
       )
     } else if (tenantContext) {
-      tenantContext = this.asTenantContext(tenantContext, tenantContext.tenant.slug === PLACEHOLDER_TENANT_SLUG)
+      tenantContext = this.asTenantContext(
+        tenantContext,
+        tenantContext.tenant.slug === PLACEHOLDER_TENANT_SLUG,
+        requestedSlug ?? tenantContext.tenant.slug ?? null,
+      )
     }
 
     if (!tenantContext) {
@@ -259,10 +264,15 @@ export class TenantContextResolver {
     return !(tenantId && tenantId.length > 0) && !(slug && slug.length > 0)
   }
 
-  private asTenantContext(source: TenantAggregate, isPlaceholder: boolean): TenantContext {
+  private asTenantContext(
+    source: TenantAggregate,
+    isPlaceholder: boolean,
+    requestedSlug: string | null,
+  ): TenantContext {
     return {
       tenant: source.tenant,
       isPlaceholder,
+      requestedSlug,
     }
   }
 }

be/apps/core/src/modules/platform/tenant/tenant.types.ts

@@ -9,6 +9,7 @@ export interface TenantAggregate {
 
 export interface TenantContext extends TenantAggregate {
   readonly isPlaceholder?: boolean
+  readonly requestedSlug?: string | null
 }
 
 export interface TenantResolutionInput {