Merge branch 'master-COLLAUDO' into features-nov24/errors-fix-coll1

# Conflicts: # package-lock.json # package.json # routes/files.js # routes/kb.js
Tiledesk · Nov 21, 2024 · fb71c71 · fb71c71
2 parents f259637 + 30d8556
commit fb71c71
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 14 deletions.
diff --git a/models/transaction.js b/models/transaction.js
@@ -21,6 +21,10 @@ const TransactionSchema = mongoose.Schema({
     type: String,
     required: false
   },
+  broadcast: {
+    type: Boolean,
+    required: false
+  },
   createdAt: {
     type: Date,
     default: Date.now

diff --git a/package-lock.json b/package-lock.json
diff --git a/routes/auth.js b/routes/auth.js
@@ -107,8 +107,6 @@ router.post('/signup',
           if (!skipVerificationEmail) {
 
             let verify_email_code = uniqid();
-            console.log("(Auth) verify_email_code: ", verify_email_code);
-
             let redis_client = req.app.get('redis_client');
             let key = "emailverify:verify-" + verify_email_code;
             let obj = { _id: savedUser._id, email: savedUser.email}

diff --git a/routes/files.js b/routes/files.js
@@ -30,9 +30,7 @@ curl -u [email protected]:123456 \
   */
 
 router.post('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], upload.single('file'), (req, res, next) => {
-
-  console.log("asdasd")
-  winston.info("files/users")
+  winston.verbose("files/users")
   return res.status(201).json({
     message: 'File uploded successfully',
     filename: req.file.filename

diff --git a/services/openaiService.js b/services/openaiService.js
@@ -165,12 +165,13 @@ class OpenaiService {
   }
 
   getContentChunks(namespace_id, content_id, engine) {
-    winston.info("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
-    winston.info(kb_endpoint_train + "/id/" + content_id + "/namespace/" + namespace_id)
+    winston.debug("[OPENAI SERVICE] kb endpoint: " + kb_endpoint_train);
+    winston.verbose(kb_endpoint_train + "/id/" + content_id + "/namespace/" + namespace_id)
     return new Promise((resolve, reject) => {
 
       let payload = { engine: engine };
       let token = jwt.sign(payload, secret);
+      console.log("token: ", token)
       axios({
         url: kb_endpoint_train + "/id/" + content_id + "/namespace/" + namespace_id + "/" + token,
         headers: {

diff --git a/test/faqkbRoute.js b/test/faqkbRoute.js
@@ -73,6 +73,60 @@ describe('FaqKBRoute', () => {
 
       })
 
+      it('get-all-chatbots-with-chatbot-token', (done) => {
+
+        var email = "test-signup-" + Date.now() + "@email.com";
+        var pwd = "pwd";
+
+        userService.signup(email, pwd, "Test Firstname", "Test lastname").then(function (savedUser) {
+          projectService.create("test-faqkb-create", savedUser._id).then(function (savedProject) {
+
+            chai.request(server)
+              .post('/' + savedProject._id + '/faq_kb')
+              .auth(email, pwd)
+              .send({ "name": "testbot", type: "external", language: 'fr' })
+              .end((err, res) => {
+
+                if (err) { console.error("err: ", err); }
+                if (log) { console.log("res.body", res.body); }
+
+                res.should.have.status(200);
+                res.body.should.be.a('object');
+
+                let id_faq_kb = res.body._id;
+
+                chai.request(server)
+                    .get('/' + savedProject._id + '/faq_kb/' + id_faq_kb + '/jwt')
+                    .auth(email, pwd)
+                    .end((err, res) => {
+
+                        if (err) { console.error("err: ", err); }
+                        console.log("chatbot token", res.body);
+                        let chatbot_token = res.body.jwt;
+
+                        chai.request(server)
+                          .get('/' + savedProject._id + '/faq_kb/')
+                          .set('Authorization', 'JWT ' + chatbot_token)
+                          .end((err, res) => {
+
+                            if (err) { console.error("err: ", err); }
+                            console.log("res.body", res.body);
+
+                            res.should.have.status(200);
+
+                            done();
+
+                          });
+
+
+                    })
+
+              });
+          });
+        });
+
+      })
+
       it('create-new-chatbot-agent-role', (done) => {
 
         var email = "test-signup-" + Date.now() + "@email.com";

diff --git a/test/kbRoute.js b/test/kbRoute.js
@@ -1465,7 +1465,7 @@ describe('KbRoute', () => {
 
                             if (err) { console.error("err: ", err); }
                             if (log) { console.log("get all namespaces res.body: ", res.body); }
-
+                            console.log("get all namespaces res.body: ", res.body);
                             res.should.have.status(200);
                             res.body.should.be.a('array');
                             expect(res.body.length).to.equal(1);
@@ -1816,6 +1816,7 @@ describe('KbRoute', () => {
             })
         }).timeout(10000)
 
+
         /**
          * Delete namespace
          * !! Unable to test it due to external request