backend-manager 3.2.37 → 3.2.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.37",
+  "version": "3.2.39",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/helpers/assistant.js

@@ -564,8 +564,6 @@ BackendAssistant.prototype.authenticate = async function (options) {
   options = options || {};
   options.resolve = typeof options.resolve === 'undefined' ? true : options.resolve;
 
-  const logOptions = {environment: options.log ? 'production' : 'development'}
-
   function _resolve(user) {
     user = user || {};
     user.authenticated = typeof user.authenticated === 'undefined'
@@ -583,11 +581,11 @@ BackendAssistant.prototype.authenticate = async function (options) {
   if (req?.headers?.authorization && req?.headers?.authorization?.startsWith('Bearer ')) {
     // Read the ID Token from the Authorization header.
     idToken = req.headers.authorization.split('Bearer ')[1];
-    self.log('Found "Authorization" header', idToken, logOptions);
+    self.log('Found "Authorization" header', idToken);
   } else if (req?.cookies?.__session) {
     // Read the ID Token from cookie.
     idToken = req.cookies.__session;
-    self.log('Found "__session" cookie', idToken, logOptions);
+    self.log('Found "__session" cookie', idToken);
   } else if (data.backendManagerKey || data.authenticationToken) {
     // Check with custom BEM Token
     let storedApiKey;
@@ -600,7 +598,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
 
     idToken = data.backendManagerKey || data.authenticationToken;
 
-    self.log('Found "backendManagerKey" or "authenticationToken" parameter', {storedApiKey: storedApiKey, idToken: idToken}, logOptions);
+    self.log('Found "backendManagerKey" or "authenticationToken" parameter', {storedApiKey: storedApiKey, idToken: idToken});
 
     if (storedApiKey && (storedApiKey === data.backendManagerKey || storedApiKey === data.authenticationToken)) {
       self.request.user.authenticated = true;
@@ -609,7 +607,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
     }
   } else if (options.apiKey || data.apiKey) {
     const apiKey = options.apiKey || data.apiKey;
-    self.log('Found "options.apiKey"', apiKey, logOptions);
+    self.log('Found "options.apiKey"', apiKey);
 
     if (apiKey.includes('test')) {
       return _resolve(self.request.user);
@@ -634,7 +632,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
     //   'Make sure you authenticate your request by providing either the following HTTP header:',
     //   'Authorization: Bearer <Firebase ID Token>',
     //   'or by passing a "__session" cookie',
-    //   'or by passing backendManagerKey or authenticationToken in the body or query', logOptions);
+    //   'or by passing backendManagerKey or authenticationToken in the body or query');
 
     return _resolve(self.request.user);
   }
@@ -643,7 +641,7 @@ BackendAssistant.prototype.authenticate = async function (options) {
   try {
     const decodedIdToken = await admin.auth().verifyIdToken(idToken);
     if (options.debug) {
-      self.log('Token correctly decoded', decodedIdToken.email, decodedIdToken.user_id, logOptions);
+      self.log('Token correctly decoded', decodedIdToken.email, decodedIdToken.user_id);
     }
     await admin.firestore().doc(`users/${decodedIdToken.user_id}`)
     .get()
@@ -655,12 +653,12 @@ BackendAssistant.prototype.authenticate = async function (options) {
       self.request.user.auth.uid = decodedIdToken.user_id;
       self.request.user.auth.email = decodedIdToken.email;
       if (options.debug) {
-        self.log('Found user doc', self.request.user, logOptions)
+        self.log('Found user doc', self.request.user)
       }
     })
     return _resolve(self.request.user);
   } catch (error) {
-    self.error('Error while verifying Firebase ID token:', error, logOptions);
+    self.error('Error while verifying Firebase ID token:', error);
     return _resolve(self.request.user);
   }
 };

package/src/manager/libraries/openai.js

@@ -86,13 +86,15 @@ OpenAI.prototype.request = function (options) {
         return;
       }
 
-      _log('callOpenAI():', ...arguments);
+      assistant.log('callOpenAI():', ...arguments);
     }
 
     function _load(input) {
       // console.log('*** input!!!', input.content.slice(0, 50), input.path);
       // console.log('*** input.content', input.content.slice(0, 50));
       // console.log('*** input.path', input.path);
+      _log('Loading', input);
+
       return powertools.template(
         input.path ? jetpack.read(input.path) : input.content,
         input.settings,
@@ -100,6 +102,7 @@ OpenAI.prototype.request = function (options) {
       .trim();
     }
 
+    // Log
     _log('Starting', self.key);
     _log('Starting', options);
 
@@ -111,6 +114,7 @@ OpenAI.prototype.request = function (options) {
       ? { type: 'json_object' }
       : undefined;
 
+    // Log
     _log('Prompt', prompt);
     _log('Message', message);
     _log('User', user);