dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'next' of https://github.com/coollabsio/coolify into next

Browse Source
This commit is contained in:
Andras Bacsai
2022-08-12 19:07:45 +00:00
parent 3f5e6faac5 eef6b95e24
commit db9d5a0fb0
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/api/src/lib/common.ts
View File

@@ -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
} }

1
apps/api/src/routes/api/v1/services/handlers.ts
View File

@@ -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) {