mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-22 16:14:22 +02:00
commit
31ee938b66
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "coolify",
|
"name": "coolify",
|
||||||
"description": "An open-source & self-hostable Heroku / Netlify alternative.",
|
"description": "An open-source & self-hostable Heroku / Netlify alternative.",
|
||||||
"version": "2.0.14",
|
"version": "2.0.15",
|
||||||
"license": "AGPL-3.0",
|
"license": "AGPL-3.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "docker compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev --host 0.0.0.0",
|
"dev": "docker compose -f docker-compose-dev.yaml up -d && NODE_ENV=development svelte-kit dev --host 0.0.0.0",
|
||||||
|
@ -18,7 +18,7 @@ export const handle = handleSession(
|
|||||||
try {
|
try {
|
||||||
if (event.locals.cookies) {
|
if (event.locals.cookies) {
|
||||||
let gitlabToken = event.locals.cookies.gitlabToken || null;
|
let gitlabToken = event.locals.cookies.gitlabToken || null;
|
||||||
let ghToken = event.locals.cookies.ghToken;
|
let ghToken = event.locals.cookies.ghToken || null;
|
||||||
if (event.locals.cookies['kit.session']) {
|
if (event.locals.cookies['kit.session']) {
|
||||||
const { permission, teamId, userId } = await getUserDetails(event, false);
|
const { permission, teamId, userId } = await getUserDetails(event, false);
|
||||||
const newSession = {
|
const newSession = {
|
||||||
|
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
function generateUrl() {
|
function generateUrl() {
|
||||||
return browser
|
return browser
|
||||||
? `${database.type}://${database.type === 'redis' && ':'}${
|
? `${database.type}://${
|
||||||
databaseDbUser ? databaseDbUser + ':' : ''
|
databaseDbUser ? databaseDbUser + ':' : ''
|
||||||
}${databaseDbUserPassword}@${
|
}${databaseDbUserPassword}@${
|
||||||
isPublic
|
isPublic
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
import { page, session } from '$app/stores';
|
import { page, session } from '$app/stores';
|
||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import { post } from '$lib/api';
|
import { post } from '$lib/api';
|
||||||
|
import { browser } from '$app/env';
|
||||||
const { id } = $page.params;
|
const { id } = $page.params;
|
||||||
|
|
||||||
let loading = false;
|
let loading = false;
|
||||||
@ -121,12 +122,16 @@
|
|||||||
|
|
||||||
<Explainer
|
<Explainer
|
||||||
customClass="w-full"
|
customClass="w-full"
|
||||||
text="<span class='font-bold text-base'>Scopes required:</span>
|
text="<span class='font-bold text-base text-white'>Scopes required:</span>
|
||||||
<br>- api (Access the authenticated user's API)
|
<br>- <span class='text-orange-500 font-bold'>api</span> (Access the authenticated user's API)
|
||||||
<br>- read_repository (Allows read-only access to the repository)
|
<br>- <span class='text-orange-500 font-bold'>read_repository</span> (Allows read-only access to the repository)
|
||||||
<br>- email (Allows read-only access to the user's primary email address using OpenID Connect)
|
<br>- <span class='text-orange-500 font-bold'>email</span> (Allows read-only access to the user's primary email address using OpenID Connect)
|
||||||
<br>
|
<br>
|
||||||
<br>For extra security, you can add Expire access tokens!"
|
<br>For extra security, you can set Expire access tokens!
|
||||||
|
<br><br>Webhook URL: <span class='text-orange-500 font-bold'>{browser
|
||||||
|
? window.location.origin
|
||||||
|
: ''}/webhooks/gitlab</span>
|
||||||
|
<br>But if you will set a custom domain name for Coolify, use that instead."
|
||||||
/>
|
/>
|
||||||
</form>
|
</form>
|
||||||
<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4 pt-10">
|
<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4 pt-10">
|
||||||
|
@ -21,8 +21,8 @@ export const get: RequestHandler = async (event) => {
|
|||||||
const code = event.url.searchParams.get('code');
|
const code = event.url.searchParams.get('code');
|
||||||
const state = event.url.searchParams.get('state');
|
const state = event.url.searchParams.get('state');
|
||||||
try {
|
try {
|
||||||
|
const { fqdn } = await db.listSettings();
|
||||||
const application = await db.getApplication({ id: state, teamId });
|
const application = await db.getApplication({ id: state, teamId });
|
||||||
const { fqdn } = application;
|
|
||||||
const { appId, appSecret } = application.gitSource.gitlabApp;
|
const { appId, appSecret } = application.gitSource.gitlabApp;
|
||||||
const { htmlUrl } = application.gitSource;
|
const { htmlUrl } = application.gitSource;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user