btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

fix: feedback resolved

Browse Source
This commit is contained in:
mirarifhasan
2024-05-27 19:19:27 +06:00
parent ab87a7a16b
commit da2ec5a46d
7 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
.env.example
View File

@@ -39,14 +39,15 @@ MAILER_SMTP_ENABLE="true"
MAILER_USE_ADVANCE_CONFIGS="false" MAILER_USE_ADVANCE_CONFIGS="false"
MAILER_ADDRESS_FROM='"From Name Here" <from@example.com>' MAILER_ADDRESS_FROM='"From Name Here" <from@example.com>'
MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com" # if MAILER_USE_ADVANCE_CONFIGS is true MAILER_SMTP_URL="smtps://user@domain.com:pass@smtp.domain.com" # used if custom mailer configs is false
MAILER_SMTP_HOST="smtp.domain.com" # if MAILER_USE_ADVANCE_CONFIGS is false # The following are used if custom mailer configs is true
MAILER_SMTP_PORT="587" # if MAILER_USE_ADVANCE_CONFIGS is false MAILER_SMTP_HOST="smtp.domain.com"
MAILER_SMTP_SECURE="true" # if MAILER_USE_ADVANCE_CONFIGS is false MAILER_SMTP_PORT="587"
MAILER_SMTP_USER="user@domain.com" # if MAILER_USE_ADVANCE_CONFIGS is false MAILER_SMTP_SECURE="true"
MAILER_SMTP_PASSWORD="pass" # if MAILER_USE_ADVANCE_CONFIGS is false MAILER_SMTP_USER="user@domain.com"
MAILER_TLS_REJECT_UNAUTHORIZED="true" # if MAILER_USE_ADVANCE_CONFIGS is false MAILER_SMTP_PASSWORD="pass"
MAILER_TLS_REJECT_UNAUTHORIZED="true"
# Rate Limit Config # Rate Limit Config
RATE_LIMIT_TTL=60 # In seconds RATE_LIMIT_TTL=60 # In seconds

2
packages/hoppscotch-backend/src/admin/infra.resolver.ts
View File

@@ -372,7 +372,7 @@ export class InfraResolver {
description: 'Enable or Disable SMTP for sending emails', description: 'Enable or Disable SMTP for sending emails',
}) })
@UseGuards(GqlAuthGuard, GqlAdminGuard) @UseGuards(GqlAuthGuard, GqlAdminGuard)
async enableAndDisableSMTP( async toggleSMTP(
@Args({ @Args({
name: 'status', name: 'status',
type: () => ServiceStatus, type: () => ServiceStatus,

4
packages/hoppscotch-backend/src/errors.ts
View File

@@ -695,8 +695,8 @@ export const MAILER_SMTP_PASSWORD_UNDEFINED =
* MAILER_USE_GRANULAR environment variable is not defined * MAILER_USE_GRANULAR environment variable is not defined
* (MailerModule) * (MailerModule)
*/ */
export const MAILER_USE_ADVANCE_CONFIGS_INVALID_VALUE = export const MAILER_USE_CUSTOM_CONFIGS_INVALID_VALUE =
'mailer/use_advance_configs_invalid_value' as const; 'mailer/use_custom_configs_invalid_value' as const;
/** /**
* SharedRequest invalid request JSON format * SharedRequest invalid request JSON format

6
packages/hoppscotch-backend/src/infra-config/helper.ts
View File

@@ -33,7 +33,7 @@ const AuthProviderConfigurations = {
InfraConfigEnum.MICROSOFT_SCOPE, InfraConfigEnum.MICROSOFT_SCOPE,
InfraConfigEnum.MICROSOFT_TENANT, InfraConfigEnum.MICROSOFT_TENANT,
], ],
[AuthProvider.EMAIL]: !!process.env.MAILER_USE_ADVANCE_CONFIGS [AuthProvider.EMAIL]: !!process.env.MAILER_USE_CUSTOM_CONFIGS
? [ ? [
InfraConfigEnum.MAILER_SMTP_HOST, InfraConfigEnum.MAILER_SMTP_HOST,
InfraConfigEnum.MAILER_SMTP_PORT, InfraConfigEnum.MAILER_SMTP_PORT,
@@ -87,8 +87,8 @@ export async function getDefaultInfraConfigs(): Promise<
value: process.env.MAILER_SMTP_ENABLE ?? 'true', value: process.env.MAILER_SMTP_ENABLE ?? 'true',
}, },
{ {
name: InfraConfigEnum.MAILER_USE_ADVANCE_CONFIGS, name: InfraConfigEnum.MAILER_USE_CUSTOM_CONFIGS,
value: process.env.MAILER_USE_ADVANCE_CONFIGS ?? 'false', value: process.env.MAILER_USE_CUSTOM_CONFIGS ?? 'false',
}, },
{ {
name: InfraConfigEnum.MAILER_SMTP_URL, name: InfraConfigEnum.MAILER_SMTP_URL,

2
packages/hoppscotch-backend/src/infra-config/infra-config.service.ts
View File

@@ -422,7 +422,7 @@ export class InfraConfigService implements OnModuleInit {
) )
return E.left(INFRA_CONFIG_INVALID_INPUT); return E.left(INFRA_CONFIG_INVALID_INPUT);
break; break;
case InfraConfigEnum.MAILER_USE_ADVANCE_CONFIGS: case InfraConfigEnum.MAILER_USE_CUSTOM_CONFIGS:
if ( if (
infraConfigs[i].value !== 'true' && infraConfigs[i].value !== 'true' &&
infraConfigs[i].value !== 'false' infraConfigs[i].value !== 'false'

12
packages/hoppscotch-backend/src/mailer/mailer.module.ts
View File

@@ -8,7 +8,7 @@ import {
MAILER_SMTP_PASSWORD_UNDEFINED, MAILER_SMTP_PASSWORD_UNDEFINED,
MAILER_SMTP_URL_UNDEFINED, MAILER_SMTP_URL_UNDEFINED,
MAILER_SMTP_USER_UNDEFINED, MAILER_SMTP_USER_UNDEFINED,
MAILER_USE_ADVANCE_CONFIGS_INVALID_VALUE, MAILER_USE_CUSTOM_CONFIGS_INVALID_VALUE,
} from 'src/errors'; } from 'src/errors';
import { ConfigService } from '@nestjs/config'; import { ConfigService } from '@nestjs/config';
import { loadInfraConfiguration } from 'src/infra-config/helper'; import { loadInfraConfiguration } from 'src/infra-config/helper';
@@ -37,8 +37,8 @@ export class MailerModule {
throwErr(MAILER_SMTP_URL_UNDEFINED); throwErr(MAILER_SMTP_URL_UNDEFINED);
if ( if (
(env.INFRA.MAILER_USE_ADVANCE_CONFIGS ?? (env.INFRA.MAILER_USE_CUSTOM_CONFIGS ??
config.get('MAILER_USE_ADVANCE_CONFIGS')) === 'false' config.get('MAILER_USE_CUSTOM_CONFIGS')) === 'false'
) { ) {
console.log('Using simple mailer configuration'); console.log('Using simple mailer configuration');
@@ -47,8 +47,8 @@ export class MailerModule {
config.get('MAILER_SMTP_URL') ?? config.get('MAILER_SMTP_URL') ??
throwErr(MAILER_SMTP_URL_UNDEFINED); throwErr(MAILER_SMTP_URL_UNDEFINED);
} else if ( } else if (
(env.INFRA.MAILER_USE_ADVANCE_CONFIGS ?? (env.INFRA.MAILER_USE_CUSTOM_CONFIGS ??
config.get('MAILER_USE_ADVANCE_CONFIGS')) === 'true' config.get('MAILER_USE_CUSTOM_CONFIGS')) === 'true'
) { ) {
console.log('Using advance mailer configuration'); console.log('Using advance mailer configuration');
@@ -74,7 +74,7 @@ export class MailerModule {
}, },
}; };
} else { } else {
throwErr(MAILER_USE_ADVANCE_CONFIGS_INVALID_VALUE); throwErr(MAILER_USE_CUSTOM_CONFIGS_INVALID_VALUE);
} }
return { return {

2
packages/hoppscotch-backend/src/types/InfraConfig.ts
View File

@@ -1,6 +1,6 @@
export enum InfraConfigEnum { export enum InfraConfigEnum {
MAILER_SMTP_ENABLE = 'MAILER_SMTP_ENABLE', MAILER_SMTP_ENABLE = 'MAILER_SMTP_ENABLE',
MAILER_USE_ADVANCE_CONFIGS = 'MAILER_USE_ADVANCE_CONFIGS', MAILER_USE_CUSTOM_CONFIGS = 'MAILER_USE_CUSTOM_CONFIGS',
MAILER_SMTP_URL = 'MAILER_SMTP_URL', MAILER_SMTP_URL = 'MAILER_SMTP_URL',
MAILER_ADDRESS_FROM = 'MAILER_ADDRESS_FROM', MAILER_ADDRESS_FROM = 'MAILER_ADDRESS_FROM',