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

Jump to bottom

✅ Testing zendesk realtime webhook #497

Merged
merged 5 commits into from
Jun 15, 2024
Merged

✅ Testing zendesk realtime webhook #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f69c793
:white_check_mark: Testing zendesk realtime webhook
naelob Jun 12, 2024
a77bc47
Merge branch 'main' into feat/test-zendesk-realtime-webhook
naelob Jun 14, 2024
16036ef
:sparkles: Tested webhook
naelob Jun 15, 2024
196e08e
:bug: Fix connector script
naelob Jun 15, 2024
403977a
Merge branch 'main' into feat/test-zendesk-realtime-webhook
naelob Jun 15, 2024
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
3 changes: 2 additions & 1 deletion .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ POSTGRES_USER=my_user
POSTGRES_DB=panora_db
POSTGRES_HOST=postgres
POSTGRES_PASSWORD=my_password

# Endpoint on which realtime webhooks are sent to
WEBHOOK_INGRESS=http://localhost:3000

# Each Provider is of form PROVIDER_VERTICAL_SOFTWAREMODE_ATTRIBUTE
# ================================================
Expand Down
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ redis_data
.pnpm-store/
.npmrc
.vscode
ngrok.yml
79 changes: 59 additions & 20 deletions apps/client-ts/src/components/Configuration/Connector/ConnectorDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "
import { PasswordInput } from "@/components/ui/password-input"
import { z } from "zod"
import config from "@/lib/config"
import { AuthStrategy, providerToType, Provider, extractProvider, extractVertical } from "@panora/shared"
import { AuthStrategy, providerToType, Provider, extractProvider, extractVertical, needsSubdomain } from "@panora/shared"
import { useEffect, useState } from "react"
import useProjectStore from "@/state/projectStore"
import { usePostHog } from 'posthog-js/react'
Expand All @@ -26,24 +26,27 @@ interface ItemDisplayProps {
}

const formSchema = z.object({
subdomain: z.string({
required_error: "Please Enter a Subdomain",
}).optional(),
client_id : z.string({
required_error: "Please Enter a Client ID",
}),
}).optional(),
client_secret : z.string({
required_error: "Please Enter a Client Secret",
}),
}).optional(),
scope : z.string({
required_error: "Please Enter a scope",
}),
}).optional(),
api_key: z.string({
required_error: "Please Enter a API Key",
}),
}).optional(),
username: z.string({
required_error: "Please Enter Username",
}),
}).optional(),
secret: z.string({
required_error: "Please Enter Secret",
}),
}).optional(),
})

export function ConnectorDisplay({ item }: ItemDisplayProps) {
Expand All @@ -62,6 +65,7 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
defaultValues: {
subdomain: "",
client_id: "",
client_secret: "",
scope: "",
Expand All @@ -88,10 +92,11 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
};

function onSubmit(values: z.infer<typeof formSchema>) {
const { client_id, client_secret, scope, api_key, secret, username } = values;
const { client_id, client_secret, scope, api_key, secret, username, subdomain } = values;
const performUpdate = mappingConnectionStrategies && mappingConnectionStrategies.length > 0;
switch (item?.authStrategy) {
case AuthStrategy.oauth2:
const needs_subdomain = needsSubdomain(item.name.toLowerCase(), item.vertical!.toLowerCase());
if (client_id === "" || client_secret === "" || scope === "") {
if (client_id === "") {
form.setError("client_id", { "message": "Please Enter Client ID" });
Expand All @@ -104,15 +109,27 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
}
break;
}
if(needs_subdomain && subdomain == ""){
form.setError("subdomain", { "message": "Please Enter Subdomain" });
}
let ATTRIBUTES = [];
let VALUES = [];
if(needs_subdomain){
ATTRIBUTES = ["subdomain", "client_id", "client_secret", "scope"],
VALUES = [subdomain!, client_id!, client_secret!, scope!]
}else{
ATTRIBUTES = ["client_id", "client_secret", "scope"],
VALUES = [client_id!, client_secret!, scope!]
}
if (performUpdate) {
const dataToUpdate = mappingConnectionStrategies[0];
toast.promise(
updateCsPromise({
id_cs: dataToUpdate.id_connection_strategy,
updateToggle: false,
status: dataToUpdate.status,
attributes: ["client_id", "client_secret", "scope"],
values: [client_id, client_secret, scope]
attributes: ATTRIBUTES,
values: VALUES
}),
{
loading: 'Loading...',
Expand Down Expand Up @@ -140,8 +157,8 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
toast.promise(
createCsPromise({
type: providerToType(item?.name, item?.vertical!, AuthStrategy.oauth2),
attributes: ["client_id", "client_secret", "scope"],
values: [client_id, client_secret, scope]
attributes: ATTRIBUTES,
values: VALUES
}),
{
loading: 'Loading...',
Expand Down Expand Up @@ -183,7 +200,7 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
updateToggle: false,
status: dataToUpdate.status,
attributes: ["api_key"],
values: [api_key]
values: [api_key!]
}),
{
loading: 'Loading...',
Expand Down Expand Up @@ -212,7 +229,7 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
createCsPromise({
type: providerToType(item?.name, item?.vertical!, AuthStrategy.api_key),
attributes: ["api_key"],
values: [api_key]
values: [api_key!]
}),
{
loading: 'Loading...',
Expand Down Expand Up @@ -259,7 +276,7 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
updateToggle: false,
status: dataToUpdate.status,
attributes: ["username", "secret"],
values: [username, secret]
values: [username!, secret!]
}),
{
loading: 'Loading...',
Expand Down Expand Up @@ -289,7 +306,7 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
createCsPromise({
type: providerToType(item?.name, item?.vertical!, AuthStrategy.basic),
attributes: ["username", "secret"],
values: [username, secret]
values: [username!, secret!]
}),
{
loading: 'Loading...',
Expand Down Expand Up @@ -324,14 +341,19 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
if (mappingConnectionStrategies && mappingConnectionStrategies.length > 0) {
fetchCredentials({
type: mappingConnectionStrategies[0].type,
attributes: item?.authStrategy === AuthStrategy.oauth2 ? ["client_id", "client_secret", "scope"]
attributes: item?.authStrategy === AuthStrategy.oauth2 ? needsSubdomain(item.name.toLowerCase(), item.vertical!.toLowerCase()) ? ["subdomain", "client_id", "client_secret", "scope"] : ["client_id", "client_secret", "scope"]
: item?.authStrategy === AuthStrategy.api_key ? ["api_key"] : ["username", "secret"]
}, {
onSuccess(data) {
if (item?.authStrategy === AuthStrategy.oauth2) {
form.setValue("client_id", data[0]);
form.setValue("client_secret", data[1]);
form.setValue("scope", data[2]);
let i = 0;
if(needsSubdomain(item.name.toLowerCase(), item.vertical!.toLowerCase())){
form.setValue("subdomain", data[i]);
i = 1;
}
form.setValue("client_id", data[i]);
form.setValue("client_secret", data[i + 1]);
form.setValue("scope", data[i + 2]);
}
if (item?.authStrategy === AuthStrategy.api_key) {
form.setValue("api_key", data[0]);
Expand Down Expand Up @@ -415,6 +437,23 @@ export function ConnectorDisplay({ item }: ItemDisplayProps) {
<form onSubmit={form.handleSubmit(onSubmit)}>
{ item.authStrategy == AuthStrategy.oauth2 &&
<>
{ needsSubdomain(item.name.toLowerCase(), item.vertical!.toLowerCase()) &&
<div className="flex flex-col">
<FormField
name="subdomain"
control={form.control}
render={({field}) => (
<FormItem>
<FormLabel className="flex flex-col">Subdomain</FormLabel>
<FormControl>
<PasswordInput {...field} placeholder="Enter Subdomain (such as https://my-zendesk.com)" />
</FormControl>
<FormMessage/>
</FormItem>
)}
/>
</div>
}
<div className="flex flex-col">
<FormField
name="client_id"
Expand Down
33 changes: 17 additions & 16 deletions docker-compose.dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ services:
environment:
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?ssl=false
DISTRIBUTION: ${DISTRIBUTION}
WEBHOOK_INGRESS: ${WEBHOOK_INGRESS}
JWT_SECRET: ${JWT_SECRET}
REDIS_HOST: ${REDIS_HOST}
REDIS_PASS: ${REDIS_PASS}
Expand Down Expand Up @@ -188,22 +189,22 @@ services:
volumes:
- .:/app

#ngrok:
#image: ngrok/ngrok:latest
#restart: always
#command:
# - "start"
# - "--all"
# - "--config"
# - "/etc/ngrok.yml"
#volumes:
# - ./ngrok.yml:/etc/ngrok.yml
#ports:
# - 4040:4040
#depends_on:
# api:
# condition: service_healthy
#network_mode: "host"
ngrok:
image: ngrok/ngrok:latest
restart: always
command:
- "start"
- "--all"
- "--config"
- "/etc/ngrok.yml"
volumes:
- ./ngrok.yml:/etc/ngrok.yml
ports:
- 4040:4040
depends_on:
api:
condition: service_healthy
network_mode: "host"

docs:
build:
Expand Down
1 change: 1 addition & 0 deletions docker-compose.source.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ services:
DOPPLER_TOKEN: ${DOPPLER_TOKEN_API}
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?ssl=false
DISTRIBUTION: ${DISTRIBUTION}
WEBHOOK_INGRESS: ${WEBHOOK_INGRESS}
JWT_SECRET: ${JWT_SECRET}
REDIS_HOST: ${REDIS_HOST}
REDIS_USER: ${REDIS_USER}
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ services:
environment:
DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?ssl=false
DISTRIBUTION: ${DISTRIBUTION}
WEBHOOK_INGRESS: ${WEBHOOK_INGRESS}
JWT_SECRET: ${JWT_SECRET}
REDIS_HOST: ${REDIS_HOST}
REDIS_USER: ${REDIS_USER}
Expand Down
Loading
Loading