@cerema/cadriciel 1.4.14 → 1.4.16

package/cli/global/doctor.js

@@ -43,15 +43,6 @@ module.exports = (args) => {
             title: 'Java',
             task: () => checkInstallation('java --version'),
           },
-          {
-            title: 'Maven',
-            task: () => checkInstallation('mvn -v'),
-          },
-          {
-            title: 'Liquibase',
-            task: () =>
-              checkInstallation('liquibase --version', extractLiquibaseVersion),
-          },
         ],
         { concurrent: true, exitOnError: false }
       );

package/cli/global/init.js

@@ -252,6 +252,7 @@ module.exports = (args) => {
       });
     });
   };
+
   return {
     info: {
       title: 'completion',

package/cli/global/install.js

@@ -86,10 +86,12 @@ module.exports = (args) => {
       });
     });
   };
+
   return {
     info: {
       title: 'install',
-      description: 'Installation des dépendances (La première fois uniquement)',
+      label: 'docker',
+      description: 'Installation des images Docker',
     },
     start: () => {
       addMapping();

package/cli/global/login.js

@@ -14,12 +14,16 @@ module.exports = (args) => {
   const querystring = require('querystring');
 
   const app = express();
-  const PORT = 4200;
-
-  const KEYCLOAK_SERVER = 'https://orion-recette.cerema.fr';
   const REALM = 'CeremaApps';
-  const CLIENT_ID = 'marep_dev';
-  const REDIRECT_URI = 'http://localhost:4200/callback';
+
+  const KEYCLOAK_SERVER = 'https://orion.cerema.fr';
+  const PORT = 14211;
+  const CLIENT_ID = 'cadriciel_login';
+
+  //const KEYCLOAK_SERVER = 'https://orion-recette.cerema.fr';
+  //const PORT = 4200;
+  //const CLIENT_ID = 'marep_dev';
+  const REDIRECT_URI = 'http://localhost:' + PORT + '/login';
 
   const INDEX_HTML = fs.readFileSync(
     __dirname + '/../assets/index.html',
@@ -61,7 +65,7 @@ module.exports = (args) => {
 
       const auth = async (wellKnownConfig) => {
         app.use(express.static(__dirname + '/../assets'));
-        app.get('/callback', (req, res) => {
+        app.get('/login', (req, res) => {
           const code = req.query.code;
           axios
             .post(
@@ -92,6 +96,7 @@ module.exports = (args) => {
                   try {
                     var response = await cadriciel.get('/login');
                   } catch (e) {
+                    console.log(e);
                     console.log(' ');
                     console.log(
                       chalk.red(' [AUTH]') +

package/cli.js

@@ -91,6 +91,7 @@ const loadCadricielCommands = (path) => {
 const label = (caption) => {
   if (caption === 'experimental') return chalk.red(' (' + caption + ') ');
   if (caption === 'beta') return chalk.magenta(' (' + caption + ') ');
+  if (caption === 'docker') return chalk.green(' (' + caption + ') ');
   if (caption === 'ai')
     return chalk.yellow(' (' + caption.toUpperCase() + ') ');
   return '';
@@ -199,7 +200,7 @@ const displayBanner = () => {
     }
     console.log(
       chalk.cyan(data) +
-        chalk.bold('\n CLI v ' + require('./package.json').version) +
+        chalk.bold('\n CLI v' + require('./package.json').version) +
         version_cadriciel
     );
     console.log(' ');

package/lib/cadriciel.js

@@ -29,11 +29,17 @@ class CadricielAPI {
       timeout: 10000,
       headers: { Authorization: 'Bearer ' + token },
     });
+    console.log({
+      baseURL: baseURL,
+      timeout: 10000,
+      headers: { Authorization: 'Bearer ' + token },
+    });
   }
 
   async get(url, params = {}) {
     try {
       const response = await this.client.get(url, { params });
+      console.log(response);
       return response.data;
     } catch (error) {
       throw error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerema/cadriciel",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "main": "index.js",
   "license": "MIT",
   "npm": ">=8.0.0",