Merge 3d31ebf into 9906dea

firebase · Aug 20, 2019 · 2038ddc · 2038ddc
2 parents 9906dea + 3d31ebf
commit 2038ddc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 207 deletions.
diff --git a/src/commands/index.js b/src/commands/index.js
@@ -75,8 +75,6 @@ module.exports = function(client) {
   client.target.apply = loadCommand("target-apply");
   client.target.clear = loadCommand("target-clear");
   client.target.remove = loadCommand("target-remove");
-  client.tools = {};
-  client.tools.migrate = loadCommand("tools-migrate");
   client.use = loadCommand("use");
 
   if (previews.mods || previews.ext) {

diff --git a/src/commands/tools-migrate.js b/src/commands/tools-migrate.js
diff --git a/src/identifierToProjectId.js b/src/identifierToProjectId.js
diff --git a/src/requireAccess.ts b/src/requireAccess.ts
@@ -4,7 +4,6 @@ import * as clc from "cli-color";
 import * as getInstanceId from "./getInstanceId";
 import * as getProjectId from "./getProjectId";
 import { FirebaseError } from "./error";
-import * as identifierToProjectId from "./identifierToProjectId";
 import * as requireAuth from "./requireAuth";
 
 export function requireAccess(options: any): Promise<any> {
@@ -28,34 +27,10 @@ export function requireAccess(options: any): Promise<any> {
         return Promise.reject(err);
       }
 
-      return identifierToProjectId(projectId).then((realProjectId) => {
-        if (realProjectId) {
-          let fixCommand = "firebase use " + realProjectId;
-          if (options.projectAlias) {
-            fixCommand += " --alias " + options.projectAlias;
-          }
-
-          return Promise.reject(
-            new FirebaseError(
-              "Tried to access unrecognized project " +
-                clc.bold(projectId) +
-                ", but found matching instance for project " +
-                clc.bold(realProjectId) +
-                ".\n\n" +
-                "To use " +
-                clc.bold(realProjectId) +
-                " instead, run:\n\n  " +
-                clc.bold(fixCommand),
-              { exit: 1 }
-            )
-          );
-        }
-
-        return Promise.reject(
-          new FirebaseError("Unable to authorize access to project " + clc.bold(projectId), {
-            exit: 1,
-          })
-        );
-      });
+      return Promise.reject(
+        new FirebaseError("Unable to authorize access to project " + clc.bold(projectId), {
+          exit: 1,
+        })
+      );
     });
 }
diff --git a/src/test/identifierToProjectId.spec.js b/src/test/identifierToProjectId.spec.js