insforge 0.3.3 → 1.2.10

package/backend/src/services/auth/index.ts

@@ -0,0 +1,4 @@
+export { AuthService } from './auth.service.js';
+export { AuthConfigService } from './auth-config.service.js';
+export { AuthOTPService } from './auth-otp.service.js';
+export { OAuthConfigService } from './oauth-config.service.js';

package/backend/src/{core/auth/oauth.ts → services/auth/oauth-config.service.ts}

@@ -1,13 +1,13 @@
 import { Pool } from 'pg';
-import { DatabaseManager } from '@/core/database/manager.js';
-import { SecretsService } from '@/core/secrets/secrets.js';
-import { AppError } from '@/api/middleware/error.js';
+import { DatabaseManager } from '@/infra/database/database.manager.js';
+import { SecretService } from '@/services/secrets/secret.service.js';
+import { AppError } from '@/api/middlewares/error.js';
 import { ERROR_CODES } from '@/types/error-constants.js';
 import logger from '@/utils/logger.js';
-import { OAuthConfigSchema } from '@insforge/shared-schemas';
+import { OAuthConfigSchema, OAuthProvidersSchema } from '@insforge/shared-schemas';
 
 export interface CreateOAuthConfigInput {
-  provider: string;
+  provider: OAuthProvidersSchema;
   clientId?: string;
   clientSecret?: string;
   redirectUri?: string;
@@ -26,11 +26,11 @@ export interface UpdateOAuthConfigInput {
 export class OAuthConfigService {
   private static instance: OAuthConfigService;
   private pool: Pool | null = null;
-  private secretsService: SecretsService;
+  private secretService: SecretService;
 
   private constructor() {
-    this.secretsService = new SecretsService();
-    logger.info('OAuthService initialized');
+    this.secretService = SecretService.getInstance();
+    logger.info('OAuthConfigService initialized');
   }
 
   public static getInstance(): OAuthConfigService {
@@ -51,15 +51,17 @@ export class OAuthConfigService {
    * Get all OAuth configurations
    */
   async getAllConfigs(): Promise<OAuthConfigSchema[]> {
-    const client = await this.getPool().connect();
     try {
-      const result = await client.query(
+      const result = await this.getPool().query(
         `SELECT
+          id,
           provider,
           client_id as "clientId",
           redirect_uri as "redirectUri",
           scopes,
-          use_shared_key as "useSharedKey"
+          use_shared_key as "useSharedKey",
+          created_at as "createdAt",
+          updated_at as "updatedAt"
          FROM _oauth_configs
          ORDER BY provider ASC`
       );
@@ -68,8 +70,26 @@ export class OAuthConfigService {
     } catch (error) {
       logger.error('Failed to get OAuth configs', { error });
       throw new AppError('Failed to get OAuth configurations', 500, ERROR_CODES.INTERNAL_ERROR);
-    } finally {
-      client.release();
+    }
+  }
+
+  /**
+   * Get public OAuth provider information (safe for public API)
+   * Only returns non-sensitive information about configured providers
+   */
+  async getConfiguredProviders(): Promise<OAuthProvidersSchema[]> {
+    try {
+      const result = await this.getPool().query(
+        `SELECT
+          provider
+         FROM _oauth_configs
+         ORDER BY provider ASC`
+      );
+
+      return result.rows.map((row) => row.provider);
+    } catch (error) {
+      logger.error('Failed to get public OAuth providers', { error });
+      throw new AppError('Failed to get OAuth providers', 500, ERROR_CODES.INTERNAL_ERROR);
     }
   }
 
@@ -77,22 +97,24 @@ export class OAuthConfigService {
    * Get OAuth configuration by provider name
    */
   async getConfigByProvider(provider: string): Promise<OAuthConfigSchema | null> {
-    const client = await this.getPool().connect();
     try {
-      const result = await client.query(
+      const result = await this.getPool().query(
         `SELECT
+          id,
           provider,
           client_id as "clientId",
           redirect_uri as "redirectUri",
           scopes,
-          use_shared_key as "useSharedKey"
+          use_shared_key as "useSharedKey",
+          created_at as "createdAt",
+          updated_at as "updatedAt"
          FROM _oauth_configs
          WHERE LOWER(provider) = LOWER($1)
          LIMIT 1`,
         [provider]
       );
 
-      if (result.rows.length === 0) {
+      if (!result.rows.length) {
         return null;
       }
 
@@ -100,8 +122,6 @@ export class OAuthConfigService {
     } catch (error) {
       logger.error('Failed to get OAuth config by provider', { error, provider });
       throw new AppError('Failed to get OAuth configuration', 500, ERROR_CODES.INTERNAL_ERROR);
-    } finally {
-      client.release();
     }
   }
 
@@ -109,9 +129,8 @@ export class OAuthConfigService {
    * Get OAuth provider secret
    */
   async getClientSecretByProvider(provider: string): Promise<string | null> {
-    const client = await this.getPool().connect();
     try {
-      const result = await client.query(
+      const result = await this.getPool().query(
         `SELECT
           secret_id as "secretId"
          FROM _oauth_configs
@@ -120,12 +139,12 @@ export class OAuthConfigService {
         [provider]
       );
 
-      if (result.rows.length === 0) {
+      if (!result.rows.length) {
         return null;
       }
 
       const config = result.rows[0];
-      const clientSecret = await this.secretsService.getSecretById(config.secretId);
+      const clientSecret = await this.secretService.getSecretById(config.secretId);
       if (!clientSecret) {
         logger.warn('OAuth config exists but secret not found', { provider });
         return null;
@@ -135,8 +154,6 @@ export class OAuthConfigService {
     } catch (error) {
       logger.error('Failed to get OAuth config with secret', { error, provider });
       throw new AppError('Failed to get OAuth configuration', 500, ERROR_CODES.INTERNAL_ERROR);
-    } finally {
-      client.release();
     }
   }
 
@@ -154,7 +171,7 @@ export class OAuthConfigService {
         [input.provider]
       );
 
-      if (existingConfig.rows.length > 0) {
+      if (existingConfig.rows.length) {
         throw new AppError(
           `OAuth configuration for ${input.provider} already exists`,
           409,
@@ -167,7 +184,7 @@ export class OAuthConfigService {
       // Only create secret if clientSecret is provided and not using shared key
       if (input.clientSecret && !input.useSharedKey) {
         // Create new secret
-        const secret = await this.secretsService.createSecret({
+        const secret = await this.secretService.createSecret({
           key: `${input.provider.toUpperCase()}_CLIENT_SECRET`,
           value: input.clientSecret,
         });
@@ -177,11 +194,42 @@ export class OAuthConfigService {
       // Set default scopes if not provided
       let scopes = input.scopes;
       if (!scopes) {
-        const provider = input.provider.toLowerCase();
-        if (provider === 'google') {
-          scopes = ['openid', 'email', 'profile'];
-        } else if (provider === 'github') {
-          scopes = ['user:email'];
+        switch (input.provider) {
+          case 'google':
+            scopes = ['openid', 'email', 'profile'];
+            break;
+          case 'github':
+            scopes = ['user:email'];
+            break;
+          case 'discord':
+            scopes = ['identify', 'email'];
+            break;
+          case 'linkedin':
+            scopes = ['openid', 'profile', 'email'];
+            break;
+          case 'facebook':
+            scopes = ['email', 'public_profile'];
+            break;
+          case 'instagram':
+            scopes = ['user_profile', 'user_media'];
+            break;
+          case 'tiktok':
+            scopes = ['user.info.basic'];
+            break;
+          case 'apple':
+            scopes = ['name', 'email'];
+            break;
+          case 'x':
+            scopes = ['tweet.read', 'users.read'];
+            break;
+          case 'spotify':
+            scopes = ['user-read-email', 'user-read-private'];
+            break;
+          case 'microsoft':
+            scopes = ['User.Read'];
+            break;
+          default:
+            scopes = ['email', 'profile'];
         }
       }
 
@@ -190,11 +238,14 @@ export class OAuthConfigService {
         `INSERT INTO _oauth_configs (provider, client_id, secret_id, redirect_uri, scopes, use_shared_key)
          VALUES ($1, $2, $3, $4, $5, $6)
          RETURNING
+           id,
            provider,
            client_id as "clientId",
            redirect_uri as "redirectUri",
            scopes,
-           use_shared_key as "useSharedKey"`,
+           use_shared_key as "useSharedKey",
+           created_at as "createdAt",
+           updated_at as "updatedAt"`,
         [
           input.provider.toLowerCase(),
           input.clientId || null,
@@ -235,7 +286,7 @@ export class OAuthConfigService {
         [provider]
       );
 
-      if (existingResult.rows.length === 0) {
+      if (!existingResult.rows.length) {
         throw new AppError('OAuth configuration not found', 404, ERROR_CODES.NOT_FOUND);
       }
 
@@ -245,12 +296,12 @@ export class OAuthConfigService {
       if (input.clientSecret !== undefined) {
         if (existingConfig.secretId) {
           // Update existing secret
-          await this.secretsService.updateSecret(existingConfig.secretId, {
+          await this.secretService.updateSecret(existingConfig.secretId, {
             value: input.clientSecret,
           });
         } else {
           // Create new secret if it doesn't exist
-          const secret = await this.secretsService.createSecret({
+          const secret = await this.secretService.createSecret({
             key: `${provider.toUpperCase()}_CLIENT_SECRET`,
             value: input.clientSecret,
           });
@@ -287,7 +338,7 @@ export class OAuthConfigService {
         values.push(input.useSharedKey);
       }
 
-      if (updates.length === 0 && input.clientSecret === undefined) {
+      if (!updates.length && input.clientSecret === undefined) {
         await client.query('COMMIT');
         // Return the config in the correct format
         const config = await this.getConfigByProvider(provider);
@@ -297,7 +348,7 @@ export class OAuthConfigService {
         return config;
       }
 
-      if (updates.length > 0) {
+      if (updates.length) {
         updates.push('updated_at = NOW()');
         values.push(provider.toLowerCase());
 
@@ -306,30 +357,33 @@ export class OAuthConfigService {
            SET ${updates.join(', ')}
            WHERE LOWER(provider) = $${paramCount}
            RETURNING
+             id,
              provider,
              client_id as "clientId",
              redirect_uri as "redirectUri",
              scopes,
-             use_shared_key as "useSharedKey"`,
+             use_shared_key as "useSharedKey",
+             created_at as "createdAt",
+             updated_at as "updatedAt"`,
           values
         );
 
         await client.query('COMMIT');
         logger.info('OAuth config updated', { provider });
         return result.rows[0];
-      } else {
-        // Only secret was updated
-        await client.query('COMMIT');
-        const updatedConfig = await this.getConfigByProvider(provider);
-        if (!updatedConfig) {
-          throw new AppError(
-            'Failed to retrieve updated configuration',
-            500,
-            ERROR_CODES.INTERNAL_ERROR
-          );
-        }
-        return updatedConfig;
       }
+
+      // Only secret was updated
+      await client.query('COMMIT');
+      const updatedConfig = await this.getConfigByProvider(provider);
+      if (!updatedConfig) {
+        throw new AppError(
+          'Failed to retrieve updated configuration',
+          500,
+          ERROR_CODES.INTERNAL_ERROR
+        );
+      }
+      return updatedConfig;
     } catch (error) {
       await client.query('ROLLBACK');
       logger.error('Failed to update OAuth config', { error, provider });
@@ -356,7 +410,7 @@ export class OAuthConfigService {
         [provider]
       );
 
-      if (existingResult.rows.length === 0) {
+      if (!existingResult.rows.length) {
         await client.query('ROLLBACK');
         return false;
       }