Skip to content

Commit

Permalink
fix: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
utkarsh-dixit committed Feb 27, 2025
1 parent 9b9a8b0 commit 7751b51
Show file tree
Hide file tree
Showing 14 changed files with 76 additions and 39 deletions.
18 changes: 11 additions & 7 deletions js/src/sdk/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,23 +41,27 @@ describe("Basic SDK spec suite", () => {
apiKey: "api_key_1",
baseUrl: getTestConfig().BACKEND_HERMES_URL,
});

const client2 = new Composio({
apiKey: "api_key_2",
baseUrl: getTestConfig().BACKEND_HERMES_URL,
});

// Get axios instances to verify they are different
const axiosInstance1 = client1.backendClient.getAxiosInstance();
const axiosInstance2 = client2.backendClient.getAxiosInstance();

// Check that the instances are different objects
expect(axiosInstance1).not.toBe(axiosInstance2);

// Check that the API keys are set correctly in the headers
expect(axiosInstance1.defaults.headers.common["X-API-KEY"]).toBe("api_key_1");
expect(axiosInstance2.defaults.headers.common["X-API-KEY"]).toBe("api_key_2");

expect(axiosInstance1.defaults.headers.common["X-API-KEY"]).toBe(
"api_key_1"
);
expect(axiosInstance2.defaults.headers.common["X-API-KEY"]).toBe(
"api_key_2"
);

// Verify that using client1 again returns the same instance
const axiosInstanceAgain = client1.backendClient.getAxiosInstance();
expect(axiosInstanceAgain).toBe(axiosInstance1);
Expand Down
5 changes: 4 additions & 1 deletion js/src/sdk/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,10 @@ export class Composio {
this.backendClient,
this.backendClient.instance
);
this.triggers = new Triggers(this.backendClient, this.backendClient.instance);
this.triggers = new Triggers(
this.backendClient,
this.backendClient.instance
);
this.apps = new Apps(this.backendClient, this.backendClient.instance);
this.actions = new Actions(this.backendClient, this.backendClient.instance);
this.integrations = new Integrations(
Expand Down
5 changes: 4 additions & 1 deletion js/src/sdk/models/Entity.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ describe("Entity class tests", () => {

beforeAll(() => {
entity = new Entity(backendClient, "default");
connectedAccounts = new ConnectedAccounts(backendClient, backendClient.instance);
connectedAccounts = new ConnectedAccounts(
backendClient,
backendClient.instance
);
_integrations = new Integrations(backendClient, backendClient.instance);
});

Expand Down
25 changes: 20 additions & 5 deletions js/src/sdk/models/Entity.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,27 @@ export class Entity {
constructor(backendClient: AxiosBackendClient, id: string = "default") {
this.backendClient = backendClient;
this.id = id;
this.triggerModel = new Triggers(this.backendClient, this.backendClient.instance);
this.actionsModel = new Actions(this.backendClient, this.backendClient.instance);
this.triggerModel = new Triggers(
this.backendClient,
this.backendClient.instance
);
this.actionsModel = new Actions(
this.backendClient,
this.backendClient.instance
);
this.apps = new Apps(this.backendClient, this.backendClient.instance);
this.connectedAccounts = new ConnectedAccounts(this.backendClient, this.backendClient.instance);
this.integrations = new Integrations(this.backendClient, this.backendClient.instance);
this.activeTriggers = new ActiveTriggers(this.backendClient, this.backendClient.instance);
this.connectedAccounts = new ConnectedAccounts(
this.backendClient,
this.backendClient.instance
);
this.integrations = new Integrations(
this.backendClient,
this.backendClient.instance
);
this.activeTriggers = new ActiveTriggers(
this.backendClient,
this.backendClient.instance
);
}

/**
Expand Down
5 changes: 4 additions & 1 deletion js/src/sdk/models/actions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ describe("Actions class tests", () => {
beforeAll(() => {
backendClient = getBackendClient();
actions = new Actions(backendClient, backendClient.instance);
connectedAccouns = new ConnectedAccounts(backendClient, backendClient.instance);
connectedAccouns = new ConnectedAccounts(
backendClient,
backendClient.instance
);
});

it("should get a specific action", async () => {
Expand Down
2 changes: 1 addition & 1 deletion js/src/sdk/models/actions.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Client } from "@hey-api/client-axios";
import { z } from "zod";
import {
ActionDetails,
Expand All @@ -20,7 +21,6 @@ import { CEG } from "../utils/error";
import { TELEMETRY_LOGGER } from "../utils/telemetry";
import { TELEMETRY_EVENTS } from "../utils/telemetry/events";
import { AxiosBackendClient } from "./backendClient";
import { Client } from "@hey-api/client-axios";

/**
* Request types inferred from zod schemas
Expand Down
2 changes: 1 addition & 1 deletion js/src/sdk/models/activeTriggers.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Client } from "@hey-api/client-axios";
import { z } from "zod";
import apiClient from "../client/client";
import {
Expand All @@ -9,7 +10,6 @@ import { CEG } from "../utils/error";
import { TELEMETRY_LOGGER } from "../utils/telemetry";
import { TELEMETRY_EVENTS } from "../utils/telemetry/events";
import { AxiosBackendClient } from "./backendClient";
import { Client } from "@hey-api/client-axios";

export type TriggerItemParam = z.infer<typeof ZTriggerItemParam>;
export type GetActiveTriggersData = z.infer<typeof ZActiveTriggersQuery>;
Expand Down
2 changes: 1 addition & 1 deletion js/src/sdk/models/apps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { CEG } from "../utils/error";
import { TELEMETRY_LOGGER } from "../utils/telemetry";
import { TELEMETRY_EVENTS } from "../utils/telemetry/events";

import { Client } from "@hey-api/client-axios";
import { z } from "zod";
import {
ZGetAppParams,
Expand All @@ -17,7 +18,6 @@ import {
ZRequiredParamsResponse,
} from "../types/app";
import { AxiosBackendClient } from "./backendClient";
import { Client } from "@hey-api/client-axios";

// schema types generated from zod
export type AppGetRequiredParams = z.infer<typeof ZGetRequiredParams>;
Expand Down
24 changes: 11 additions & 13 deletions js/src/sdk/models/backendClient.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
import { AxiosInstance } from "axios";
import { Client, createClient, createConfig } from "@hey-api/client-axios";
import apiClient from "../client/client";
import { client as axiosClient } from "../client/services.gen";
import { setAxiosClientConfig } from "../utils/config";
import { CEG } from "../utils/error";
import { COMPOSIO_SDK_ERROR_CODES } from "../utils/errors/src/constants";
import { removeTrailingSlashIfExists } from "../utils/string";
import { Client, createClient, createConfig } from "@hey-api/client-axios";

/**
* Class representing the details required to initialize and configure the API client.
Expand Down Expand Up @@ -38,14 +35,16 @@ export class AxiosBackendClient {
this.runtime = runtime || "";
this.apiKey = apiKey;
this.baseUrl = removeTrailingSlashIfExists(baseUrl);
this.instance = createClient(createConfig({
baseURL: this.baseUrl,
headers: {
"X-API-KEY": `${this.apiKey}`,
"X-SOURCE": "js_sdk",
"X-RUNTIME": this.runtime,
},
}));
this.instance = createClient(
createConfig({
baseURL: this.baseUrl,
headers: {
"X-API-KEY": `${this.apiKey}`,
"X-SOURCE": "js_sdk",
"X-RUNTIME": this.runtime,
},
})
);
if (!apiKey) {
throw CEG.getCustomError(
COMPOSIO_SDK_ERROR_CODES.COMMON.API_KEY_UNAVAILABLE,
Expand All @@ -68,7 +67,6 @@ export class AxiosBackendClient {
}
);
}

}

/**
Expand Down
5 changes: 4 additions & 1 deletion js/src/sdk/models/connectedAccounts.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ describe("ConnectedAccounts class tests", () => {

beforeAll(() => {
backendClient = getBackendClient();
connectedAccounts = new ConnectedAccounts(backendClient, backendClient.instance);
connectedAccounts = new ConnectedAccounts(
backendClient,
backendClient.instance
);
});

it("should create a ConnectedAccounts instance and retrieve connections list", async () => {
Expand Down
2 changes: 1 addition & 1 deletion js/src/sdk/models/connectedAccounts.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Client } from "@hey-api/client-axios";
import { z } from "zod";
import {
ConnectedAccountResponseDTO,
Expand All @@ -18,7 +19,6 @@ import { CEG } from "../utils/error";
import { TELEMETRY_LOGGER } from "../utils/telemetry";
import { TELEMETRY_EVENTS } from "../utils/telemetry/events";
import { AxiosBackendClient } from "./backendClient";
import { Client } from "@hey-api/client-axios";

type ConnectedAccountsListData = z.infer<typeof ZListConnectionsData> & {
/** @deprecated use appUniqueKeys field instead */
Expand Down
3 changes: 1 addition & 2 deletions js/src/sdk/models/integrations.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { z } from "zod";

import { Client } from "@hey-api/client-axios";
import {
DeleteRowAPIDTO,
ExpectedInputFieldsDTO,
Expand All @@ -17,9 +18,7 @@ import { CEG } from "../utils/error";
import { COMPOSIO_SDK_ERROR_CODES } from "../utils/errors/src/constants";
import { TELEMETRY_LOGGER } from "../utils/telemetry";
import { TELEMETRY_EVENTS } from "../utils/telemetry/events";
import { Apps } from "./apps";
import { AxiosBackendClient } from "./backendClient";
import { Client } from "@hey-api/client-axios";

// Types generated from zod schemas

Expand Down
15 changes: 12 additions & 3 deletions js/src/sdk/models/triggers.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ describe("Apps class tests", () => {
beforeAll(() => {
backendClient = getBackendClient();
triggers = new Triggers(backendClient, backendClient.instance);
_connectedAccounts = new ConnectedAccounts(backendClient, backendClient.instance);
_connectedAccounts = new ConnectedAccounts(
backendClient,
backendClient.instance
);
_entity = new Entity(backendClient, "default");
_connectedAccounts = new ConnectedAccounts(backendClient, backendClient.instance);
_connectedAccounts = new ConnectedAccounts(
backendClient,
backendClient.instance
);
_actions = new Actions(backendClient, backendClient.instance);
});

Expand Down Expand Up @@ -50,7 +56,10 @@ describe("Apps class tests subscribe", () => {
beforeAll(() => {
backendClient = getBackendClient();
triggers = new Triggers(backendClient, backendClient.instance);
connectedAccounts = new ConnectedAccounts(backendClient, backendClient.instance);
connectedAccounts = new ConnectedAccounts(
backendClient,
backendClient.instance
);
_entity = new Entity(backendClient, "default");
_actions = new Actions(backendClient, backendClient.instance);
});
Expand Down
2 changes: 1 addition & 1 deletion js/src/sdk/models/triggers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { CEG } from "../utils/error";
import { TELEMETRY_LOGGER } from "../utils/telemetry";
import { TELEMETRY_EVENTS } from "../utils/telemetry/events";

import { Client } from "@hey-api/client-axios";
import { ListTriggersResponse } from "../client";
import {
TriggerSingleParam,
Expand All @@ -21,7 +22,6 @@ import {
ZTriggerSubscribeParam,
} from "../types/trigger";
import { COMPOSIO_SDK_ERROR_CODES } from "../utils/errors/src/constants";
import { Client } from "@hey-api/client-axios";

// Types inferred from zod schemas
export type TriggerListParam = z.infer<typeof ZTriggerQuery> & {
Expand Down

0 comments on commit 7751b51

Please sign in to comment.