@wabot-dev/framework 0.1.0-beta.62 → 0.1.0-beta.64

package/dist/src/addon/auth/api-key/ApiKeyConnectionGuardMiddleware.js

@@ -2,7 +2,6 @@ import { __decorate, __metadata } from 'tslib';
 import { Auth } from '../../../core/auth/Auth.js';
 import { CustomError } from '../../../core/error/CustomError.js';
 import { injectable } from '../../../core/injection/index.js';
-import { ApiKey } from './ApiKey.js';
 import { ApiKeyRepository } from './ApiKeyRepository.js';
 
 let ApiKeyConnectionGuardMiddleware = class ApiKeyConnectionGuardMiddleware {
@@ -19,8 +18,8 @@ let ApiKeyConnectionGuardMiddleware = class ApiKeyConnectionGuardMiddleware {
                 authorization = authorization[0];
             }
             if (authorization) {
-                const [bearer, token] = authorization.split(' ');
-                if (bearer.toLowerCase() !== 'api-key' || !token) {
+                const [prefix, token] = authorization.split(' ');
+                if (prefix.toLowerCase() !== 'api-key' || !token) {
                     throw new CustomError({
                         httpCode: 401,
                         message: 'Authorization should be an Api-Key',
@@ -34,10 +33,8 @@ let ApiKeyConnectionGuardMiddleware = class ApiKeyConnectionGuardMiddleware {
             throw new CustomError({ httpCode: 401, message: 'Token not available' });
         }
         try {
-            const keyData = ApiKey.inflate(keySecret);
-            const apiKey = await this.apiKeyRepository.findOrThrow(keyData.id);
-            apiKey.validatePassword(keyData.pass);
-            this.auth.assign(apiKey.authInfo);
+            const authInfo = await this.apiKeyRepository.findAuthInfo(keySecret);
+            this.auth.assign(authInfo);
         }
         catch (err) {
             throw new CustomError({

package/dist/src/addon/auth/jwt/JwtConnectionGuardMiddleware.js

@@ -19,8 +19,8 @@ let JwtConnectionGuardMiddleware = class JwtConnectionGuardMiddleware {
                 authorization = authorization[0];
             }
             if (authorization) {
-                const [bearer, token] = authorization.split(' ');
-                if (bearer.toLowerCase() !== 'bearer' || !token) {
+                const [prefix, token] = authorization.split(' ');
+                if (prefix.toLowerCase() !== 'bearer' || !token) {
                     throw new CustomError({
                         httpCode: 401,
                         message: 'Authorization should be a bearer token',

package/dist/src/addon/chat-bot/wabot/WabotChatAdapter.js

@@ -19,7 +19,7 @@ let WabotChatAdapter = class WabotChatAdapter {
         const response = await fetch(this.baseUrl + '/chat-bot/next-item', {
             method: 'post',
             headers: {
-                Authorization: `Bearer ${this.apiKey}`,
+                Authorization: `Api-Key ${this.apiKey}`,
                 'Content-Type': 'application/json',
             },
             body: JSON.stringify(req),

package/dist/src/feature/mindset/MindsetOperator.js

@@ -111,12 +111,24 @@ let MindsetOperator = class MindsetOperator {
             if (!response) {
                 return 'success';
             }
-            return response.toString();
+            return this.functionResponseToString(response);
         }
         catch (error) {
             return `Error: ${error}`;
         }
     }
+    functionResponseToString(response) {
+        const type = typeof response;
+        if (type === 'string') {
+            return response;
+        }
+        else if (type === 'boolean' || type === 'number') {
+            return `${response}`;
+        }
+        else {
+            return JSON.stringify(response);
+        }
+    }
 };
 MindsetOperator = __decorate([
     injectable(),

package/dist/src/index.d.ts

@@ -566,6 +566,7 @@ declare class MindsetOperator implements IMindset {
     protected tool(fn: IMindsetFunctionMetadata, module: IMindsetModuleMetadata): IMindsetTool;
     protected toolParameter(param: IMindsetFunctionParamMetadata): IMindsetToolParameter;
     callFunction(name: string, params: string): Promise<string>;
+    functionResponseToString(response: any): string;
 }
 
 interface IChatMessage extends IStorableData {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wabot-dev/framework",
-  "version": "0.1.0-beta.62",
+  "version": "0.1.0-beta.64",
   "description": "Framework for IA Chat Bots",
   "type": "module",
   "main": "dist/src/index.js",