Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugs/zendesk: authentication fix #770

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −45
Open

bugs/zendesk: authentication fix #770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions extensions/zendesk/src/connections/zendeskConnection.ts
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ export const zendeskConnection: IConnectionSchema = {
type: "zendesk",
label: "Zendesk User",
fields: [
{ fieldName: "username" },
{ fieldName: "password" },
{ fieldName: "email" },
{ fieldName: "apiToken" },
{ fieldName: "subdomain"}
]
};
13 changes: 5 additions & 8 deletions extensions/zendesk/src/nodes/helpCenter/getCategories.ts
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import axios from "axios";
export interface IGetCategoriesParams extends INodeFunctionBaseParams {
config: {
connection: {
username: string;
password: string;
email: string;
apiToken: string;
subdomain: string;
};
storeLocation: string;
@@ -117,7 +117,7 @@ export const getCategoriesNode = createNodeDescriptor({
function: async ({ cognigy, config }: IGetCategoriesParams) => {
const { api } = cognigy;
const { connection, storeLocation, contextKey, inputKey } = config;
const { username, password, subdomain } = connection;
const { email, apiToken, subdomain } = connection;

try {

@@ -126,11 +126,8 @@ export const getCategoriesNode = createNodeDescriptor({
url: `https://${subdomain}.zendesk.com/api/v2/help_center/categories`,
headers: {
"Accept": "application/json",
"Content-Type": "application/json"
},
auth: {
username,
password
"Content-Type": "application/json",
"Authorization": `Basic ${btoa(email + "/token:" + apiToken)}`
}
});

15 changes: 6 additions & 9 deletions extensions/zendesk/src/nodes/helpCenter/searchArticles.ts
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import axios, { AxiosRequestConfig, AxiosResponse } from "axios";
export interface ISearchArticlesParams extends INodeFunctionBaseParams {
config: {
connection: {
username: string;
password: string;
email: string;
apiToken: string;
subdomain: string;
};
query: number;
@@ -284,7 +284,7 @@ export const searchArticlesNode = createNodeDescriptor({
function: async ({ cognigy, config, childConfigs }: ISearchArticlesParams) => {
const { api } = cognigy;
const { query, connection, storeLocation, useBrandId, brandId, useLocale, locale, useFreeTextQuery, freeTextQuery, contextKey, inputKey } = config;
const { username, password, subdomain } = connection;
const { email, apiToken, subdomain } = connection;

let endpoint = `https://${subdomain}.zendesk.com/api/v2/help_center/articles/search`;
let searchParameters;
@@ -309,18 +309,15 @@ export const searchArticlesNode = createNodeDescriptor({
query: query
};
} else if (useFreeTextQuery === true) {
endpoint = `https://${subdomain}.zendesk.com/api/v2/help_center/articles/search?${freeTextQuery}`;
endpoint = `https://${subdomain}.zendesk.com/api/v2/help_center/articles/search?${freeTextQuery}`;
}

const axiosConfig: AxiosRequestConfig = {
params: searchParameters,
headers: {
"Accept": "application/json",
"Content-Type": "application/json"
},
auth: {
username,
password
"Content-Type": "application/json",
"Authorization": `Basic ${btoa(email + "/token:" + apiToken)}`
}
};

15 changes: 6 additions & 9 deletions extensions/zendesk/src/nodes/support/createTicket.ts
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import axios from "axios";
export interface ICreateTicketParams extends INodeFunctionBaseParams {
config: {
connection: {
username: string;
password: string;
email: string;
apiToken: string;
subdomain: string;
};
subject: string;
@@ -379,7 +379,7 @@ export const createTicketNode = createNodeDescriptor({
function: async ({ cognigy, config }: ICreateTicketParams) => {
const { api } = cognigy;
const { connection, description, priority, subject, specifyRequester, requesterName, requesterEmail, requesterLocaleId, specifyBrand, brandId, useCustomFields, customFields, addTags, tags, storeLocation, contextKey, inputKey } = config;
const { username, password, subdomain } = connection;
const { email, apiToken, subdomain } = connection;

let data = {
ticket: {
@@ -414,13 +414,10 @@ export const createTicketNode = createNodeDescriptor({
url: `https://${subdomain}.zendesk.com/api/v2/tickets`,
headers: {
"Accept": "application/json",
"Content-Type": "application/json"
"Content-Type": "application/json",
"Authorization": `Basic ${btoa(email + "/token:" + apiToken)}`
},
data: data,
auth: {
username,
password
}
data: data
});

if (storeLocation === "context") {
13 changes: 5 additions & 8 deletions extensions/zendesk/src/nodes/support/getTicket.ts
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import axios from "axios";
export interface IGetTicketParams extends INodeFunctionBaseParams {
config: {
connection: {
username: string;
password: string;
email: string;
apiToken: string;
subdomain: string;
};
ticketId: number;
@@ -138,7 +138,7 @@ export const getTicketNode = createNodeDescriptor({
function: async ({ cognigy, config, childConfigs }: IGetTicketParams) => {
const { api } = cognigy;
const { ticketId, connection, storeLocation, contextKey, inputKey } = config;
const { username, password, subdomain } = connection;
const { email, apiToken, subdomain } = connection;

try {

@@ -147,11 +147,8 @@ export const getTicketNode = createNodeDescriptor({
url: `https://${subdomain}.zendesk.com/api/v2/tickets/${ticketId}`,
headers: {
"Accept": "application/json",
"Content-Type": "application/json"
},
auth: {
username,
password
"Content-Type": "application/json",
"Authorization": `Basic ${btoa(email + "/token:" + apiToken)}`
}
});

15 changes: 6 additions & 9 deletions extensions/zendesk/src/nodes/support/updateTicket.ts
View file
Original file line number Diff line number Diff line change
@@ -4,8 +4,8 @@ import axios from "axios";
export interface IUpdateTicketParams extends INodeFunctionBaseParams {
config: {
connection: {
username: string;
password: string;
email: string;
apiToken: string;
subdomain: string;
};
ticketId: number;
@@ -161,7 +161,7 @@ export const updateTicketNode = createNodeDescriptor({
function: async ({ cognigy, config }: IUpdateTicketParams) => {
const { api } = cognigy;
const { ticketId, ticket, connection, storeLocation, contextKey, inputKey } = config;
const { username, password, subdomain } = connection;
const { email, apiToken, subdomain } = connection;

try {

@@ -170,13 +170,10 @@ export const updateTicketNode = createNodeDescriptor({
url: `https://${subdomain}.zendesk.com/api/v2/tickets/${ticketId}`,
headers: {
"Accept": "application/json",
"Content-Type": "application/json"
"Content-Type": "application/json",
"Authorization": `Basic ${btoa(email + "/token:" + apiToken)}`
},
data: ticket,
auth: {
username,
password
}
data: ticket
});

if (storeLocation === "context") {