From 4db5fb6b2ab7089a91734b1ebca03fc9b7c62a39 Mon Sep 17 00:00:00 2001
From: Francesca-Bit <francesca@terminusdb.com>
Date: Mon, 17 Jul 2023 14:24:04 +0200
Subject: [PATCH] add settings

---
 src/api/addContextMiddle.ts |  1 +
 src/app.ts                  | 13 ++++---------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/api/addContextMiddle.ts b/src/api/addContextMiddle.ts
index b353226..d7c57e6 100644
--- a/src/api/addContextMiddle.ts
+++ b/src/api/addContextMiddle.ts
@@ -26,6 +26,7 @@ const logger:Logger =  {
 
 export const addContextMiddle = function (req:Request, res:Response, next:NextFunction) {
   var dd = new Date()   
+  //logger.info("addContextMiddle","test log")
   if(req.url.startsWith("/api-docs")){
       return next();
     }
diff --git a/src/app.ts b/src/app.ts
index 3dd6196..274f615 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -2,8 +2,6 @@
 import * as dotenv from 'dotenv'
 import express from "express";
 import path  from "path";
-import  cookieParser from "cookie-parser";
-import logger from "morgan";
 import  { initialize } from "express-openapi";
 import swaggerUi from "swagger-ui-express";
 import ApiDocs from "./api/api-doc.json"
@@ -11,7 +9,8 @@ import bodyParser from "body-parser";
 import cors from "cors";
 import {addContextMiddle} from "./api/addContextMiddle"
 import { createProxyMiddleware } from  'http-proxy-middleware'
-import TerminusClient , {WOQLClient,WOQL, AccessControl} from "@terminusdb/terminusdb-client"
+import { AccessControl} from "@terminusdb/terminusdb-client"
+import * as settings from './api/core/settings'
 declare namespace Express {
   export interface Request {
     context?: object
@@ -69,13 +68,9 @@ app.use(addContextMiddle)
 app.listen(3035,function(){
   // when we start the server we check if the terminusCR team already exists
   // if it does not exists we'll create it
-  const endpoint :string = process.env.SERVER_ENDPOINT || "http://127.0.0.1:6363"
-  const key = process.env.USER_KEY || "root"
-  const CROrg = process.env.CR_TEAM_NAME || "terminusCR"
-  const user = process.env.USER_NAME || "admin"
-  const accessControl = new AccessControl(endpoint, { key: key, user: user })
+  const accessControl = new AccessControl(settings.endpoint, { key: settings.key, user: settings.user })
 
-  accessControl.createOrganization(CROrg).then(result=>{
+  accessControl.createOrganization(settings.CROrg).then(result=>{
       console.log("The Change Request team has been created")
     }).catch((err:any)=>{
       if (typeof err.data === 'object' && err.data['api:error']