@hed-hog/core 0.0.7 → 0.0.10

package/src/file/file.service.ts

@@ -5,8 +5,7 @@ import {
   forwardRef,
   Inject,
   Injectable,
-  NotFoundException,
-  OnModuleInit,
+  NotFoundException
 } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { SettingService } from '../setting/setting.service';
@@ -16,10 +15,9 @@ import { EnumProvider } from './provider/provider.enum';
 import { ProviderFactory } from './provider/provider.factory';
 
 @Injectable()
-export class FileService implements OnModuleInit {
+export class FileService {
   private providerId: number;
   private mimetypes: Record<string, number> = {};
-  private setting: Record<string, string>;
 
   constructor(
     @Inject(forwardRef(() => PrismaService))
@@ -32,12 +30,8 @@ export class FileService implements OnModuleInit {
     private readonly jwtService: JwtService,
   ) { }
 
-  async onModuleInit() {
-    await this.getProvider();
-  }
-
   async getProvider(): Promise<AbstractProvider> {
-    this.setting = await this.settingService.getSettingValues([
+    const settings = await this.settingService.getSettingValues([
       'storage',
       'storage-local-path',
       'storage-s3-key',
@@ -52,16 +46,16 @@ export class FileService implements OnModuleInit {
       'storage-gcs-keyfile',
     ]);
 
-    if (!this.setting['storage']) {
+    if (!settings['storage']) {
       throw new BadRequestException(
         `You must set the storage provider in the setting.`,
       );
     }
 
-    const providerName = this.setting['storage'];
+    const providerName = settings['storage'];
     const provider = ProviderFactory.create(
       providerName as EnumProvider,
-      this.setting,
+      settings  ,
     );
 
     const providerData = await this.prismaService.file_provider.findFirst({
@@ -114,10 +108,24 @@ export class FileService implements OnModuleInit {
       throw new BadRequestException(`No mimetype provided`);
     }
 
-    if (!this.setting || !this.setting['storage-accept-mimetype']) {
-      await this.getProvider();
-    }
-    const acceptMimetypes = this.setting['storage-accept-mimetype'];
+    await this.getProvider();
+
+    const settings = await this.settingService.getSettingValues([
+      'storage',
+      'storage-local-path',
+      'storage-s3-key',
+      'storage-s3-secret',
+      'storage-s3-region',
+      'storage-s3-bucket',
+      'storage-max-size',
+      'storage-accept-mimetype',
+      'storage-abs-account',
+      'storage-abs-key',
+      'storage-abs-container',
+      'storage-gcs-keyfile',
+    ]);
+
+    const acceptMimetypes = settings['storage-accept-mimetype'];
     return acceptMimetypes.indexOf(mimetype) !== -1;
   }
 
@@ -127,11 +135,24 @@ export class FileService implements OnModuleInit {
       throw new BadRequestException(`No size provided`);
     }
 
-    if (!this.setting || !this.setting['storage-max-size']) {
       await this.getProvider();
-    }
+    
+      const settings = await this.settingService.getSettingValues([
+      'storage',
+      'storage-local-path',
+      'storage-s3-key',
+      'storage-s3-secret',
+      'storage-s3-region',
+      'storage-s3-bucket',
+      'storage-max-size',
+      'storage-accept-mimetype',
+      'storage-abs-account',
+      'storage-abs-key',
+      'storage-abs-container',
+      'storage-gcs-keyfile',
+    ]);
 
-    const maxSize = this.setting['storage-max-size'];
+    const maxSize = settings['storage-max-size'];
 
     return size <= Number(maxSize);
   }
@@ -183,7 +204,11 @@ export class FileService implements OnModuleInit {
   }
 
   async getStorage() {
-    return this.setting['storage'];
+    const settings = await this.settingService.getSettingValues([
+      'storage',
+    ]);
+
+    return settings['storage']; 
   }
 
   async getBuffer(fileId: number) {

package/src/mail/mail.service.ts

@@ -8,7 +8,6 @@ import {
   Inject,
   Injectable,
   Logger,
-  OnModuleInit,
   forwardRef,
 } from '@nestjs/common';
 import * as Handlebars from 'handlebars';
@@ -20,9 +19,8 @@ import { TestMailDTO } from './dto/test-mail.dto';
 import { UpdateDTO } from './dto/update.dto';
 
 @Injectable()
-export class MailService implements OnModuleInit {
+export class MailService {
   private readonly logger = new Logger(MailService.name);
-  public settings: Record<string, any> = {};
   private readonly modelName = 'mail';
 
   constructor(
@@ -38,12 +36,6 @@ export class MailService implements OnModuleInit {
     private readonly setting: SettingService,
   ) { }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
-      'configured-mail',
-    ]);
-  }
-
   async list(locale: string, paginationParams: PaginationDTO) {
     const result = await this.localeService.listModelWithLocale(
       locale,
@@ -256,7 +248,13 @@ export class MailService implements OnModuleInit {
     { email, slug, variables }: SendTemplatedMailDTO,
   ) {
 
-    if (!this.settings['configured-mail']) {
+    const settings = await this.setting.getSettingValues([
+      'configured-mail',
+    ]);
+
+    console.log({settings});
+
+    if (!settings['configured-mail']) {
       this.logger.warn('Mail service is not configured. Aborting sending email.');
       return;
     }
@@ -288,7 +286,6 @@ export class MailService implements OnModuleInit {
     } catch (error) {
       this.logger.error('Error sending templated mail:', error);
       await this.setting.setValue('configured-mail', 'false');
-      this.onModuleInit();
     }
   }
 
@@ -346,7 +343,14 @@ export class MailService implements OnModuleInit {
     body,
     variables,
   }: TestMailDTO) {
-    if (!this.settings['configured-mail']) {
+
+    const settings = await this.setting.getSettingValues([
+      'configured-mail',
+    ]);
+
+    console.log({settings});
+
+    if (!settings['configured-mail']) {
       throw new BadRequestException('Mail service is not configured.');
     }
 

package/src/oauth/interfaces/OAuthProvider.ts

@@ -1,5 +1,5 @@
 export interface OAuthProvider {
-  getAuthUrl(callbackPath: string): string;
+  getAuthUrl(callbackPath: string): Promise<string>;
   getProfile(code: string, type?: string): Promise<any>;
   getProviderType(): string;
 }

package/src/oauth/oauth.service.ts

@@ -5,8 +5,7 @@ import {
   forwardRef,
   Inject,
   Injectable,
-  NotFoundException,
-  OnModuleInit,
+  NotFoundException
 } from '@nestjs/common';
 import { AuthService } from '../auth/auth.service';
 import { FileService } from '../file/file.service';
@@ -34,9 +33,8 @@ type HandleCallbackProps = {
 };
 
 @Injectable()
-export class OAuthService implements OnModuleInit {
+export class OAuthService {
   private providers: Map<string, OAuthProvider> = new Map();
-  public settings: Record<string, any> = {};
 
   constructor(
     google: GoogleProvider,
@@ -60,16 +58,6 @@ export class OAuthService implements OnModuleInit {
     this.providers.set(github.getProviderType(), github);
   }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
-      'oauth-mfa',
-      'google_scopes',
-      'facebook_scopes',
-      'github_scopes',
-      'microsoft_scopes',
-    ]);
-  }
-
   getAuthUrl(provider: user_account_provider_enum, callbackPath: string) {
     return this.getProvider(provider).getAuthUrl(callbackPath);
   }
@@ -110,9 +98,18 @@ export class OAuthService implements OnModuleInit {
     return prov;
   }
 
-  private getProviderScopes(provider: user_account_provider_enum): string {
+  private async getProviderScopes(provider: user_account_provider_enum) {
     const settingKey = `${provider.toLowerCase()}_scopes`;
-    return this.settings[settingKey].join(',') || '';
+
+    const settings = await this.setting.getSettingValues([
+      'oauth-mfa',
+      'google_scopes',
+      'facebook_scopes',
+      'github_scopes',
+      'microsoft_scopes',
+    ]);
+
+    return settings[settingKey].join(',') || '';
   }
 
   private async handleLogin(res: Response, locale: string, ipAddress: string, userAgent: string, provider: user_account_provider_enum, profile: any) {
@@ -143,7 +140,7 @@ export class OAuthService implements OnModuleInit {
     } else {
       if (profile.oauth_tokens?.refresh_token) {
         const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token);
-        const scopes = this.getProviderScopes(provider);
+        const scopes = await this.getProviderScopes(provider);
         await this.prisma.user_account.update({
           where: { id: userAccount.id },
           data: {
@@ -183,7 +180,7 @@ export class OAuthService implements OnModuleInit {
     }
 
     const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token) 
-    const scopes = this.getProviderScopes(provider);
+    const scopes = await this.getProviderScopes(provider);
     const user = await this.prisma.user.create({
       data: {
         name: profile.name,
@@ -261,7 +258,7 @@ export class OAuthService implements OnModuleInit {
     }
 
     const encryptedRefreshToken = this.security.encrypt(profile.oauth_tokens.refresh_token) 
-    const scopes = this.getProviderScopes(provider);
+    const scopes = await this.getProviderScopes(provider);
     await this.prisma.user_account.create({
       data: {
         user_id: userId,

package/src/oauth/providers/abstract.provider.ts

@@ -5,7 +5,7 @@ import { OAuthProvider } from '../interfaces/OAuthProvider';
 export abstract class BaseOAuthProvider implements OAuthProvider {
   constructor(protected readonly http: HttpService) {}
 
-  abstract getAuthUrl(callbackPath: string): string;
+  abstract getAuthUrl(callbackPath: string): Promise<string>;
   abstract getProfile(code: string, type?: string): Promise<any>;
   abstract getProviderType(): string;
 

package/src/oauth/providers/facebook.provider.ts

@@ -1,13 +1,11 @@
 import { HttpService } from '@nestjs/axios';
-import { forwardRef, Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { SettingService } from '../../setting/setting.service';
 import { BaseOAuthProvider } from './abstract.provider';
 
 @Injectable()
 export class FacebookProvider
-  extends BaseOAuthProvider
-  implements OnModuleInit {
-  public settings: Record<string, any> = {};
+  extends BaseOAuthProvider {
 
   constructor(
     http: HttpService,
@@ -17,27 +15,25 @@ export class FacebookProvider
     super(http);
   }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
+  getProviderType() {
+    return 'FACEBOOK';
+  }
+
+  async getAuthUrl(callbackPath: string) {
+    const settings = await this.setting.getSettingValues([
       'facebook_client_id',
       'facebook_client_secret',
       'facebook_scopes',
       'url',
     ]);
-  }
-
-  getProviderType() {
-    return 'FACEBOOK';
-  }
 
-  getAuthUrl(callbackPath: string): string {
-    const redirectURI = new URL(callbackPath, this.settings['url']).toString();
+    const redirectURI = new URL(callbackPath, settings['url']).toString();
 
     const params = new URLSearchParams({
-      client_id: this.settings['facebook_client_id'],
+      client_id: settings['facebook_client_id'],
       redirect_uri: redirectURI,
       response_type: 'code',
-      scope: (this.settings['facebook_scopes'] ?? ['email']).join(','),
+      scope: (settings['facebook_scopes'] ?? ['email']).join(','),
       auth_type: 'rerequest',
     });
 
@@ -45,12 +41,20 @@ export class FacebookProvider
   }
 
   async getProfile(code: string, type: string): Promise<any> {
+
+    const settings = await this.setting.getSettingValues([
+      'facebook_client_id',
+      'facebook_client_secret',
+      'facebook_scopes',
+      'url',
+    ]);
+
     const token = await this.fetchToken({
       code,
       url: 'https://graph.facebook.com/v17.0/oauth/access_token',
-      clientId: this.settings['facebook_client_id'],
-      clientSecret: this.settings['facebook_client_secret'],
-      redirectUri: `${this.settings['url']}/oauth/facebook/callback/${type}`,
+      clientId: settings['facebook_client_id'],
+      clientSecret: settings['facebook_client_secret'],
+      redirectUri: `${settings['url']}/oauth/facebook/callback/${type}`,
     });
     const profile = await this.fetchProfile(
       token.access_token,

package/src/oauth/providers/github.provider.ts

@@ -1,13 +1,11 @@
 import { HttpService } from '@nestjs/axios';
-import { forwardRef, Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { SettingService } from '../../setting/setting.service';
 import { BaseOAuthProvider } from './abstract.provider';
 
 @Injectable()
 export class GithubProvider
-  extends BaseOAuthProvider
-  implements OnModuleInit {
-  public settings: Record<string, any> = {};
+  extends BaseOAuthProvider {
 
   constructor(
     http: HttpService,
@@ -17,26 +15,25 @@ export class GithubProvider
     super(http);
   }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
+  getProviderType() {
+    return 'GITHUB';
+  }
+
+  async getAuthUrl(callbackPath: string) {
+
+    const settings = await this.setting.getSettingValues([
       'github_client_id',
       'github_client_secret',
       'github_scopes',
       'api-url',
     ]);
-  }
-
-  getProviderType() {
-    return 'GITHUB';
-  }
 
-  getAuthUrl(callbackPath: string): string {
     const fixedCallbackPath = '/oauth/github/callback';
-    const redirectURI = new URL(fixedCallbackPath, this.settings['api-url']).toString();
-    const scopes = this.settings['github_scopes'];
+    const redirectURI = new URL(fixedCallbackPath, settings['api-url']).toString();
+    const scopes = settings['github_scopes'];
     const type = callbackPath.split('/').pop() || 'login';
     const params = new URLSearchParams({
-      client_id: this.settings['github_client_id'],
+      client_id: settings['github_client_id'],
       redirect_uri: redirectURI,
       scope: scopes.join(' '),
       allow_signup: 'true',
@@ -47,13 +44,20 @@ export class GithubProvider
   }
 
   async getProfile(code: string) {
+    const settings = await this.setting.getSettingValues([
+      'github_client_id',
+      'github_client_secret',
+      'github_scopes',
+      'api-url',
+    ]);
+
     const fixedCallbackPath = '/oauth/github/callback';
-    const redirectURI = new URL(fixedCallbackPath, this.settings['api-url'].replace(":3200", ":3100")).toString();
+    const redirectURI = new URL(fixedCallbackPath, settings['api-url'].replace(":3200", ":3100")).toString();
     const tokenResponse = await this.http.axiosRef.post(
       'https://github.com/login/oauth/access_token',
       {
-        client_id: this.settings['github_client_id'],
-        client_secret: this.settings['github_client_secret'],
+        client_id: settings['github_client_id'],
+        client_secret: settings['github_client_secret'],
         code,
         redirect_uri: redirectURI,
       },

package/src/oauth/providers/google.provider.ts

@@ -1,11 +1,10 @@
 import { HttpService } from '@nestjs/axios';
-import { forwardRef, Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { SettingService } from '../../setting/setting.service';
 import { BaseOAuthProvider } from './abstract.provider';
 
 @Injectable()
-export class GoogleProvider extends BaseOAuthProvider implements OnModuleInit {
-  public settings: Record<string, any> = {};
+export class GoogleProvider extends BaseOAuthProvider {
 
   constructor(
     http: HttpService,
@@ -15,27 +14,26 @@ export class GoogleProvider extends BaseOAuthProvider implements OnModuleInit {
     super(http);
   }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
+  getProviderType() {
+    return 'GOOGLE';
+  }
+
+  async getAuthUrl(callbackPath: string) {
+
+    const settings = await this.setting.getSettingValues([
       'google_client_id',
       'google_client_secret',
       'google_scopes',
       'url',
     ]);
-  }
 
-  getProviderType() {
-    return 'GOOGLE';
-  }
-
-  getAuthUrl(callbackPath: string): string {
-    const redirectURI = new URL(callbackPath, this.settings['url']).toString();
+    const redirectURI = new URL(callbackPath, settings['url']).toString();
 
     const params = new URLSearchParams({
-      client_id: this.settings['google_client_id'],
+      client_id: settings['google_client_id'],
       redirect_uri: redirectURI,
       response_type: 'code',
-      scope: (this.settings['google_scopes'] ?? []).join(' '),
+      scope: (settings['google_scopes'] ?? []).join(' '),
       access_type: 'offline',
       prompt: 'consent',
     });
@@ -44,12 +42,20 @@ export class GoogleProvider extends BaseOAuthProvider implements OnModuleInit {
   }
 
   async getProfile(code: string, type: string) {
+
+    const settings = await this.setting.getSettingValues([
+      'google_client_id',
+      'google_client_secret',
+      'google_scopes',
+      'url',
+    ]);
+
     const token = await this.fetchToken({
       code,
       url: 'https://oauth2.googleapis.com/token',
-      clientId: this.settings['google_client_id'],
-      clientSecret: this.settings['google_client_secret'],
-      redirectUri: `${this.settings['url']}/callback/google/${type}`,
+      clientId: settings['google_client_id'],
+      clientSecret: settings['google_client_secret'],
+      redirectUri: `${settings['url']}/callback/google/${type}`,
     });
 
     const basicProfile = await this.fetchProfile(

package/src/oauth/providers/microsoft.provider.ts

@@ -1,13 +1,11 @@
 import { HttpService } from '@nestjs/axios';
-import { forwardRef, Inject, Injectable, OnModuleInit } from '@nestjs/common';
+import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { SettingService } from '../../setting/setting.service';
 import { BaseOAuthProvider } from './abstract.provider';
 
 @Injectable()
 export class MicrosoftProvider
-  extends BaseOAuthProvider
-  implements OnModuleInit {
-  public settings: Record<string, any> = {};
+  extends BaseOAuthProvider  {
 
   constructor(
     http: HttpService,
@@ -17,24 +15,23 @@ export class MicrosoftProvider
     super(http);
   }
 
-  async onModuleInit() {
-    this.settings = await this.setting.getSettingValues([
+  getProviderType() {
+    return 'MICROSOFT';
+  }
+
+  async getAuthUrl(callbackPath: string) {
+
+    const settings = await this.setting.getSettingValues([
       'microsoft_client_id',
       'microsoft_client_secret',
       'microsoft_scopes',
       'url',
     ]);
-  }
 
-  getProviderType() {
-    return 'MICROSOFT';
-  }
-
-  getAuthUrl(callbackPath: string): string {
-    const redirectURI = new URL(callbackPath, this.settings['url']).toString();
-    const scopes = this.settings['microsoft_scopes']
+    const redirectURI = new URL(callbackPath, settings['url']).toString();
+    const scopes = settings['microsoft_scopes']
     const params = new URLSearchParams({
-      client_id: this.settings['microsoft_client_id'],
+      client_id: settings['microsoft_client_id'],
       redirect_uri: redirectURI,
       response_type: 'code',
       scope: scopes.join(' '),
@@ -46,12 +43,20 @@ export class MicrosoftProvider
   }
 
   async getProfile(code: string, type: string): Promise<any> {
+
+    const settings = await this.setting.getSettingValues([
+      'microsoft_client_id',
+      'microsoft_client_secret',
+      'microsoft_scopes',
+      'url',
+    ]);
+
     const token = await this.fetchToken({
       code,
       url: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
-      clientId: this.settings['microsoft_client_id'],
-      clientSecret: this.settings['microsoft_client_secret'],
-      redirectUri: `${this.settings['url']}/callback/microsoft/${type}`,
+      clientId: settings['microsoft_client_id'],
+      clientSecret: settings['microsoft_client_secret'],
+      redirectUri: `${settings['url']}/callback/microsoft/${type}`,
     });
 
     const profile = await this.fetchProfile(