mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-18 21:49:37 -04:00
remove remember_me cookie and related code
This commit is contained in:
@@ -471,8 +471,7 @@ def register_errorhandlers(application):
|
||||
|
||||
|
||||
def setup_event_handlers():
|
||||
from flask.ext.login import user_logged_in, user_login_confirmed
|
||||
from app.event_handlers import on_user_logged_in, on_user_login_confirmed
|
||||
from flask.ext.login import user_logged_in
|
||||
from app.event_handlers import on_user_logged_in
|
||||
|
||||
user_logged_in.connect(on_user_logged_in)
|
||||
user_login_confirmed.connect(on_user_login_confirmed)
|
||||
|
||||
@@ -39,10 +39,6 @@ class Config(object):
|
||||
NOTIFY_LOG_LEVEL = 'DEBUG'
|
||||
NOTIFY_LOG_PATH = '/var/log/notify/application.log'
|
||||
PERMANENT_SESSION_LIFETIME = 20 * 60 * 60 # 20 hours
|
||||
REMEMBER_COOKIE_DURATION = timedelta(days=1)
|
||||
REMEMBER_COOKIE_HTTPONLY = True
|
||||
REMEMBER_COOKIE_NAME = 'notify_admin_remember_me'
|
||||
REMEMBER_COOKIE_SECURE = True
|
||||
SEND_FILE_MAX_AGE_DEFAULT = 365 * 24 * 60 * 60 # 1 year
|
||||
SESSION_COOKIE_HTTPONLY = True
|
||||
SESSION_COOKIE_NAME = 'notify_admin_session'
|
||||
@@ -81,7 +77,6 @@ class Config(object):
|
||||
|
||||
class Development(Config):
|
||||
DEBUG = True
|
||||
REMEMBER_COOKIE_SECURE = False
|
||||
SESSION_COOKIE_SECURE = False
|
||||
WTF_CSRF_ENABLED = False
|
||||
SESSION_PROTECTION = None
|
||||
|
||||
@@ -6,11 +6,6 @@ def on_user_logged_in(sender, user):
|
||||
_send_event(sender, event_type='sucessful_login', user=user)
|
||||
|
||||
|
||||
# should change the event type? This is a remember me login.
|
||||
def on_user_login_confirmed(sender):
|
||||
_send_event(sender, event_type='sucessful_login_remember_me', user=current_user)
|
||||
|
||||
|
||||
def _send_event(sender, **kwargs):
|
||||
from flask import request
|
||||
try:
|
||||
|
||||
@@ -11,7 +11,6 @@ from flask import (
|
||||
|
||||
from flask_login import (
|
||||
current_user,
|
||||
login_fresh,
|
||||
confirm_login
|
||||
)
|
||||
|
||||
@@ -49,19 +48,6 @@ def sign_in():
|
||||
else:
|
||||
invite_api_client.accept_invite(invited_user['service'], invited_user['id'])
|
||||
if user:
|
||||
# Remember me login
|
||||
if not login_fresh() and \
|
||||
not current_user.is_anonymous and \
|
||||
current_user.id == user.id and \
|
||||
user.is_active:
|
||||
|
||||
confirm_login()
|
||||
services = service_api_client.get_active_services({'user_id': str(user.id)}).get('data', [])
|
||||
if (len(services) == 1):
|
||||
return redirect(url_for('main.service_dashboard', service_id=services[0]['id']))
|
||||
else:
|
||||
return redirect(url_for('main.choose_service'))
|
||||
|
||||
session['user_details'] = {"email": user.email_address, "id": user.id}
|
||||
if user.is_active:
|
||||
user_api_client.send_verify_code(user.id, 'sms', user.mobile_number)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from flask_login import UserMixin, AnonymousUserMixin, login_fresh
|
||||
from flask_login import UserMixin, AnonymousUserMixin
|
||||
from flask import session
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@ class User(UserMixin):
|
||||
@property
|
||||
def is_authenticated(self):
|
||||
return (
|
||||
login_fresh() and
|
||||
not self.logged_in_elsewhere() and
|
||||
super(User, self).is_authenticated
|
||||
)
|
||||
|
||||
@@ -40,21 +40,9 @@
|
||||
Used to keep you logged in
|
||||
</td>
|
||||
<td>
|
||||
1 hour
|
||||
20 hours
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
notify_admin_remember_me
|
||||
</td>
|
||||
<td width="50%">
|
||||
Used to let you sign in again on the same day, without requiring 2-factor authentication
|
||||
</td>
|
||||
<td>
|
||||
24 hours
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user