@hed-hog/core 0.0.294 → 0.0.296

package/src/oauth/oauth.service.ts

@@ -1,11 +1,11 @@
-import { PrismaService, user_account_provider_enum } from '@hed-hog/api-prisma';
+import { PrismaService, user_account_provider_52222e2ecb_enum } from '@hed-hog/api-prisma';
 import {
-  BadRequestException,
-  ConflictException,
-  Inject,
-  Injectable,
-  NotFoundException,
-  forwardRef
+    BadRequestException,
+    ConflictException,
+    Inject,
+    Injectable,
+    NotFoundException,
+    forwardRef
 } from '@nestjs/common';
 import { AuthService } from '../auth/auth.service';
 import { FileService } from '../file/file.service';
@@ -26,7 +26,7 @@ type HandleCallbackProps = {
   ipAddress: string; 
   userAgent: string;
   res: Response;
-  provider: user_account_provider_enum;
+  provider: user_account_provider_52222e2ecb_enum;
   code?: string;
   type: 'login' | 'register' | 'connect' | 'disconnect';
   userId?: number;
@@ -61,7 +61,7 @@ export class OAuthService {
     this.providers.set(microsoftEntraId.getProviderType(), microsoftEntraId);
   }
 
-  getAuthUrl(provider: user_account_provider_enum, callbackPath: string) {
+  getAuthUrl(provider: user_account_provider_52222e2ecb_enum, callbackPath: string) {
     return this.getProvider(provider).getAuthUrl(callbackPath);
   }
 
@@ -96,14 +96,14 @@ export class OAuthService {
     }
   }
 
-  private getProvider(provider: user_account_provider_enum) {
+  private getProvider(provider: user_account_provider_52222e2ecb_enum) {
     const prov = this.providers.get(String(provider).toUpperCase());
     if (!prov)
       throw new BadRequestException(`Provider ${provider} não suportado`);
     return prov;
   }
 
-  private async getProviderScopes(provider: user_account_provider_enum) {
+  private async getProviderScopes(provider: user_account_provider_52222e2ecb_enum) {
     const settingKey = `${String(provider).toLowerCase().replace(/-/g, '_')}_scopes`;
 
     const settings = await this.setting.getSettingValues([
@@ -118,13 +118,13 @@ export class OAuthService {
     return settings[settingKey].join(',') || '';
   }
 
-  private async handleLogin(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_enum, profile: any) {
+  private async handleLogin(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_52222e2ecb_enum, profile: any) {
 
     console.log('[OAuthService] Handling login for provider:', provider);
 
     const userAccount = await this.prisma.user_account.findFirst({
       where: {
-        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
+        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_52222e2ecb_enum,
         email: profile.email,
       },
       include: {
@@ -177,7 +177,7 @@ export class OAuthService {
     }
   }
 
-  private async handleRegister(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_enum, profile: any) {
+  private async handleRegister(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_52222e2ecb_enum, profile: any) {
     const existingUser = await this.prisma.user_identifier.findFirst({
       where: {
         type: 'email',
@@ -223,7 +223,7 @@ export class OAuthService {
         },
         user_account: {
           create: {
-            provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
+            provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_52222e2ecb_enum,
             provider_user_id: profile.id,
             email: profile.email,
             refresh_token: encryptedRefreshToken ? Buffer.from(encryptedRefreshToken) : null,
@@ -272,14 +272,14 @@ export class OAuthService {
     locale: string, 
     ipAddress: string, 
     userAgent: string,
-    provider: user_account_provider_enum,
+    provider: user_account_provider_52222e2ecb_enum,
     profile: any,
     userId: number,
   ) {
     const existingAccount = await this.prisma.user_account.findFirst({
       where: {
         user_id: userId,
-        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
+        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_52222e2ecb_enum,
       },
     });
 
@@ -292,7 +292,7 @@ export class OAuthService {
     await this.prisma.user_account.create({
       data: {
         user_id: userId,
-        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
+        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_52222e2ecb_enum,
         provider_user_id: profile.id,
         email: profile.email,
         refresh_token: Buffer.from(encryptedRefreshToken),
@@ -334,11 +334,11 @@ export class OAuthService {
     return { accessToken };
   }
 
-  private async handleDisconnect(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_enum, email: string) {
+  private async handleDisconnect(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_52222e2ecb_enum, email: string) {
     const userAccount = await this.prisma.user_account.findFirst({
       where: {
         email,
-        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_enum,
+        provider: String(provider).toLowerCase().replace(/-/g, '_') as user_account_provider_52222e2ecb_enum,
       },
       include: { user: true }
     });

package/src/setting/setting.service.ts

@@ -1,7 +1,7 @@
 import { itemTranslations } from '@hed-hog/api';
 import { getLocaleText, LocaleService } from '@hed-hog/api-locale';
 import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
-import { PrismaService, setting_type_enum } from '@hed-hog/api-prisma';
+import { PrismaService, setting_type_0f055cd5ea_enum } from '@hed-hog/api-prisma';
 import {
     BadRequestException,
     forwardRef,
@@ -36,7 +36,7 @@ export class SettingService {
       where: {
         ...( !includeSecrets ? {
               NOT: [
-                { type: setting_type_enum.secret },
+                { type: setting_type_0f055cd5ea_enum.secret },
               ],
         } : {}),
       },
@@ -294,6 +294,21 @@ export class SettingService {
               },
             },
           },
+          setting_subgroup: {
+            include: {
+              setting_subgroup_locale: {
+                where: {
+                  locale: {
+                    code: locale,
+                  },
+                },
+                select: {
+                  name: true,
+                  description: true,
+                },
+              },
+            },
+          },
           setting_locale: {
             where: {
               locale: {
@@ -334,6 +349,16 @@ export class SettingService {
         'setting_group_locale',
         setting.setting_group,
       );
+
+      if (setting.setting_subgroup) {
+        setting.setting_subgroup = itemTranslations(
+          'setting_subgroup_locale',
+          setting.setting_subgroup,
+        );
+      }
+
+      setting.subgroupId ??= setting.subgroup_id ?? setting.setting_subgroup?.id ?? null;
+
       return setting;
     });