merge with upstream

tracim/command/__init__.py

@@ -75,17 +75,6 @@ class AppContextCommand(Command):
     #     transaction.commit()
 
 
-# TODO - G.M - 10-04-2018 - [Cleanup][tempExample] - Drop this
-class TestTracimCommand(AppContextCommand):
-
-    def take_app_action(
-            self,
-            parser: argparse.ArgumentParser,
-            app_context: AppEnvironment
-    ) -> None:
-        print('test')
-
-
 class Extender(argparse.Action):
     """
     Copied class from http://stackoverflow.com/a/12461237/801924

tracim/exceptions.py

@@ -85,7 +85,15 @@ class DigestAuthNotImplemented(Exception):
     pass
 
 
-class LoginFailed(TracimException):
+class AuthenticationFailed(TracimException):
+    pass
+
+
+class WrongUserPassword(TracimException):
+    pass
+
+
+class UserNotExist(TracimException):
     pass
 
 

tracim/lib/core/user.py

@@ -7,30 +7,101 @@ import typing as typing
 
 from tracim.exceptions import NotificationNotSend
 from tracim.lib.mail_notifier.notifier import get_email_manager
+from sqlalchemy.orm import Session
+
+from tracim import CFG
 from tracim.models.auth import User
+from sqlalchemy.orm.exc import NoResultFound
+from tracim.exceptions import WrongUserPassword, UserNotExist
+from tracim.exceptions import AuthenticationFailed
+from tracim.models.context_models import UserInContext
 
 
 class UserApi(object):
 
-    def __init__(self, current_user: typing.Optional[User], session, config):
+    def __init__(
+            self,
+            current_user: typing.Optional[User],
+            session: Session,
+            config: CFG,
+    ) -> None:
         self._session = session
         self._user = current_user
         self._config = config
 
-    def get_all(self):
-        return self._session.query(User).order_by(User.display_name).all()
-
     def _base_query(self):
         return self._session.query(User)
 
-    def get_one(self, user_id: int):
-        return self._base_query().filter(User.user_id==user_id).one()
+    def get_user_with_context(self, user: User) -> UserInContext:
+        """
+        Return UserInContext object from User
+        """
+        user = UserInContext(
+            user=user,
+            dbsession=self._session,
+            config=self._config,
+        )
+        return user
+
+    # Getters
+
+    def get_one(self, user_id: int) -> User:
+        """
+        Get one user by user id
+        """
+        return self._base_query().filter(User.user_id == user_id).one()
 
-    def get_one_by_email(self, email: str):
-        return self._base_query().filter(User.email==email).one()
+    def get_one_by_email(self, email: str) -> User:
+        """
+        Get one user by email
+        :param email: Email of the user
+        :return: one user
+        """
+        return self._base_query().filter(User.email == email).one()
 
+    # FIXME - G.M - 24-04-2018 - Duplicate method with get_one.
     def get_one_by_id(self, id: int) -> User:
-        return self._base_query().filter(User.user_id==id).one()
+        return self.get_one(user_id=id)
+
+    def get_current_user(self) -> User:
+        """
+        Get current_user
+        """
+        if not self._user:
+            raise UserNotExist()
+        return self._user
+
+    def get_all(self) -> typing.Iterable[User]:
+        return self._session.query(User).order_by(User.display_name).all()
+
+    # Check methods
+
+    def user_with_email_exists(self, email: str) -> bool:
+        try:
+            self.get_one_by_email(email)
+            return True
+        # TODO - G.M - 09-04-2018 - Better exception
+        except:
+            return False
+
+    def authenticate_user(self, email: str, password: str) -> User:
+        """
+        Authenticate user with email and password, raise AuthenticationFailed
+        if uncorrect.
+        :param email: email of the user
+        :param password: cleartext password of the user
+        :return: User who was authenticated.
+        """
+        try:
+            user = self.get_one_by_email(email)
+            if user.validate_password(password):
+                return user
+            else:
+                raise WrongUserPassword()
+        except (WrongUserPassword, NoResultFound):
+            raise AuthenticationFailed()
+
+    # Actions
 
     def update(
             self,
@@ -40,7 +111,7 @@ class UserApi(object):
             password: str=None,
             timezone: str='',
             do_save=True,
-    ):
+    ) -> None:
         if name is not None:
             user.display_name = name
 
@@ -55,14 +126,6 @@ class UserApi(object):
         if do_save:
             self.save(user)
 
-    def user_with_email_exists(self, email: str):
-        try:
-            self.get_one_by_email(email)
-            return True
-        # TODO - G.M - 09-04-2018 - Better exception
-        except:
-            return False
-
     def create_user(
         self,
         email,

tracim/models/context_models.py

@@ -8,6 +8,16 @@ from tracim.models import User
 from tracim.models.auth import Profile
 
 
+class LoginCredentials(object):
+    """
+    Login credentials model for login
+    """
+
+    def __init__(self, email: str, password: str):
+        self.email = email
+        self.password = password
+
+
 class UserInContext(object):
     """
     Interface to get User data and User data related to context.

tracim/tests/library/test_user_api.py

@@ -4,7 +4,10 @@ from sqlalchemy.orm.exc import NoResultFound
 
 import transaction
 
+from tracim.exceptions import UserNotExist, AuthenticationFailed
 from tracim.lib.core.user import UserApi
+from tracim.models import User
+from tracim.models.context_models import UserInContext
 from tracim.tests import DefaultTest
 from tracim.tests import eq_
 
@@ -68,7 +71,7 @@ class TestUserApi(DefaultTest):
         eq_(True, api.user_with_email_exists('bibi@bibi'))
         eq_(False, api.user_with_email_exists('unknown'))
 
-    def test_unit__get_one_by_email__ok__nominal_case(self):
+    def test_get_one_by_email(self):
         api = UserApi(
             current_user=None,
             session=self.session,
@@ -82,7 +85,7 @@ class TestUserApi(DefaultTest):
 
         eq_(uid, api.get_one_by_email('bibi@bibi').user_id)
 
-    def test_unit__get_one_by_email__ok__user_not_found(self):
+    def test_unit__get_one_by_email__err__user_does_not_exist(self):
         api = UserApi(
             current_user=None,
             session=self.session,
@@ -113,3 +116,75 @@ class TestUserApi(DefaultTest):
         api.update(u, 'titi', 'titi@titi', 'pass', do_save=True)
         one = api.get_one(u.user_id)
         eq_(u.user_id, one.user_id)
+
+    def test_unit__get_user_with_context__nominal_case(self):
+        user = User(
+            email='admin@tracim.tracim',
+            display_name='Admin',
+            is_active=True,
+        )
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        new_user = api.get_user_with_context(user)
+        assert isinstance(new_user, UserInContext)
+        assert new_user.user == user
+        assert new_user.profile.name == 'nobody'
+        assert new_user.user_id == user.user_id
+        assert new_user.email == 'admin@tracim.tracim'
+        assert new_user.display_name == 'Admin'
+        assert new_user.is_active is True
+        # TODO - G.M - 03-05-2018 - [avatar][calendar] Should test this
+        # with true value when those param will be available.
+        assert new_user.avatar_url is None
+        assert new_user.calendar_url is None
+
+    def test_unit__get_current_user_ok__nominal_case(self):
+        user = User(email='admin@tracim.tracim')
+        api = UserApi(
+            current_user=user,
+            session=self.session,
+            config=self.config,
+        )
+        new_user = api.get_current_user()
+        assert isinstance(new_user, User)
+        assert user == new_user
+
+    def test_unit__get_current_user__err__user_not_exist(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        with pytest.raises(UserNotExist):
+            api.get_current_user()
+
+    def test_unit__authenticate_user___ok__nominal_case(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        user = api.authenticate_user('admin@admin.admin', 'admin@admin.admin')
+        assert isinstance(user, User)
+        assert user.email == 'admin@admin.admin'
+
+    def test_unit__authenticate_user___err__wrong_password(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        with pytest.raises(AuthenticationFailed):
+            api.authenticate_user('admin@admin.admin', 'wrong_password')
+
+    def test_unit__authenticate_user___err__wrong_user(self):
+        api = UserApi(
+            current_user=None,
+            session=self.session,
+            config=self.config,
+        )
+        with pytest.raises(AuthenticationFailed):
+            api.authenticate_user('unknown_user', 'wrong_password')

tracim/tests/views/test_example.py

@@ -1,67 +0,0 @@
-# -*- coding: utf-8 -*-
-# TODO - G.M - [Cleanup][tempExample] Drop this file
-# import unittest
-# import transaction
-#
-# from pyramid import testing
-#
-#
-# def dummy_request(dbsession):
-#     return testing.DummyRequest(dbsession=dbsession)
-#
-#
-# class BaseTest(unittest.TestCase):
-#     def setUp(self):
-#         self.config = testing.setUp(settings={
-#             'sqlalchemy.url': 'sqlite:///:memory:'
-#         })
-#         self.config.include('tracim.models')
-#         settings = self.config.get_settings()
-#
-#         from tracim.models import (
-#             get_engine,
-#             get_session_factory,
-#             get_tm_session,
-#             )
-#
-#         self.engine = get_engine(settings)
-#         session_factory = get_session_factory(self.engine)
-#
-#         self.session = get_tm_session(session_factory, transaction.manager)
-#
-#     def init_database(self):
-#         from tracim.models.meta import DeclarativeBase
-#         DeclarativeBase.metadata.create_all(self.engine)
-#
-#     def tearDown(self):
-#         from tracim.models.meta import DeclarativeBase
-#
-#         testing.tearDown()
-#         transaction.abort()
-#         DeclarativeBase.metadata.drop_all(self.engine)
-#
-#
-# class TestMyViewSuccessCondition(BaseTest):
-#
-#     def setUp(self):
-#         super(TestMyViewSuccessCondition, self).setUp()
-#         self.init_database()
-#
-#         from tracim.models import MyModel
-#
-#         model = MyModel(name='one', value=55)
-#         self.session.add(model)
-#
-#     def test_passing_view(self):
-#         from tracim.views.default import my_view
-#         info = my_view(dummy_request(self.session))
-#         self.assertEqual(info['one'].name, 'one')
-#         self.assertEqual(info['project'], 'tracim')
-#
-#
-# class TestMyViewFailureCondition(BaseTest):
-#
-#     def test_failing_view(self):
-#         from tracim.views.default import my_view
-#         info = my_view(dummy_request(self.session))
-#         self.assertEqual(info.status_int, 500)

tracim/views/core_api/schemas.py

@@ -1,5 +1,8 @@
 # coding=utf-8
 import marshmallow
+from marshmallow import post_load
+
+from tracim.models.context_models import LoginCredentials, UserInContext
 
 
 class ProfileSchema(marshmallow.Schema):
@@ -8,6 +11,7 @@ class ProfileSchema(marshmallow.Schema):
 
 
 class UserSchema(marshmallow.Schema):
+
     user_id = marshmallow.fields.Int(dump_only=True)
     email = marshmallow.fields.Email(required=True)
     display_name = marshmallow.fields.String()
@@ -29,9 +33,14 @@ class UserSchema(marshmallow.Schema):
 
 
 class BasicAuthSchema(marshmallow.Schema):
+
     email = marshmallow.fields.Email(required=True)
     password = marshmallow.fields.String(required=True, load_only=True)
 
+    @post_load
+    def make_login(self, data):
+        return LoginCredentials(**data)
+
 
 class LoginOutputHeaders(marshmallow.Schema):
     expire_after = marshmallow.fields.String()

tracim/views/core_api/session_controller.py

@@ -1,31 +1,20 @@
 # coding=utf-8
 from pyramid.config import Configurator
-from sqlalchemy.orm.exc import NoResultFound
-
-from tracim.lib.core.content import ContentApi
-from tracim.lib.core.group import GroupApi
-from tracim.lib.core.userworkspace import RoleApi
-from tracim.lib.core.workspace import WorkspaceApi
-from tracim.models import Group
-from tracim.models.data import ContentType
-
 try:  # Python 3.5+
     from http import HTTPStatus
 except ImportError:
     from http import client as HTTPStatus
 
-
 from tracim import TracimRequest
 from tracim.extensions import hapic
 from tracim.lib.core.user import UserApi
-from tracim.models.context_models import UserInContext
 from tracim.views.controllers import Controller
 from tracim.views.core_api.schemas import UserSchema
 from tracim.views.core_api.schemas import NoContentSchema
 from tracim.views.core_api.schemas import LoginOutputHeaders
 from tracim.views.core_api.schemas import BasicAuthSchema
 from tracim.exceptions import NotAuthentificated
-from tracim.exceptions import LoginFailed
+from tracim.exceptions import AuthenticationFailed
 
 
 class SessionController(Controller):
@@ -33,41 +22,26 @@ class SessionController(Controller):
     @hapic.with_api_doc()
     @hapic.input_headers(LoginOutputHeaders())
     @hapic.input_body(BasicAuthSchema())
-    @hapic.handle_exception(LoginFailed, http_code=HTTPStatus.BAD_REQUEST)
+    @hapic.handle_exception(AuthenticationFailed, HTTPStatus.BAD_REQUEST)
     # TODO - G.M - 17-04-2018 - fix output header ?
     # @hapic.output_headers()
-    @hapic.output_body(
-        NoContentSchema(),
-        default_http_code=HTTPStatus.NO_CONTENT
-    )
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def login(self, context, request: TracimRequest, hapic_data=None):
         """
         Logs user into the system
         """
-        email = request.json_body['email']
-        password = request.json_body['password']
+
+        login = hapic_data.body
         app_config = request.registry.settings['CFG']
-        try:
-            uapi = UserApi(
-                None,
-                session=request.dbsession,
-                config=app_config,
-            )
-            user = uapi.get_one_by_email(email)
-            valid_password = user.validate_password(password)
-            if not valid_password:
-                # Bad password
-                raise LoginFailed('Bad Credentials')
-        except NoResultFound:
-            # User does not exist
-            raise LoginFailed('Bad Credentials')
-        return
+        uapi = UserApi(
+            None,
+            session=request.dbsession,
+            config=app_config,
+        )
+        return uapi.authenticate_user(login.email, login.password)
 
     @hapic.with_api_doc()
-    @hapic.output_body(
-        NoContentSchema(),
-        default_http_code=HTTPStatus.NO_CONTENT
-    )
+    @hapic.output_body(NoContentSchema(), default_http_code=HTTPStatus.NO_CONTENT)  # nopep8
     def logout(self, context, request: TracimRequest, hapic_data=None):
         """
         Logs out current logged in user session
@@ -76,23 +50,20 @@ class SessionController(Controller):
         return
 
     @hapic.with_api_doc()
-    @hapic.handle_exception(
-        NotAuthentificated,
-        http_code=HTTPStatus.UNAUTHORIZED
-    )
-    @hapic.output_body(
-        UserSchema(),
-    )
+    @hapic.handle_exception(NotAuthentificated, HTTPStatus.UNAUTHORIZED)
+    @hapic.output_body(UserSchema(),)
     def whoami(self, context, request: TracimRequest, hapic_data=None):
         """
         Return current logged in user or 401
         """
         app_config = request.registry.settings['CFG']
-        return UserInContext(
-            user=request.current_user,
-            dbsession=request.dbsession,
+        uapi = UserApi(
+            request.current_user,
+            session=request.dbsession,
             config=app_config,
         )
+        user = uapi.get_current_user()  # User
+        return uapi.get_user_with_context(user)
 
     def bind(self, configurator: Configurator):