Merge 39b1d3a into 589387b

firebase · Jun 18, 2019 · 6beca7e · 6beca7e
2 parents 589387b + 39b1d3a
commit 6beca7e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/emulator/constants.ts b/src/emulator/constants.ts
@@ -14,6 +14,7 @@ const DEFAULT_HOST = "localhost";
 export class Constants {
   static SERVICE_FIRESTORE = "firestore.googleapis.com";
   static SERVICE_REALTIME_DATABASE = "firebaseio.com";
+  static DEFAULT_DATABASE_EMULATOR_NAMESPACE = "fake-server";
 
   static getDefaultHost(emulator: Emulators): string {
     return DEFAULT_HOST;

diff --git a/src/emulator/functionsEmulator.ts b/src/emulator/functionsEmulator.ts
@@ -588,8 +588,19 @@ You can probably fix this by running "npm install ${
     );
     logger.debug(`addDatabaseTrigger`, JSON.stringify(bundle));
     return new Promise((resolve, reject) => {
+      let setTriggersPath = `http://localhost:${databasePort}/.settings/functionTriggers.json`;
+      if (projectId !== "") {
+        setTriggersPath += `?ns=${projectId}`;
+      } else {
+        EmulatorLogger.log(
+          "WARN",
+          `No project in use. Registering function trigger for sentinel namespace '${
+            Constants.DEFAULT_DATABASE_EMULATOR_NAMESPACE
+          }'`
+        );
+      }
       request.put(
-        `http://localhost:${databasePort}/.settings/functionTriggers.json`,
+        setTriggersPath,
         {
           auth: {
             bearer: "owner",