get rid of single-user cookie_name

it's unused now that single-user uses OAuth

jupyterhub/handlers/base.py

@@ -246,8 +246,6 @@ class BaseHandler(RequestHandler):
         kwargs = {}
         if self.subdomain_host:
             kwargs['domain'] = self.domain
-        if user and user.server:
-            self.clear_cookie(user.server.cookie_name, path=user.server.base_url, **kwargs)
         self.clear_cookie(self.hub.cookie_name, path=self.hub.base_url, **kwargs)
         self.clear_cookie('jupyterhub-services', path=url_path_join(self.base_url, 'services'))
 

jupyterhub/singleuser.py

@@ -228,12 +228,6 @@ class SingleUserNotebookApp(NotebookApp):
             value = value + '/'
         return value
 
-    @default('cookie_name')
-    def _cookie_name_default(self):
-        if os.environ.get('JUPYTERHUB_SERVICE_NAME'):
-            # if I'm a service, use the services cookie name
-            return 'jupyterhub-services'
-
     @default('port')
     def _port_default(self):
         if os.environ.get('JUPYTERHUB_SERVICE_URL'):

jupyterhub/user.py

@@ -112,23 +112,20 @@ class User(HasTraits):
     def spawner_class(self):
         return self.settings.get('spawner_class', LocalProcessSpawner)
 
-    def __init__(self, orm_user, settings, **kwargs):
+    def __init__(self, orm_user, settings=None, **kwargs):
         self.orm_user = orm_user
-        self.settings = settings
+        self.settings = settings or {}
         super().__init__(**kwargs)
 
         self.allow_named_servers = self.settings.get('allow_named_servers', False)
 
-        hub = self.settings['hub']
-        self.cookie_name = '%s-%s' % (hub.cookie_name, quote(self.name, safe=''))
-
         self.base_url = url_path_join(
             self.settings.get('base_url', '/'), 'user', self.escaped_name)
 
         self.spawner = self.spawner_class(
             user=self,
             db=self.db,
-            hub=hub,
+            hub=self.settings.get('hub'),
             authenticator=self.authenticator,
             config=self.settings.get('config'),
         )
@@ -233,7 +230,6 @@ class User(HasTraits):
 
         orm_server = orm.Server(
             name=server_name,
-            cookie_name=self.cookie_name,
             base_url=base_url,
         )
         self.servers.append(orm_server)