diff --git a/.gitignore b/.gitignore index 569d2145ad83c2e513bdc93362ead6639959f2b1..5e522f55230586043cddad095cc97aaa28902fb1 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 4924c34c41df60fdcf5e89c67e5bce54d1f9ab16..b96f2d665b98f1233efbe9be539b545a60bf7a06 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 4e547ba4aa294ac5e71fd0065d095dcf9a63e721..832f1fee2566b21bbcba60cf0552242b64903ad0 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 e2dcaea420ff7711d36d293940dcd8e5f733da47..6fbcdf5edaf93efe571b94c89b3224dab197c49b 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