Merge pull request #7 from terminusdb/review-change-request

Update client

Author: Francesca-Bit

package-lock.json

@@ -19,7 +19,7 @@
   "license": "ISC",
   "dependencies": {
     "@apollo/client": "^3.7.16",
-    "@terminusdb/terminusdb-client": "^10.0.31",
+    "@terminusdb/terminusdb-client": "^10.0.32",
     "@types/swagger-ui-express": "^4.1.3",
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",

package.json

@@ -92,7 +92,7 @@ class ChangeRequestDB {
       let docId
       const creator = this.user || ""
       const originalBranch = this.request.body.original_branch
-      this.createCRDatabase()
+      await this.createCRDatabase()
       const tmpClient = this.connectWithCurrentUser()
 
       // I need to record the commit-id point

src/api/core/ChangeRequestDB.ts

@@ -65,20 +65,22 @@ app.use(
 );
 
 app.use(addContextMiddle)
-app.listen(3035,function(){
+app.listen(3035,  async () => {
   // when we start the server we check if the terminusCR team already exists
   // if it does not exists we'll create it
-  const accessControl = new AccessControl(settings.endpoint, { key: settings.key, user: settings.user })
+  try{
+    const accessControl = new AccessControl(settings.endpoint, { key: settings.key, user: settings.user })
 
-  accessControl.createOrganization(settings.CROrg).then(result=>{
-      console.log("The Change Request team has been created")
-    }).catch((err:any)=>{
+    await accessControl.createOrganization(settings.CROrg)
+    await accessControl.manageCapability('User/admin',`Organization/${settings.CROrg}`,['Role/admin'],"grant")
+    console.log("The Change Request team has been created")
+  }catch(err:any){
       if (typeof err.data === 'object' && err.data['api:error'] 
         && err.data['api:error']['@type'] === "api:NoUniqueIdForOrganizationName") {
         console.log("The Change Request team already exists")
         }
-      })
-  });
+  }
+})
 
 console.log("App running on port http://localhost:3035");
 console.log(