mirror of
https://github.com/cupcakearmy/coolify.git
synced 2024-10-23 08:34:11 +02:00
Merge branch 'next' of https://github.com/coollabsio/coolify into next
This commit is contained in:
commit
db9d5a0fb0
@ -1284,13 +1284,14 @@ export async function getServiceFromDB({ id, teamId }: { id: string; teamId: str
|
|||||||
});
|
});
|
||||||
let { type } = body
|
let { type } = body
|
||||||
type = fixType(type)
|
type = fixType(type)
|
||||||
|
console.log({body})
|
||||||
if (body?.serviceSecret.length > 0) {
|
if (body?.serviceSecret.length > 0) {
|
||||||
body.serviceSecret = body.serviceSecret.map((s) => {
|
body.serviceSecret = body.serviceSecret.map((s) => {
|
||||||
s.value = decrypt(s.value);
|
s.value = decrypt(s.value);
|
||||||
return s;
|
return s;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
console.log({body2:body})
|
||||||
body[type] = { ...body[type], ...getUpdateableFields(type, body[type]) }
|
body[type] = { ...body[type], ...getUpdateableFields(type, body[type]) }
|
||||||
return { ...body, settings };
|
return { ...body, settings };
|
||||||
}
|
}
|
||||||
@ -1582,6 +1583,7 @@ export function getUpdateableFields(type: string, data: any) {
|
|||||||
update[k.name] = temp
|
update[k.name] = temp
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
console.log({update})
|
||||||
return update
|
return update
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -196,6 +196,7 @@ export async function getService(request: FastifyRequest<OnlyId>) {
|
|||||||
try {
|
try {
|
||||||
const teamId = request.user.teamId;
|
const teamId = request.user.teamId;
|
||||||
const { id } = request.params;
|
const { id } = request.params;
|
||||||
|
console.log({id, teamId})
|
||||||
const service = await getServiceFromDB({ id, teamId });
|
const service = await getServiceFromDB({ id, teamId });
|
||||||
console.log(service)
|
console.log(service)
|
||||||
if (!service) {
|
if (!service) {
|
||||||
|
Loading…
Reference in New Issue
Block a user