commenting out call to een.logout until they fix it
parent
b02ba38eea
commit
094b7b754f
19
app.py
19
app.py
|
@ -99,6 +99,7 @@ def landing():
|
||||||
@login_required
|
@login_required
|
||||||
def index():
|
def index():
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
# using current_user as a proxy for an established valid session
|
# using current_user as a proxy for an established valid session
|
||||||
|
@ -150,6 +151,7 @@ def index():
|
||||||
|
|
||||||
@app.route('/login_callback')
|
@app.route('/login_callback')
|
||||||
def login_callback():
|
def login_callback():
|
||||||
|
|
||||||
# This is getting the ?code= querystring value from the HTTP request.
|
# This is getting the ?code= querystring value from the HTTP request.
|
||||||
code = request.args.get('code')
|
code = request.args.get('code')
|
||||||
|
|
||||||
|
@ -167,11 +169,12 @@ def login_callback():
|
||||||
|
|
||||||
|
|
||||||
@app.route('/logout')
|
@app.route('/logout')
|
||||||
@login_required
|
|
||||||
def logout():
|
def logout():
|
||||||
if 'een' in session:
|
|
||||||
een = session['een']
|
# logout isn't working APIv3 right now so don't wait for the call to fail before logging out
|
||||||
een.logout()
|
# if 'een' in session:
|
||||||
|
# een = session['een']
|
||||||
|
# een.logout()
|
||||||
|
|
||||||
session.pop('een')
|
session.pop('een')
|
||||||
|
|
||||||
|
@ -182,6 +185,7 @@ def logout():
|
||||||
@login_required
|
@login_required
|
||||||
def cameras():
|
def cameras():
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
logging.debug(een.get_list_of_cameras())
|
logging.debug(een.get_list_of_cameras())
|
||||||
|
@ -201,6 +205,7 @@ def cameras():
|
||||||
@login_required
|
@login_required
|
||||||
def accounts():
|
def accounts():
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
een.get_list_of_accounts()
|
een.get_list_of_accounts()
|
||||||
|
@ -217,9 +222,11 @@ def accounts():
|
||||||
@app.route('/switch_account')
|
@app.route('/switch_account')
|
||||||
@login_required
|
@login_required
|
||||||
def switch_account():
|
def switch_account():
|
||||||
|
|
||||||
# This is getting the ?account= querystring value from the HTTP request.
|
# This is getting the ?account= querystring value from the HTTP request.
|
||||||
account = request.args.get('account')
|
account = request.args.get('account')
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
if (account):
|
if (account):
|
||||||
|
@ -236,6 +243,7 @@ def switch_account():
|
||||||
@login_required
|
@login_required
|
||||||
def camera__preivew_image(esn=None):
|
def camera__preivew_image(esn=None):
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
camera = een.get_camera_by_id(esn)
|
camera = een.get_camera_by_id(esn)
|
||||||
|
@ -251,6 +259,7 @@ def camera__preivew_image(esn=None):
|
||||||
@login_required
|
@login_required
|
||||||
def camera_live_preivew(esn=None):
|
def camera_live_preivew(esn=None):
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
camera = een.get_camera_by_id(esn)
|
camera = een.get_camera_by_id(esn)
|
||||||
|
@ -268,6 +277,7 @@ def camera_live_preivew(esn=None):
|
||||||
@login_required
|
@login_required
|
||||||
def camera_detail(esn=None, days=DAYS_OF_HISTORY):
|
def camera_detail(esn=None, days=DAYS_OF_HISTORY):
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
camera = een.get_camera_by_id(esn)
|
camera = een.get_camera_by_id(esn)
|
||||||
|
@ -291,6 +301,7 @@ def camera_detail(esn=None, days=DAYS_OF_HISTORY):
|
||||||
@login_required
|
@login_required
|
||||||
def camera_status_plot(esn=None):
|
def camera_status_plot(esn=None):
|
||||||
|
|
||||||
|
# get een instance from session, @login_required already checked for it
|
||||||
een = session['een']
|
een = session['een']
|
||||||
|
|
||||||
cam = een.get_camera_by_id(esn)
|
cam = een.get_camera_by_id(esn)
|
||||||
|
|
Loading…
Reference in New Issue