fix: 🚧 use last log method

fix: ⚡ comment validation at repo creation fix: 🚑 double encoding app repo url
cloud-pi-native · May 23, 2023 · 8864cb0 · 8864cb0
1 parent 1ac2f6c
commit 8864cb0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 38 deletions.
diff --git a/apps/server/src/controllers/admin/logs.js b/apps/server/src/controllers/admin/logs.js
@@ -1,5 +1,4 @@
 import { adminGroupPath } from 'shared/src/utils/const.js'
-import { addReqLogs } from '../../utils/logger.js'
 import { sendForbidden, sendNotFound, sendOk } from '../../utils/response.js'
 import { getAllLogs } from '../../models/queries/log-queries.js'
 
@@ -8,18 +7,10 @@ export const getLogsController = async (req, res) => {
 
   try {
     const logs = await getAllLogs()
-    addReqLogs({
-      req,
-      description: 'Organisations récupérées avec succès',
-    })
+
     sendOk(res, logs)
   } catch (error) {
     const description = 'Echec de la récupération des organisations'
-    addReqLogs({
-      req,
-      description,
-      error,
-    })
     sendNotFound(res, description)
   }
 }
diff --git a/apps/server/src/controllers/repository.js b/apps/server/src/controllers/repository.js
@@ -21,7 +21,7 @@ import {
 } from '../models/queries/environment-queries.js'
 import { filterObjectByKeys } from '../utils/queries-tools.js'
 import { addReqLogs } from '../utils/logger.js'
-import { sendOk, sendCreated, sendUnprocessableContent, sendNotFound, sendBadRequest, sendForbidden } from '../utils/response.js'
+import { sendOk, sendCreated, sendNotFound, sendBadRequest, sendForbidden } from '../utils/response.js'
 import { getOrganizationById } from '../models/queries/organization-queries.js'
 import { addLogs } from '../models/queries/log-queries.js'
 import { gitlabUrl, projectRootDir } from '../utils/env.js'
@@ -103,31 +103,18 @@ export const createRepositoryController = async (req, res) => {
   let project
   let repo
   try {
-    const isValid = await hooksFns.createProject({ owner: user }, true)
-
-    if (isValid?.failed) {
-      try {
-        const reasons = Object.values(isValid)
-          .filter(({ status }) => status?.result === 'KO')
-          .map(({ status }) => status?.message)
-          .join('; ')
-        sendUnprocessableContent(res, reasons)
-
-        addReqLogs({
-          req,
-          description: 'Dépôt récupéré avec succès',
-          extras: {
-            reasons,
-          },
-          error: new Error('Failed to validation repository creation'),
-        })
-      } catch (error) {
-        addReqLogs({ req, error, description: 'Failed at precheck repo creation' })
-      } finally {
-        addLogs('Create Project Validation', { isValid }, user.id)
-      }
-      return
-    }
+    // const isValid = await hooksFns.createProject({ owner: user }, true)
+
+    // if (isValid?.failed) {
+    //   const reasons = Object.values(isValid)
+    //     .filter(({ status }) => status?.result === 'KO')
+    //     .map(({ status }) => status?.message)
+    //     .join('; ')
+    //   sendUnprocessableContent(res, reasons)
+    //   req.log.error(reasons)
+    //   addLogs('Create Project Validation', { reasons }, user.id)
+    //   return
+    // }
     project = await getProjectById(projectId)
     if (!project) throw new Error('Le projet n\'existe pas')
 

diff --git a/apps/server/src/plugins/core/argo/repo-secret.js b/apps/server/src/plugins/core/argo/repo-secret.js
@@ -26,7 +26,7 @@ const getSecretObject = ({ repo, project, organization }) => {
       },
     },
     stringData: {
-      url: Buffer.from(repo.url).toString('base64'),
+      url: repo.url,
     },
   }
 }
diff --git a/apps/server/src/plugins/index.js b/apps/server/src/plugins/index.js
@@ -26,7 +26,7 @@ const createHook = () => {
   const execute = async (args, isOnlyValidation = false) => {
     let payload = { args }
 
-    const steps = isOnlyValidation ? [check] : [check, pre, main, post, save]
+    const steps = isOnlyValidation ? [check] : [pre, main, post, save]
 
     for (const step of steps) {
       payload = await executeStep(step, payload)