backend-manager 3.2.118 → 3.2.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "3.2.118",
+  "version": "3.2.119",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -76,4 +76,4 @@
     "wonderful-log": "^1.0.5",
     "yargs": "^17.7.2"
   }
-}
+}

package/src/manager/helpers/assistant.js

@@ -610,16 +610,20 @@ BackendAssistant.prototype.authenticate = async function (options) {
     // Check with custom BEM Token
     let storedApiKey;
     try {
-      const workingConfig = self.Manager?.config || functions.config();
-      const storedApiKey = workingConfig?.backend_manager?.key || '';
+      // Disabled this 5/11/24 because i dont know why we would need to do functions.config() if we already have the Manager
+      // const workingConfig = self.Manager?.config || functions.config();
+      storedApiKey = self.Manager?.config?.backend_manager?.key || '';
     } catch (e) {
-
+      // Do nothing
     }
 
+    // Set idToken as working token of either backendManagerKey or authenticationToken
     idToken = data.backendManagerKey || data.authenticationToken;
 
+    // Log the token
     self.log('Found "backendManagerKey" or "authenticationToken" parameter', {storedApiKey: storedApiKey, idToken: idToken});
 
+    // Check if the token is correct
     if (storedApiKey && (storedApiKey === data.backendManagerKey || storedApiKey === data.authenticationToken)) {
       self.request.user.authenticated = true;
       self.request.user.roles.admin = true;

package/src/manager/index.js

@@ -92,10 +92,16 @@ Manager.prototype.init = function (exporter, options) {
   self.project.serviceAccountPath = path.resolve(self.cwd, options.serviceAccountPath);
   self.project.backendManagerConfigPath = path.resolve(self.cwd, options.backendManagerConfigPath);
 
+  // Load package.json
   self.package = resolveProjectPackage();
+
+  // Load config
   self.config = merge(
     requireJSON5(self.project.backendManagerConfigPath),
-    self.libraries.functions ? self.libraries.functions.config() : {}
+    manuallyLoadRuntimeConfig(self.cwd),
+    self.libraries.functions
+      ? self.libraries.functions.config()
+      : {},
   );
 
   // Saved config
@@ -983,4 +989,14 @@ function requireJSON5(p) {
   }
 }
 
+function manuallyLoadRuntimeConfig(cwd) {
+  try {
+    console.log('=====+++', jetpack.list(cwd));
+    console.log('=====+++', require(path.resolve(cwd, '.runtimeconfig.json')));
+    return require(path.resolve(cwd, '.runtimeconfig.json'));
+  } catch (e) {
+    return {};
+  }
+}
+
 module.exports = Manager;