feat(*): rewrite

* auth preparation * fix(user): user not found * auth api * maj to typescript 2.4.0 * feat(context): clone context * feat(): keep order layers/tools * refonte, tests, bookmark * fix(poi): rename bookmark to poi * feat(layer): sort layers * Update config.dev.json * Update config.test.json
infra-geo-ouverte · Sep 1, 2017 · 76dd361 · 76dd361
1 parent 4d5eb00
commit 76dd361
Show file tree

Hide file tree

Showing 95 changed files with 9,522 additions and 1,848 deletions.
diff --git a/package.json b/package.json
@@ -6,12 +6,17 @@
   "scripts": {
     "tsc": "tsc --p src/",
     "tsc-watch": "tsc --p src/ -w",
-    "start": "npm run build.dev && nodemon --watch build build/index.js",
-    "build.dev": "gulp build",
+    "start": "npm run build.dev && concurrently \"npm run tsc-watch\" \"nodemon --watch build build/index.js\"",
+    "build.dev": "rimraf build && gulp build",
     "serve.dev": "node build/index.js",
     "lint": "gulp tslint",
-    "test": "rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/**/*.test.js | tap-spec",
-    "initDB": "rimraf igo.db && tape ./build/**/*.test.js | tap-spec",
+    "test": "npm run build.dev && rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/**/*.test.js | tap-spec",
+    "testUser": "npm run build.dev && rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/user/*.test.js | tap-spec",
+    "testBookmark": "npm run build.dev && rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/bookmark/*.test.js | tap-spec",
+    "testTool": "npm run build.dev && rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/tool*/*.test.js | tap-spec",
+    "testLayer": "npm run build.dev && rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/layer*/*.test.js | tap-spec",
+    "testContext": "npm run build.dev && rimraf igo-test.db && gulp tslint && NODE_ENV=test tape ./build/context*/*.test.js | tap-spec",
+    "initDB": "npm run build.dev && rimraf igo.db && node build/initDB.js",
     "coverage": "npm run build.coverage && npm run serve.coverage",
     "build.coverage": "NODE_ENV=test istanbul cover tape ./build/**/*.test.js",
     "serve.coverage": "node_modules/live-server/live-server.js ./coverage/lcov-report/ --port=4210 --no-browser"
@@ -43,10 +48,13 @@
     "inert": "^4.1.0",
     "joi": "^10.1.0",
     "jsonwebtoken": "^7.2.1",
+    "ldapjs": "^1.0.1",
     "nconf": "^0.8.4",
     "path": "^0.12.7",
     "pg": "^6.1.2",
     "pg-hstore": "^2.3.2",
+    "request": "^2.81.0",
+    "rxjs": "^5.4.1",
     "sequelize": "^3.30.2",
     "sqlite3": "^3.1.8",
     "vision": "^4.1.1",
@@ -63,6 +71,7 @@
     "@types/nconf": "0.0.33",
     "@types/node": "^6.0.55",
     "@types/sequelize": "^4.0.40",
+    "concurrently": "^3.5.0",
     "gulp": "^3.9.1",
     "gulp-env": "^0.4.0",
     "gulp-mocha": "^4.1.0",

diff --git a/src/configurations/config.dev.json b/src/configurations/config.dev.json
@@ -6,13 +6,19 @@
     },
     "server": {
         "port": 5000,
-        "jwtSecret": "random-secret-password",
+        "adminProfil": "admin",
         "jwtExpiration": "1h",
+        "userApi": {
+          "host": "localhost",
+          "port": 8001
+        },
         "plugins": [
             "logger",
-            "jwt-auth",
             "sanitizer",
             "swagger"
         ]
+    },
+    "test": {
+      "xConsumerId": ""
     }
 }
diff --git a/src/configurations/config.test.json b/src/configurations/config.test.json
@@ -6,13 +6,19 @@
     },
     "server": {
         "port": 5000,
-        "jwtSecret": "random-secret-password",
+        "adminProfil": "admin",
         "jwtExpiration": "1h",
+        "userApi": {
+          "host": "localhost",
+          "port": 8001
+        },
         "plugins": [
             "logger",
-            "jwt-auth",
             "sanitizer",
             "swagger"
         ]
+    },
+    "test": {
+      "xConsumerId": ""
     }
 }
diff --git a/src/configurations/index.ts b/src/configurations/index.ts
@@ -11,11 +11,18 @@ const configs = new nconf.Provider({
   }
 });
 
-export interface IServerConfigurations {
+interface IUserApiConfiguration {
+  host: string;
+  port: number;
+}
+
+export interface IServerConfiguration {
     port: number;
     plugins: Array<string>;
-    jwtSecret: string;
     jwtExpiration: string;
+    userApi: IUserApiConfiguration;
+    googleKey?: string;
+    adminProfil?: string;
 }
 
 interface IDatabaseConfiguration {
@@ -31,11 +38,26 @@ export interface IPostgresConfiguration extends IDatabaseConfiguration {
 }
 export type IDataConfiguration = ISqliteConfiguration | IPostgresConfiguration;
 
+export interface IConsumer {
+  xConsumerId: string;
+  xConsumerUsername: string;
+}
+
+export interface ITestConfiguration {
+  admin: IConsumer;
+  anonyme: IConsumer;
+  user1: IConsumer;
+  user2: IConsumer;
+}
 
 export function getDatabaseConfig(): IDataConfiguration {
-    return configs.get('database');
+  return configs.get('database');
+}
+
+export function getServerConfig(): IServerConfiguration {
+  return configs.get('server');
 }
 
-export function getServerConfigs(): IServerConfigurations {
-    return configs.get('server');
+export function getTestConfig(): ITestConfiguration {
+  return configs.get('test');
 }