From 9a95dceeb8a0dd570decaf9101f2d99c6ae4b3d7 Mon Sep 17 00:00:00 2001
From: hawkspar <quentin.chevalier@polytechnique.edu>
Date: Sat, 9 Feb 2019 13:50:24 +0100
Subject: [PATCH] Minor fixes & tests tsc

---
 .gitignore                          | 4 +---
 src/ldap/internal/config.ts         | 4 ++--
 src/ldap/test.js                    | 5 +++--
 tsbuild/src/ldap/internal/config.js | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 569d214..5e522f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,9 +29,6 @@ bower_components
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
-
 # Dependency directories
 node_modules/
 jspm_packages/
@@ -69,6 +66,7 @@ typings/
 # Generated files
 doc/
 build/
+tsbuild/
 
 # Config files
 ldap_credentials.json
diff --git a/src/ldap/internal/config.ts b/src/ldap/internal/config.ts
index 4924c34..b96f2d6 100644
--- a/src/ldap/internal/config.ts
+++ b/src/ldap/internal/config.ts
@@ -10,10 +10,10 @@ import fs from 'fs';
 import path from 'path';
 import colors from 'colors';
 import dotenv from 'dotenv';
-dotenv.config({ path: path.resolve("/"+__dirname, '..', '..', '..', './.env') });
+dotenv.config({ path: path.resolve(__dirname, '..', '..', '..', '..', './.env') });
 
 // Point central ; tous les champs de la BDD sont 'cachés' dans config.json et pas visibles directement
-let path_config = path.resolve("/"+__dirname, '..', '..', '..', './ldap_config.json');
+let path_config = path.resolve(__dirname, '..', '..', '..', '..', './ldap_config.json');
 console.log(colors.cyan("Loading LDAP config file from "+path_config));
 export const ldapConfig = JSON.parse(fs.readFileSync(path_config).toString());
 
diff --git a/src/ldap/test.js b/src/ldap/test.js
index 4e547ba..832f1fe 100644
--- a/src/ldap/test.js
+++ b/src/ldap/test.js
@@ -1,5 +1,6 @@
-var Group = require("../../tsbuild/src/ldap/export/group");
+var Group = require("../../tsbuild/src/ldap/export/group").Group;
+console.log(Group);
 
-console.log(Group.peek("faerix"));
+Group.peek("faerix").then(dat => { console.log(dat); });
 
 var User = require("../../tsbuild/src/ldap/export/group");
\ No newline at end of file
diff --git a/tsbuild/src/ldap/internal/config.js b/tsbuild/src/ldap/internal/config.js
index e2dcaea..6fbcdf5 100644
--- a/tsbuild/src/ldap/internal/config.js
+++ b/tsbuild/src/ldap/internal/config.js
@@ -14,9 +14,9 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const colors_1 = __importDefault(require("colors"));
 const dotenv_1 = __importDefault(require("dotenv"));
-dotenv_1.default.config({ path: path_1.default.resolve("/" + __dirname, '..', '..', '..', './.env') });
+dotenv_1.default.config({ path: path_1.default.resolve(__dirname, '..', '..', '..', './.env') });
 // Point central ; tous les champs de la BDD sont 'cachés' dans config.json et pas visibles directement
-let path_config = path_1.default.resolve("/" + __dirname, '..', '..', '..', '..', './ldap_config.json');
+let path_config = path_1.default.resolve(__dirname, '..', '..', '..', '..', './ldap_config.json');
 console.log(colors_1.default.cyan("Loading LDAP config file from " + path_config));
 exports.ldapConfig = JSON.parse(fs_1.default.readFileSync(path_config).toString());
 // Override config server from environment
-- 
GitLab