updates

Author: timkpaine

tkp_utils/sqla/models.py

@@ -16,7 +16,7 @@ class User(Base):
 
     _email = Column("email", String, nullable=False, unique=True)
 
-    apikeys = relationship('APIKey', back_populates='client')
+    apikeys = relationship('APIKey', back_populates='user')
     admin = Column(Boolean, default=False)
 
     @hybrid_property

tkp_utils/tests/test_handlers/test_base.py

@@ -3,14 +3,7 @@
 from mock import MagicMock
 from tornado.web import HTTPError
 
-CONTEXT = {'clients': {},
-           'competitions': {},
-           'leaderboards': {},
-           'submissions': {},
-           'stash': [],
-           'all_clients': MagicMock(),
-           'all_competitions': MagicMock(),
-           'all_submissions': MagicMock(),
+CONTEXT = {'users': {},
            'sessionmaker': MagicMock()}
 
 

tkp_utils/tests/test_handlers/test_html.py

@@ -5,14 +5,7 @@
 from mock import MagicMock
 from tornado.web import HTTPError
 
-context = {'clients': {},
-           'competitions': {},
-           'leaderboards': {},
-           'submissions': {},
-           'stash': [],
-           'all_clients': MagicMock(),
-           'all_competitions': MagicMock(),
-           'all_submissions': MagicMock(),
+context = {'users': {},
            'sessionmaker': MagicMock()}
 
 

tkp_utils/tests/test_handlers/test_login.py

@@ -19,14 +19,7 @@ def setup(self):
     def test_LoginHandler(self):
         req = MagicMock()
         req.body = ''
-        context = {'clients': {1234: ''},
-                   'competitions': {},
-                   'leaderboards': {},
-                   'submissions': {},
-                   'stash': [],
-                   'all_clients': MagicMock(),
-                   'all_competitions': MagicMock(),
-                   'all_submissions': MagicMock(),
+        context = {'users': {1234: ''},
                    'sessionmaker': MagicMock()}
 
         x = LoginHandler(self.app, req, **context)

tkp_utils/tests/test_handlers/test_logout.py

@@ -19,14 +19,7 @@ def setup(self):
     def test_LogoutHandler(self):
         req = MagicMock()
         req.body = ''
-        context = {'clients': {1234: ''},
-                   'competitions': {},
-                   'leaderboards': {},
-                   'submissions': {},
-                   'stash': [],
-                   'all_clients': MagicMock(),
-                   'all_competitions': MagicMock(),
-                   'all_submissions': MagicMock(),
+        context = {'users': {1234: ''},
                    'sessionmaker': MagicMock()}
 
         x = LogoutHandler(self.app, req, **context)

tkp_utils/tornado/handlers/login.py

@@ -5,7 +5,7 @@
 
 
 class LoginHandler(ServerHandler):
-    def on_login(self, client):
+    def on_login(self, user):
         pass
 
     @tornado.gen.coroutine

tkp_utils/tornado/handlers/register.py

@@ -24,7 +24,7 @@ def _get(self):
             with self.session() as session:
                 self.write(ujson.dumps(session.query(self.user_sql_class).all()))
         else:
-            self._set_401("Unauthorized to view all clients")
+            self._set_401("Unauthorized to view all users")
 
     @tornado.gen.coroutine
     def post(self):