From 9db91e3b166f07750a045d5e24f820837f5772b4 Mon Sep 17 00:00:00 2001
From: SerenaFeng <feng.xiaowei@zte.com.cn>
Date: Fri, 27 Oct 2017 16:28:48 +0800
Subject: divide resources into handlers and models

divide resources into handlers&models
put ui handlers into handlers directory
put User into user_models.py

Change-Id: I3d9e260097205213c3ea8d4eac08b9019e017f71
Signed-off-by: SerenaFeng <feng.xiaowei@zte.com.cn>
---
 testapi/opnfv_testapi/ui/__init__.py      |  0
 testapi/opnfv_testapi/ui/auth/__init__.py |  0
 testapi/opnfv_testapi/ui/auth/sign.py     | 59 -------------------------------
 testapi/opnfv_testapi/ui/auth/user.py     | 33 -----------------
 testapi/opnfv_testapi/ui/root.py          | 10 ------
 5 files changed, 102 deletions(-)
 delete mode 100644 testapi/opnfv_testapi/ui/__init__.py
 delete mode 100644 testapi/opnfv_testapi/ui/auth/__init__.py
 delete mode 100644 testapi/opnfv_testapi/ui/auth/sign.py
 delete mode 100644 testapi/opnfv_testapi/ui/auth/user.py
 delete mode 100644 testapi/opnfv_testapi/ui/root.py

(limited to 'testapi/opnfv_testapi/ui')

diff --git a/testapi/opnfv_testapi/ui/__init__.py b/testapi/opnfv_testapi/ui/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/testapi/opnfv_testapi/ui/auth/__init__.py b/testapi/opnfv_testapi/ui/auth/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/testapi/opnfv_testapi/ui/auth/sign.py b/testapi/opnfv_testapi/ui/auth/sign.py
deleted file mode 100644
index 318473e..0000000
--- a/testapi/opnfv_testapi/ui/auth/sign.py
+++ /dev/null
@@ -1,59 +0,0 @@
-from cas import CASClient
-from tornado import gen
-from tornado import web
-
-from opnfv_testapi.common import constants
-from opnfv_testapi.common.config import CONF
-from opnfv_testapi.db import api as dbapi
-from opnfv_testapi.resources import handlers
-
-
-class SignBaseHandler(handlers.GenericApiHandler):
-    def __init__(self, application, request, **kwargs):
-        super(SignBaseHandler, self).__init__(application, request, **kwargs)
-        self.table = 'users'
-        self.cas_client = CASClient(version='2',
-                                    server_url=CONF.lfid_cas_url,
-                                    service_url='{}/{}'.format(
-                                        CONF.ui_url,
-                                        CONF.lfid_signin_return))
-
-
-class SigninHandler(SignBaseHandler):
-    def get(self):
-        self.redirect(url=(self.cas_client.get_login_url()))
-
-
-class SigninReturnHandler(SignBaseHandler):
-
-    @web.asynchronous
-    @gen.coroutine
-    def get(self):
-        ticket = self.get_query_argument('ticket', default=None)
-        if ticket:
-            (user, attrs, _) = self.cas_client.verify_ticket(ticket=ticket)
-            login_user = {
-                'user': user,
-                'email': attrs.get('mail'),
-                'fullname': attrs.get('field_lf_full_name'),
-                'groups': constants.TESTAPI_USERS + attrs.get('group', [])
-            }
-            q_user = {'user': user}
-            db_user = yield dbapi.db_find_one(self.table, q_user)
-            if not db_user:
-                dbapi.db_save(self.table, login_user)
-            else:
-                dbapi.db_update(self.table, q_user, login_user)
-
-            self.clear_cookie(constants.TESTAPI_ID)
-            self.set_secure_cookie(constants.TESTAPI_ID, user)
-
-            self.redirect(url=CONF.ui_url)
-
-
-class SignoutHandler(SignBaseHandler):
-    def get(self):
-        """Handle signout request."""
-        self.clear_cookie(constants.TESTAPI_ID)
-        logout_url = self.cas_client.get_logout_url(redirect_url=CONF.ui_url)
-        self.redirect(url=logout_url)
diff --git a/testapi/opnfv_testapi/ui/auth/user.py b/testapi/opnfv_testapi/ui/auth/user.py
deleted file mode 100644
index ff2c2a9..0000000
--- a/testapi/opnfv_testapi/ui/auth/user.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from opnfv_testapi.common import constants
-from opnfv_testapi.common import raises
-from opnfv_testapi.common.config import CONF
-from opnfv_testapi.resources import handlers
-from opnfv_testapi.resources import models
-
-
-class User(models.ModelBase):
-    def __init__(self, user=None, email=None, fullname=None, groups=None):
-        self.user = user
-        self.email = email
-        self.fullname = fullname
-        self.groups = groups
-
-
-class UserHandler(handlers.GenericApiHandler):
-    def __init__(self, application, request, **kwargs):
-        super(UserHandler, self).__init__(application, request, **kwargs)
-        self.table = 'users'
-        self.table_cls = User
-
-    def get(self):
-        if CONF.api_authenticate:
-            username = self.get_secure_cookie(constants.TESTAPI_ID)
-            if username:
-                self._get_one(query={'user': username})
-            else:
-                raises.Unauthorized('Unauthorized')
-        else:
-            self.finish_request(User('anonymous',
-                                     'anonymous@linuxfoundation.com',
-                                     'anonymous lf',
-                                     constants.TESTAPI_USERS).format())
diff --git a/testapi/opnfv_testapi/ui/root.py b/testapi/opnfv_testapi/ui/root.py
deleted file mode 100644
index 286a6b0..0000000
--- a/testapi/opnfv_testapi/ui/root.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from opnfv_testapi.common.config import CONF
-from opnfv_testapi.resources import handlers
-
-
-class RootHandler(handlers.GenericApiHandler):
-    def get_template_path(self):
-        return CONF.ui_static_path
-
-    def get(self):
-        self.render('testapi-ui/index.html')
-- 
cgit 1.2.3-korg