Merge branch 'master' into example

Author: echarles

docs/source/public_server.rst

@@ -56,7 +56,7 @@ can configure the :attr:`ServerApp.password` setting in
 Prerequisite: A Jupyter server configuration file
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Check to see if you have a Juptyer server configuration file,
+Check to see if you have a Jupyter server configuration file,
 :file:`jupyter_server_config.py`. The default location for this file
 is your Jupyter folder located in your home directory:
 

jupyter_server/extension/application.py

@@ -167,7 +167,7 @@ def _write_browser_open_file(self, url, fh):
         # Ignore server's url
         del url
         path = url_path_join(self.serverapp.base_url, self.default_url)
-        url = self.serverapp.get_url(path=path)
+        url = self.serverapp.get_url(path=path, token=self.serverapp.token)
         jinja2_env = self.serverapp.web_app.settings['jinja2_env']
         template = jinja2_env.get_template('browser-open.html')
         fh.write(template.render(open_url=url))

jupyter_server/serverapp.py

@@ -1386,14 +1386,13 @@ def connection_url(self):
         return self.get_url(ip=ip)
 
     def get_url(self, ip=None, path=None, token=None):
-        """Build a url for the application.
-        """
+        """Build a url for the application with reasonable defaults."""
         if not ip:
-            ip = self.ip
+            ip = self.ip if self.ip else 'localhost'
         if not path:
             path = url_path_join(self.base_url, self.default_url)
         # Build query string.
-        if self.token:
+        if token:
             token = urllib.parse.urlencode({'token': token})
         # Build the URL Parts to dump.
         urlparts = urllib.parse.ParseResult(