pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup from the rebase; use config for cookies, login values

Browse Source
This commit is contained in:
dandds
2018-06-12 09:17:45 -04:00
parent d573c5459b
commit 7e689dd120
4 changed files with 35 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
atst/app.py
View File

@@ -12,51 +12,55 @@ from atst.handlers.dev import Dev
from atst.home import home
from atst.api_client import ApiClient
routes = [
url(r"/", Login, {"page": "login"}, name="main"),
url(r"/login", Login, {"page": "login"}, name="login"),
url(r"/home", MainHandler, {"page": "home"}, name="home"),
url(r"/workspaces", Workspace, {"page": "workspaces"}, name="workspaces"),
url(r"/requests", Request, {"page": "requests"}, name="requests"),
url(r"/requests/new", RequestNew, {"page": "requests_new"}, name="request_new"),
url(
r"/requests/new/([0-9])",
RequestNew,
{"page": "requests_new"},
name="request_form",
),
url(r"/users", MainHandler, {"page": "users"}, name="users"),
url(r"/reports", MainHandler, {"page": "reports"}, name="reports"),
url(r"/calculator", MainHandler, {"page": "calculator"}, name="calculator"),
]
env = os.getenv("TORNADO_ENV", "development")
if not env == "production":
routes += [url(r"/login-dev", Dev, {"action": "login"}, name="dev-login")]
ENV = os.getenv("TORNADO_ENV", "dev")
def make_app(config):
authz_client = ApiClient(config['default']['AUTHZ_BASE_URL'])
authz_client = ApiClient(config["default"]["AUTHZ_BASE_URL"])
routes = [
url(r"/", Login, {"page": "login"}, name="main"),
url(r"/login", Login, {"page": "login"}, name="login"),
url(r"/home", MainHandler, {"page": "home"}, name="home"),
url(
r"/workspaces",
Workspace,
{"page": "workspaces", "authz_client": authz_client},
name="workspaces",
),
url(r"/requests", Request, {"page": "requests"}, name="requests"),
url(r"/requests/new", RequestNew, {"page": "requests_new"}, name="request_new"),
url(
r"/requests/new/([0-9])",
RequestNew,
{"page": "requests_new"},
name="request_form",
),
url(r"/users", MainHandler, {"page": "users"}, name="users"),
url(r"/reports", MainHandler, {"page": "reports"}, name="reports"),
url(r"/calculator", MainHandler, {"page": "calculator"}, name="calculator"),
]
if not ENV == "production":
routes += [url(r"/login-dev", Dev, {"action": "login"}, name="dev-login")]
app = tornado.web.Application(
routes,
login_url="/login",
template_path = home.child('templates'),
static_path = home.child('static'),
cookie_secret=config["default"]["COOKIE_SECRET"],
debug=config['default'].getboolean('DEBUG')
)
return app
def make_config():
BASE_CONFIG_FILENAME = os.path.join(
os.path.dirname(__file__),
'../config/base.ini',
)
BASE_CONFIG_FILENAME = os.path.join(os.path.dirname(__file__), "../config/base.ini")
ENV_CONFIG_FILENAME = os.path.join(
os.path.dirname(__file__),
'../config/',
'{}.ini'.format(os.getenv('TORNADO_ENV', 'dev').lower())
"../config/",
"{}.ini".format(ENV.lower()),
)
config = ConfigParser()