fix: 🐛 incorrect resource and registry url while install on sub direc…

…tory
verdaccio · Oct 31, 2017 · 67e97a1 · 67e97a1
1 parent aa7fb65
commit 67e97a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/api/web/index.js b/src/api/web/index.js
@@ -33,7 +33,9 @@ module.exports = function(config, auth, storage) {
   });
 
   router.get('/-/verdaccio/logo', function(req, res) {
-    res.send(_.get(config, 'web.logo') || '/-/static/logo.png');
+    const installPath = _.get(config, 'url_prefix', '');
+
+    res.send(_.get(config, 'web.logo') || `${installPath}/-/static/logo.png`);
   });
 
   router.get('/', function(req, res) {

diff --git a/src/webui/src/components/Header/index.js b/src/webui/src/components/Header/index.js
@@ -138,16 +138,19 @@ export default class Header extends React.Component {
   }
 
   render() {
+    // Don't add slash if it's not a sub directory
+    const registryURL = `${location.origin}${location.pathname === '/' ? '' : location.pathname}`;
+
     return (
       <header className={ classes.header }>
         <div className={ classes.headerWrap }>
           <Link to="/">
             <img src={ this.state.logo } className={ classes.logo } />
           </Link>
           <figure>
-            npm set registry { location.origin }
+            npm set registry { registryURL }
             <br/>
-            npm adduser --registry { location.origin }
+            npm adduser --registry { registryURL }
           </figure>
           {this.renderUserActionButton()}
         </div>

diff --git a/src/webui/src/components/Help/index.js b/src/webui/src/components/Help/index.js
@@ -9,6 +9,9 @@ import classes from './help.scss';
 registerLanguage('javascript', js);
 
 const Help = () => {
+  // Don't add slash if it's not a sub directory
+  const registryURL = `${location.origin}${location.pathname === '/' ? '' : location.pathname}`;
+
     return (
       <div className={classes.help}>
         <li className={classes.noPkg}>
@@ -24,11 +27,11 @@ const Help = () => {
               1. Login
             </strong>
             <SyntaxHighlighter language='javascript' style={sunburst}>
-              {`npm adduser --registry  ${location.origin}`}
+              {`npm adduser --registry  ${registryURL}`}
             </SyntaxHighlighter>
             <strong>2. Publish</strong>
             <SyntaxHighlighter language='javascript' style={sunburst}>
-              {`npm publish --registry ${location.origin}`}
+              {`npm publish --registry ${registryURL}`}
             </SyntaxHighlighter>
             <strong>3. Refresh this page!</strong>
           </p>