Fix authentication when @scope:registry does not specify trailing sla…

…sh (#2168)

__tests__/commands/install/integration.js

@@ -668,6 +668,20 @@ test('install a scoped module from authed private registry', (): Promise<void> =
   });
 });
 
+test('install a scoped module from authed private registry with a missing trailing slash', (): Promise<void> => {
+  return runInstall({noLockfile: true}, 'install-from-authed-private-registry-no-slash', async (config) => {
+    const authedRequests = request.__getAuthedRequests();
+    assert.equal(authedRequests[0].url, 'https://registry.yarnpkg.com/@types%2flodash');
+    assert.equal(authedRequests[0].headers.authorization, 'Bearer abc123');
+    assert.equal(authedRequests[1].url, 'https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.37.tgz');
+    assert.equal(authedRequests[1].headers.authorization, 'Bearer abc123');
+    assert.equal(
+      (await fs.readFile(path.join(config.cwd, 'node_modules', '@types', 'lodash', 'index.d.ts'))).split('\n')[0],
+      '// Type definitions for Lo-Dash 4.14',
+    );
+  });
+});
+
 test.concurrent('install a module with incompatible optional dependency should skip dependency',
   (): Promise<void> => {
     return runInstall({}, 'install-should-skip-incompatible-optional-dep', async (config) => {

__tests__/fixtures/install/install-from-authed-private-registry-no-slash/.npmrc

@@ -0,0 +1,2 @@
+//registry.yarnpkg.com/:_authToken=abc123
+@types:registry=https://registry.yarnpkg.com

__tests__/fixtures/install/install-from-authed-private-registry-no-slash/package.json

@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@types/lodash": "4.14.37"
+  }
+}

src/registries/npm-registry.js

@@ -172,7 +172,7 @@ export default class NpmRegistry extends Registry {
       registry = registry.replace(/^https?:/, '');
 
       // Check for bearer token.
-      let auth = this.getScopedOption(registry, '_authToken');
+      let auth = this.getScopedOption(registry.replace(/\/?$/, '/'), '_authToken');
       if (auth) {
         return `Bearer ${String(auth)}`;
       }