alberanid/eventman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix login redirect

Browse source
This commit is contained in:
Davide Alberani 2016-07-09 17:18:07 +02:00
parent 20b11886af
commit bb3fb40995
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
angular_app/js/app.js vendored
View file

@ -33,6 +33,7 @@ var eventManApp = angular.module('eventManApp', [
eventManApp.run(['$rootScope', '$state', '$stateParams', '$log', 'Info', eventManApp.run(['$rootScope', '$state', '$stateParams', '$log', 'Info',
function($rootScope, $state, $stateParams, $log, Info) { function($rootScope, $state, $stateParams, $log, Info) {
$rootScope.app_uuid = guid(); $rootScope.app_uuid = guid();
$rootScope.info = {};
$log.debug('App UUID: ' + $rootScope.app_uuid); $log.debug('App UUID: ' + $rootScope.app_uuid);
$rootScope.$state = $state; $rootScope.$state = $state;
$rootScope.$stateParams = $stateParams; $rootScope.$stateParams = $stateParams;
@ -42,7 +43,9 @@ eventManApp.run(['$rootScope', '$state', '$stateParams', '$log', 'Info',
$rootScope.readInfo = function(callback) { $rootScope.readInfo = function(callback) {
Info.get({}, function(data) { Info.get({}, function(data) {
$rootScope.info = data || {}; $rootScope.info = data || {};
if (callback) { if (data.authentication_required && !(data.user && data.user._id)) {
$state.go('login');
} else if (callback) {
callback(data); callback(data);
} }
}); });

4
angular_app/js/controllers.js vendored
View file

@ -7,8 +7,8 @@ var eventManControllers = angular.module('eventManControllers', []);
/* A controller that can be used to navigate. */ /* A controller that can be used to navigate. */
eventManControllers.controller('NavigationCtrl', ['$scope', '$rootScope', '$location', 'Setting', 'Info', eventManControllers.controller('NavigationCtrl', ['$scope', '$rootScope', '$location', 'Setting', 'Info', '$state',
function ($scope, $rootScope, $location, Setting, Info) { function ($scope, $rootScope, $location, Setting, Info, $state) {
$scope.logo = {}; $scope.logo = {};
$scope.getLocation = function() { $scope.getLocation = function() {

10
eventman_server.py
View file

@ -244,7 +244,6 @@ class RootHandler(BaseHandler):
angular_app_path = os.path.join(os.path.dirname(__file__), "angular_app") angular_app_path = os.path.join(os.path.dirname(__file__), "angular_app")
@gen.coroutine @gen.coroutine
@authenticated
def get(self, *args, **kwargs): def get(self, *args, **kwargs):
# serve the ./angular_app/index.html file # serve the ./angular_app/index.html file
with open(self.angular_app_path + "/index.html", 'r') as fd: with open(self.angular_app_path + "/index.html", 'r') as fd:
@ -866,12 +865,12 @@ class SettingsHandler(BaseHandler):
class InfoHandler(BaseHandler): class InfoHandler(BaseHandler):
"""Handle requests for information about the logged in user.""" """Handle requests for information about the logged in user."""
@gen.coroutine @gen.coroutine
@authenticated
def get(self, **kwds): def get(self, **kwds):
info = {} info = {}
user_info = self.current_user_info user_info = self.current_user_info
if user_info: if user_info:
info['user'] = user_info info['user'] = user_info
info['authentication_required'] = self.authentication
self.write({'info': info}) self.write({'info': info})
@ -904,7 +903,7 @@ class WebSocketEventUpdatesHandler(tornado.websocket.WebSocketHandler):
logging.warn('WebSocketEventUpdatesHandler.on_close error closing websocket: %s', str(e)) logging.warn('WebSocketEventUpdatesHandler.on_close error closing websocket: %s', str(e))
class LoginHandler(BaseHandler): class LoginHandler(RootHandler):
"""Handle user authentication requests.""" """Handle user authentication requests."""
@gen.coroutine @gen.coroutine
@ -914,9 +913,6 @@ class LoginHandler(BaseHandler):
self.set_status(401) self.set_status(401)
self.write({'error': True, self.write({'error': True,
'message': 'authentication required'}) 'message': 'authentication required'})
else:
with open(self.angular_app_path + "/login.html", 'r') as fd:
self.write(fd.read())
@gen.coroutine @gen.coroutine
def post(self, *args, **kwargs): def post(self, *args, **kwargs):
@ -1024,7 +1020,7 @@ def run():
template_path=os.path.join(os.path.dirname(__file__), "templates"), template_path=os.path.join(os.path.dirname(__file__), "templates"),
static_path=os.path.join(os.path.dirname(__file__), "static"), static_path=os.path.join(os.path.dirname(__file__), "static"),
cookie_secret='__COOKIE_SECRET__', cookie_secret='__COOKIE_SECRET__',
login_url='/login', login_url='/#/login',
debug=options.debug) debug=options.debug)
ssl_options = {} ssl_options = {}
if os.path.isfile(options.ssl_key) and os.path.isfile(options.ssl_cert): if os.path.isfile(options.ssl_key) and os.path.isfile(options.ssl_cert):