Skip to content

refactor: gitLab callback to improve type handling #4396

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

Open
watercubz wants to merge 1 commit into
base: canary
Choose a base branch
from
+5 −5
Open

refactor: gitLab callback to improve type handling #4396

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
10 changes: 5 additions & 5 deletions apps/dokploy/pages/api/providers/gitlab/callback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default async function handler(
return res.status(400).json({ error: "Missing or invalid code" });
}

const gitlab = await findGitlabById(gitlabId as string);
const gitlab = await findGitlabById(gitlabId);
// Use internal URL for token exchange when GitLab is on same instance as Dokploy
const baseUrl = gitlab.gitlabInternalUrl || gitlab.gitlabUrl;
const gitlabUrl = new URL(baseUrl);
Expand Down Expand Up @@ -39,9 +39,9 @@ export default async function handler(
method: "POST",
headers,
body: new URLSearchParams({
client_id: gitlab.applicationId as string,
client_secret: gitlab.secret as string,
code: code as string,
client_id: gitlab.applicationId,
client_secret: gitlab.secret,
code: code,
grant_type: "authorization_code",
redirect_uri: `${gitlab.redirectUri}?gitlabId=${gitlabId}`,
}),
Expand All @@ -53,7 +53,7 @@ export default async function handler(
return res.status(400).json({ error: "Missing or invalid code" });
}

const expiresAt = Math.floor(Date.now() / 1000) + result.expires_in;
const expiresAt = result.expires_in ? Math.floor(Date.now() / 1000) + result.expires_in : `Error receiving expires_in, expected type: number, but currently received: ${result.expires_in}`;
await updateGitlab(gitlab.gitlabId, {
accessToken: result.access_token,
refreshToken: result.refresh_token,
Expand Down