🎨 Centralize error throwing for encryption keys and credentials (#3105)

* Centralized error throwing for encryption key

* Unifying the error message used by cli and core packages

* Improvements to error messages to make it more DRY

* Removed unnecessary throw

* Throwing error when credential does not exist to simplify node behavior (#3112)

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
This commit is contained in:
Omar Ajoue
2022-04-15 08:00:47 +02:00
committed by GitHub
parent 17b0cd8f76
commit d3fecb9f6d
227 changed files with 348 additions and 848 deletions

View File

@@ -34,8 +34,8 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions
let returnData;
if (authenticationMethod === 'credentials') {
const credentials = await this.getCredentials('mauticApi') as IDataObject;
const baseUrl = credentials!.url as string;
const credentials = await this.getCredentials('mauticApi');
const baseUrl = credentials.url as string;
const base64Key = Buffer.from(`${credentials.username}:${credentials.password}`).toString('base64');
@@ -46,8 +46,8 @@ export async function mauticApiRequest(this: IHookFunctions | IExecuteFunctions
//@ts-ignore
returnData = await this.helpers.request(options);
} else {
const credentials = await this.getCredentials('mauticOAuth2Api') as IDataObject;
const baseUrl = credentials!.url as string;
const credentials = await this.getCredentials('mauticOAuth2Api');
const baseUrl = credentials.url as string;
options.uri = `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${options.uri}`;
//@ts-ignore