aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2018-04-16 22:15:24 +0000
committerzsloan2018-04-16 22:15:24 +0000
commit273b79a0c2096a2eae5ce9aa2800917437459f68 (patch)
tree18bd909221706ac2375d603bee7d7e52f82aa0ef
parent8abe2be79c7b3e89cf1d245cff64d0bda7730b45 (diff)
downloadgenenetwork2-273b79a0c2096a2eae5ce9aa2800917437459f68.tar.gz
Removed some unused code from collect.py and user_manager.py
-rw-r--r--wqflask/wqflask/collect.py4
-rw-r--r--wqflask/wqflask/user_manager.py64
2 files changed, 2 insertions, 66 deletions
diff --git a/wqflask/wqflask/collect.py b/wqflask/wqflask/collect.py
index 04035e96..2bd4b721 100644
--- a/wqflask/wqflask/collect.py
+++ b/wqflask/wqflask/collect.py
@@ -123,10 +123,6 @@ class AnonCollection(object):
collections_list.append(collection_dict)
Redis.set(self.key, json.dumps(collections_list))
- #Redis.sadd(self.key, *list(traits))
- #Redis.expire(self.key, 60 * 60 * 24 * 5)
- #len_now = len(Redis.smembers(self.key))
- #report_change(len_before, len_now)
def remove_traits(self, params):
traits_to_remove = [(":").join(trait.split(":")[:2]) for trait in params.getlist('traits[]')]
diff --git a/wqflask/wqflask/user_manager.py b/wqflask/wqflask/user_manager.py
index 5f6c818e..0e56ebd3 100644
--- a/wqflask/wqflask/user_manager.py
+++ b/wqflask/wqflask/user_manager.py
@@ -13,7 +13,6 @@ import urlparse
import simplejson as json
-#from redis import StrictRedis
import redis # used for collections
Redis = redis.StrictRedis()
@@ -42,7 +41,6 @@ from smtplib import SMTP
from utility.tools import SMTP_CONNECT, SMTP_USERNAME, SMTP_PASSWORD, LOG_SQL_ALCHEMY
THREE_DAYS = 60 * 60 * 24 * 3
-#THREE_DAYS = 45
def timestamp():
return datetime.datetime.utcnow().isoformat()
@@ -66,16 +64,6 @@ class AnonUser(object):
def set_cookie(response):
response.set_cookie(self.cookie_name, self.cookie)
- def add_collection(self, new_collection):
- collection_dict = dict(name = new_collection.name,
- created_timestamp = datetime.datetime.utcnow().strftime('%b %d %Y %I:%M%p'),
- changed_timestamp = datetime.datetime.utcnow().strftime('%b %d %Y %I:%M%p'),
- num_members = new_collection.num_members,
- members = new_collection.get_members())
-
- Redis.set(self.key, json.dumps(collection_dict))
- Redis.expire(self.key, 60 * 60 * 24 * 5)
-
def delete_collection(self, collection_name):
existing_collections = self.get_collections()
updated_collections = []
@@ -171,19 +159,11 @@ class UserSession(object):
self.session_id = session_id
self.record = Redis.hgetall(self.redis_key)
-
if not self.record:
# This will occur, for example, when the browser has been left open over a long
# weekend and the site hasn't been visited by the user
self.logged_in = False
- ########### Grrr...this won't work because of the way flask handles cookies
- # Delete the cookie
- #response = make_response(redirect(url_for('login')))
- #response.set_cookie(self.cookie_name, '', expires=0)
- #flash(
- # "Due to inactivity your session has expired. If you'd like please login again.")
- #return response
return
if Redis.ttl(self.redis_key) < THREE_DAYS:
@@ -218,7 +198,6 @@ class UserSession(object):
self.db_object = model.User.query.get(self.user_id)
return self.db_object
-
def delete_session(self):
# And more importantly delete the redis record
Redis.delete(self.cookie_name)
@@ -234,12 +213,10 @@ class UsersManager(object):
self.users = model.User.query.all()
logger.debug("Users are:", self.users)
-
class UserManager(object):
def __init__(self, kw):
self.user_id = kw['user_id']
logger.debug("In UserManager locals are:", pf(locals()))
- #self.user = model.User.get(user_id)
#logger.debug("user is:", user)
self.user = model.User.query.get(self.user_id)
logger.debug("user is:", self.user)
@@ -253,10 +230,8 @@ class UserManager(object):
logger.debug(" Confidential:", dataset.check_confidentiality())
#logger.debug(" ---> self.datasets:", self.datasets)
-
class RegisterUser(object):
def __init__(self, kw):
- self.thank_you_mode = False
self.errors = []
self.user = Bunch()
es = kw.get('es_connection', None)
@@ -304,7 +279,6 @@ def set_password(password, user):
pwfields.algorithm = "pbkdf2"
pwfields.hashfunc = "sha256"
- #hashfunc = getattr(hashlib, pwfields.hashfunc)
# Encoding it to base64 makes storing it in json much easier
pwfields.salt = base64.b64encode(os.urandom(32))
@@ -333,7 +307,6 @@ def set_password(password, user):
sort_keys=True,
)
-
class VerificationEmail(object):
template_name = "email/verification.txt"
key_prefix = "verification_code"
@@ -348,7 +321,6 @@ class VerificationEmail(object):
)
Redis.set(key, data)
- #two_days = 60 * 60 * 24 * 2
Redis.expire(key, THREE_DAYS)
to = user.email_address
subject = self.subject
@@ -463,7 +435,6 @@ def password_reset_step2():
logger.debug("locals are:", locals())
-
user = Bunch()
password = request.form['password']
set_password(password, user)
@@ -489,8 +460,6 @@ class DecodeUser(object):
def __init__(self, code_prefix):
verify_url_hmac(request.url)
- #params = urlparse.parse_qs(url)
-
self.verification_code = request.args['code']
self.user = self.actual_get_user(code_prefix, self.verification_code)
@@ -662,8 +631,6 @@ class LoginUser(object):
else:
import_col = "false"
- #g.cookie_session.import_traits_to_user()
-
return self.actual_login(user, import_collections=import_col)
else:
@@ -691,7 +658,6 @@ class LoginUser(object):
login_rec.successful = True
login_rec.session_id = str(uuid.uuid4())
login_rec.assumed_by = assumed_by
- #session_id = "session_id:{}".format(login_rec.session_id)
session_id_signature = actual_hmac_creation(login_rec.session_id)
session_id_signed = login_rec.session_id + ":" + session_id_signature
logger.debug("session_id_signed:", session_id_signed)
@@ -726,7 +692,6 @@ def logout():
response.set_cookie(UserSession.cookie_name, '', expires=0)
return response
-
@app.route("/n/forgot_password")
def forgot_password():
"""Entry point for forgotten password"""
@@ -742,13 +707,7 @@ def forgot_password_submit():
user_details = get_user_by_unique_column(es, "email_address", email_address)
if user_details:
ForgotPasswordEmail(user_details["email_address"])
- # try:
- # user = model.User.query.filter_by(email_address=email_address).one()
- # except orm.exc.NoResultFound:
- # flash("Couldn't find a user associated with the email address {}. Sorry.".format(
- # email_address))
- # return redirect(url_for("login"))
- # ForgotPasswordEmail(user)
+
return render_template("new_security/forgot_password_step2.html",
subject=ForgotPasswordEmail.subject)
@@ -765,8 +724,6 @@ def super_only():
flash("You must be a superuser to access that page.", "alert-error")
abort(401)
-
-
@app.route("/manage/users")
def manage_users():
super_only()
@@ -807,13 +764,11 @@ def assume_identity():
assumed_by = g.user_session.user_id
return LoginUser().actual_login(user, assumed_by=assumed_by)
-
@app.route("/n/register", methods=('GET', 'POST'))
def register():
params = None
errors = None
-
params = request.form if request.form else request.args
params = params.to_dict(flat=True)
es = get_elasticsearch_connection()
@@ -830,7 +785,6 @@ def register():
return render_template("new_security/register_user.html", values=params, errors=errors)
-
################################# Sign and unsign #####################################
def url_for_hmac(endpoint, **values):
@@ -849,7 +803,6 @@ def data_hmac(stringy):
"""Takes arbitray data string and appends :hmac so we know data hasn't been tampered with"""
return stringy + ":" + actual_hmac_creation(stringy)
-
def verify_url_hmac(url):
"""Pass in a url that was created with url_hmac and this assures it hasn't been tampered with"""
logger.debug("url passed in to verify is:", url)
@@ -884,13 +837,6 @@ app.jinja_env.globals.update(url_for_hmac=url_for_hmac,
#######################################################################################
-# def send_email(to, subject, body):
-# msg = json.dumps(dict(From="no-reply@genenetwork.org",
-# To=to,
-# Subject=subject,
-# Body=body))
-# Redis.rpush("mail_queue", msg)
-
def send_email(toaddr, msg, fromaddr="no-reply@genenetwork.org"):
"""Send an E-mail through SMTP_CONNECT host. If SMTP_USERNAME is not
'UNKNOWN' TLS is used
@@ -915,10 +861,4 @@ def send_email(toaddr, msg, fromaddr="no-reply@genenetwork.org"):
class GroupsManager(object):
def __init__(self, kw):
- self.datasets = create_datasets_list()
-
-
-class RolesManager(object):
- def __init__(self):
- self.roles = model.Role.query.all()
- logger.debug("Roles are:", self.roles)
+ self.datasets = create_datasets_list() \ No newline at end of file