ershisan99/coolify
1
0
Fork 0
mirror of https://github.com/ershisan99/coolify.git synced 2026-01-03 12:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: Always use IP address for webhooks"

Browse Source 
This reverts commit 880865f1f2.
This commit is contained in:
Andras Bacsai
2022-04-29 23:25:15 +02:00
parent 45c904e876
commit e93d97f2bc
6 changed files with 16 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/applications/[id]/configuration/_GithubRepositories.svelte
View File

@@ -8,7 +8,6 @@
import { onMount } from 'svelte';
import { gitTokens } from '$lib/store';
import { t } from '$lib/translations';
import { getIP } from '$lib/components/common';
const { id } = $page.params;
const from = $page.url.searchParams.get('from');
@@ -114,7 +113,6 @@
}
onMount(async () => {
const ip = await getIP();
try {
if (!$gitTokens.githubToken) {
const { token } = await get(`/applications/${id}/configuration/githubToken.json`);
@@ -133,7 +131,7 @@
const left = screen.width / 2 - 1020 / 2;
const top = screen.height / 2 - 618 / 2;
const newWindow = open(
`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${ip}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${window.location.origin}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
'GitLab',
'resizable=1, scrollbars=1, fullscreen=0, height=618, width=1020,top=' +
top +

13
src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
View File

@@ -10,7 +10,6 @@
import { del, get, post, put } from '$lib/api';
import { gitTokens } from '$lib/store';
import { t } from '$lib/translations';
import { getIP } from '$lib/components/common';
const { id } = $page.params;
const from = $page.url.searchParams.get('from');
@@ -41,7 +40,7 @@
};
onMount(async () => {
if (!$gitTokens.gitlabToken) {
await getGitlabToken();
getGitlabToken();
} else {
loading.base = true;
try {
@@ -50,7 +49,7 @@
});
username = user.username;
} catch (error) {
return await getGitlabToken();
return getGitlabToken();
}
try {
groups = await get(`${apiUrl}/v4/groups?per_page=5000`, {
@@ -65,12 +64,11 @@
}
});
async function getGitlabToken() {
const ip = await getIP();
function getGitlabToken() {
const left = screen.width / 2 - 1020 / 2;
const top = screen.height / 2 - 618 / 2;
const newWindow = open(
`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${ip}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${window.location.origin}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
'GitLab',
'resizable=1, scrollbars=1, fullscreen=0, height=618, width=1020,top=' +
top +
@@ -165,10 +163,9 @@
}
}
async function setWebhook(url, webhookToken) {
const ip = await getIP();
const host = dev
? 'https://webhook.site/0e5beb2c-4e9b-40e2-a89e-32295e570c21'
: `${ip}/webhooks/gitlab/events`;
: `${window.location.origin}/webhooks/gitlab/events`;
try {
await post(
url,

4
src/routes/applications/[id]/configuration/buildpack.svelte
View File

@@ -37,7 +37,6 @@
import { gitTokens } from '$lib/store';
import { browser } from '$app/env';
import { t } from '$lib/translations';
import { getIP } from '$lib/components/common';
const { id } = $page.params;
@@ -175,12 +174,11 @@
error.message === '401 Unauthorized'
) {
if (application.gitSource.gitlabAppId) {
const ip = await getIP();
let htmlUrl = application.gitSource.htmlUrl;
const left = screen.width / 2 - 1020 / 2;
const top = screen.height / 2 - 618 / 2;
const newWindow = open(
`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${ip}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
`${htmlUrl}/oauth/authorize?client_id=${application.gitSource.gitlabApp.appId}&redirect_uri=${window.location.origin}/webhooks/gitlab&response_type=code&scope=api+email+read_repository&state=${$page.params.id}`,
'GitLab',
'resizable=1, scrollbars=1, fullscreen=0, height=618, width=1020,top=' +
top +