Skip to content

Commit 3737d19

Browse files
committed
fix: correct integrations callbacks
1 parent 3db5bda commit 3737d19

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

apps/web-app/src/routes/$organizationSlug/_layout.integrations.tsx

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
} from "@asyncstatus/api/typed-handlers/discord-gateway";
1313
import {
1414
deleteDiscordIntegrationContract,
15+
discordAddIntegrationCallbackContract,
1516
discordIntegrationCallbackContract,
1617
fetchDiscordMessagesContract,
1718
getDiscordIntegrationContract,
@@ -30,6 +31,7 @@ import {
3031
import {
3132
deleteGitlabIntegrationContract,
3233
getGitlabIntegrationContract,
34+
gitlabIntegrationCallbackAddContract,
3335
gitlabIntegrationCallbackContract,
3436
listGitlabProjectsContract,
3537
listGitlabUsersContract,
@@ -55,6 +57,7 @@ import {
5557
getSlackIntegrationContract,
5658
listSlackChannelsContract,
5759
listSlackUsersContract,
60+
slackAddIntegrationCallbackContract,
5861
slackIntegrationCallbackContract,
5962
} from "@asyncstatus/api/typed-handlers/slack-integration";
6063
import {
@@ -102,10 +105,13 @@ import {
102105
XIcon,
103106
} from "@asyncstatus/ui/icons";
104107
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
105-
import { createFileRoute, Link, useNavigate } from "@tanstack/react-router";
108+
import { createFileRoute, Link, useNavigate, useRouter } from "@tanstack/react-router";
106109
import { Fragment, useMemo, useState } from "react";
107110
import { z } from "zod/v4";
108-
import { sessionBetterAuthQueryOptions } from "@/better-auth-tanstack-query";
111+
import {
112+
loginSocialMutationOptions,
113+
sessionBetterAuthQueryOptions,
114+
} from "@/better-auth-tanstack-query";
109115
import {
110116
IntegrationSettingsItem,
111117
IntegrationSuggestionItem,
@@ -791,7 +797,7 @@ function RouteComponent() {
791797
: "disconnected",
792798
connectLink: getSlackIntegrationConnectUrl({
793799
clientId: import.meta.env.VITE_SLACK_INTEGRATION_APP_CLIENT_ID,
794-
redirectUri: typedUrl(slackIntegrationCallbackContract, {}),
800+
redirectUri: typedUrl(slackAddIntegrationCallbackContract, {} as any),
795801
organizationSlug: params.organizationSlug,
796802
}),
797803
onDisconnect: () => {
@@ -1015,7 +1021,7 @@ function RouteComponent() {
10151021
: "disconnected",
10161022
connectLink: getDiscordIntegrationConnectUrl({
10171023
clientId: import.meta.env.VITE_DISCORD_INTEGRATION_APP_CLIENT_ID,
1018-
redirectUri: typedUrl(discordIntegrationCallbackContract, {}),
1024+
redirectUri: typedUrl(discordAddIntegrationCallbackContract, {} as any),
10191025
organizationSlug: params.organizationSlug,
10201026
}),
10211027
onDisconnect: () => {
@@ -1452,7 +1458,7 @@ function RouteComponent() {
14521458
: "disconnected",
14531459
connectLink: getGitlabIntegrationConnectUrl({
14541460
clientId: import.meta.env.VITE_GITLAB_INTEGRATION_APP_CLIENT_ID,
1455-
redirectUri: import.meta.env.VITE_API_URL + gitlabIntegrationCallbackContract.url(),
1461+
redirectUri: typedUrl(gitlabIntegrationCallbackAddContract, {} as any),
14561462
organizationSlug: params.organizationSlug,
14571463
instanceUrl: "https://gitlab.com", // Default to GitLab.com
14581464
}),

0 commit comments

Comments
 (0)