From a77e2eb3ada5c646a4e18eff5ea25e9872dfb28f Mon Sep 17 00:00:00 2001 From: Nicolai Ort Date: Fri, 15 Jan 2021 19:18:23 +0100 Subject: [PATCH] Fixed country code type issue https://ci.odit.services/lfk/backend/252/1/2 ref #102 --- src/config.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/config.ts b/src/config.ts index 2e01f0e..580c90d 100644 --- a/src/config.ts +++ b/src/config.ts @@ -1,4 +1,5 @@ import { config as configDotenv } from 'dotenv'; +import { CountryCode } from 'libphonenumber-js'; import ValidatorJS from 'validator'; configDotenv(); @@ -6,7 +7,7 @@ export const config = { internal_port: parseInt(process.env.APP_PORT) || 4010, development: process.env.NODE_ENV === "production", jwt_secret: process.env.JWT_SECRET || "secretjwtsecret", - phone_validation_countrycode: process.env.PHONE_COUNTRYCODE || "ZZ", + phone_validation_countrycode: getPhoneCodeLocale(), postalcode_validation_countrycode: getPostalCodeLocale(), version: process.env.VERSION || require('../package.json').version } @@ -14,15 +15,12 @@ let errors = 0 if (typeof config.internal_port !== "number") { errors++ } -if (typeof config.phone_validation_countrycode !== "string") { - errors++ -} -if (config.phone_validation_countrycode.length !== 2) { - errors++ -} if (typeof config.development !== "boolean") { errors++ } +function getPhoneCodeLocale(): CountryCode { + return (process.env.PHONE_COUNTRYCODE as CountryCode); +} function getPostalCodeLocale(): any { try { const stringArray: String[] = ValidatorJS.isPostalCodeLocales;