Add user info table

dev-requirements.txt

@@ -2,3 +2,4 @@ codecov
 flake8
 pytest
 pytest-asyncio
+notebook==5.7.2

nativeauthenticator/handlers.py

@@ -30,7 +30,8 @@ async def get(self):
 
     async def post(self):
         username = self.get_body_argument('username', strip=False)
-        user = self.authenticator.get_or_create_user(username)
+        password = self.get_body_argument('password', strip=False)
+        user = self.authenticator.get_or_create_user(username, password)
         html = self.render_template(
                  'signup.html',
                  result=bool(user),

nativeauthenticator/nativeauthenticator.py

@@ -1,22 +1,34 @@
-from jupyterhub import orm
+from jupyterhub.orm import User
 from jupyterhub.auth import Authenticator
 
+from sqlalchemy import inspect
 from tornado import gen
 
 from .handlers import SignUpHandler
+from .orm import UserInfo
 
 
 class NativeAuthenticator(Authenticator):
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        inspector = inspect(self.db.bind)
+        if 'users_info' not in inspector.get_table_names():
+            UserInfo.__table__.create(self.db.bind)
+
     @gen.coroutine
     def authenticate(self, handler, data):
         return data['username']
 
-    def get_or_create_user(self, username):
-        user = orm.User.find(self.db, username)
+    def get_or_create_user(self, username, password):
+        user = User.find(self.db, username)
         if not user:
-            user = orm.User(name=username, admin=False)
+            user = User(name=username, admin=False)
             self.db.add(user)
+
+        user_info = UserInfo(username=username, password=password)
+        self.db.add(user_info)
         return user
 
     def get_handlers(self, app):

nativeauthenticator/orm.py

@@ -0,0 +1,20 @@
+from sqlalchemy import (
+    Column, Integer, String
+)
+from sqlalchemy.ext.declarative import declarative_base
+
+Base = declarative_base()
+
+
+class UserInfo(Base):
+    __tablename__ = 'users_info'
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    username = Column(String, nullable=False)
+    password = Column(String, nullable=False)
+
+    @classmethod
+    def find(cls, db, username):
+        """Find a user info record by name.
+        Returns None if not found.
+        """
+        return db.query(cls).filter(cls.username == username).first()

nativeauthenticator/tests/test_authenticator.py

@@ -1,6 +1,6 @@
 import pytest
 from unittest.mock import Mock
-
+from jupyterhub.tests.mocking import MockHub
 
 from nativeauthenticator import NativeAuthenticator
 
@@ -10,14 +10,27 @@ def tmpcwd(tmpdir):
     tmpdir.chdir()
 
 
+@pytest.fixture
+def app():
+    hub = MockHub()
+    hub.init_db()
+    return hub
+
+
 # use pytest-asyncio
 pytestmark = pytest.mark.asyncio
 # run each test in a temporary working directory
 pytestmark = pytestmark(pytest.mark.usefixtures("tmpcwd"))
 
 
-async def test_basic(tmpcwd):
-    auth = NativeAuthenticator()
+async def test_basic(tmpcwd, app):
+    auth = NativeAuthenticator(db=app.db)
     response = await auth.authenticate(Mock(), {'username': 'name',
                                                 'password': '123'})
     assert response == 'name'
+
+
+async def test_handlers(app):
+    auth = NativeAuthenticator(db=app.db)
+    handlers = auth.get_handlers(app)
+    assert handlers[1][0] == '/signup'