diff --git a/wqflask/wqflask/user_manager.py b/wqflask/wqflask/user_manager.py
index 9e666bbd..d03910ca 100644
--- a/wqflask/wqflask/user_manager.py
+++ b/wqflask/wqflask/user_manager.py
@@ -9,6 +9,8 @@ from __future__ import print_function, division, absolute_import
from wqflask import model
+from utility import Bunch
+
from flask import Flask, g
from pprint import pformat as pf
@@ -43,6 +45,37 @@ class UserManager(object):
print(" ID:", dataset.id)
print(" Confidential:", dataset.check_confidentiality())
#print(" ---> self.datasets:", self.datasets)
+
+
+class RegisterUser(object):
+ def __init__(self, kw):
+ self.errors = []
+ user = Bunch()
+
+ user.email_address = kw.get('email_address', '').strip()
+ if not (5 <= len(user.email_address) <= 50):
+ self.errors.append('Email Address needs to be between 5 and 50 characters.')
+
+ user.full_name = kw.get('full_name', '').strip()
+ if not (5 <= len(user.full_name) <= 50):
+ self.errors.append('Full Name needs to be between 5 and 50 characters.')
+
+ user.organization = kw.get('organization', '').strip()
+ if user.organization and not (5 <= len(user.organization) <= 50):
+ self.errors.append('Organization needs to be empty or between 5 and 50 characters.')
+
+ user.password = kw.get('password', '')
+ if not (6 <= len(user.password) <= 30):
+ self.errors.append('Password needs to be between 6 and 30 characters.')
+
+ if kw.get('password_confirm') != user.password:
+ self.errors.append("Passwords don't match.")
+
+ if self.errors:
+ return
+
+
+
class GroupsManager(object):
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 6f14ac8d..9a0401d6 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -23,7 +23,8 @@ import sqlalchemy
from wqflask import app
-from flask import render_template, request, make_response, Response, Flask, g, config, jsonify
+from flask import (render_template, request, make_response, Response,
+ Flask, g, config, jsonify, redirect, url_for)
from wqflask import search_results
from base.data_set import DataSet # Used by YAML in marker_regression
@@ -292,9 +293,32 @@ def manage_groups():
return render_template("admin/group_manager.html", **template_vars.__dict__)
-@app.route("/n/register")
+@app.route("/n/register", methods=('GET', 'POST'))
def new_register():
- return render_template("new_security/register_user.html")
+ params = None
+ errors = None
+ if request.form:
+ params = request.form
+ else:
+ params = request.args
+ if params:
+ result = user_manager.RegisterUser(params)
+ errors = result.errors
+ return render_template("new_security/register_user.html", values=params, errors=errors)
+
+#@app.route("/n/register_submit", methods=('POST',))
+#def register_submit():
+# print("request.args are: ", request.args)
+# result = user_manager.RegisterUser(request.form)
+# if result.errors:
+# print("Redirecting")
+# # 307 preserves the post on the redirect (maybe)
+# errors = result.errors
+# #errors = json.dumps(errors)
+# print("request.args are: ", request.args)
+# return render_template("new_security/register_user.html", errors=errors, values=request.form)
+# #return redirect(url_for('new_register', errors=errors), code=307)
+
@app.route("/n/login")
def new_login():
--
cgit v1.2.3
From a55a1b941864a9574b8177349b8c9c750f379c72 Mon Sep 17 00:00:00 2001
From: Sam
Date: Mon, 7 Oct 2013 02:14:41 -0500
Subject: Worked on logins, session_ids, flash messages, etc.
---
wqflask/secure_server.py | 7 +-
wqflask/utility/__init__.py | 23 ++++
wqflask/wqflask/model.py | 12 +-
wqflask/wqflask/templates/base.html | 29 +++++
wqflask/wqflask/templates/index_page.html | 7 +-
.../wqflask/templates/new_security/login_user.html | 144 ++++++++++++---------
.../wqflask/templates/new_security/thank_you.html | 4 +-
wqflask/wqflask/user_manager.py | 94 +++++++++++---
wqflask/wqflask/views.py | 43 +++---
9 files changed, 260 insertions(+), 103 deletions(-)
(limited to 'wqflask/secure_server.py')
diff --git a/wqflask/secure_server.py b/wqflask/secure_server.py
index df195bd2..a77abf7e 100644
--- a/wqflask/secure_server.py
+++ b/wqflask/secure_server.py
@@ -25,8 +25,11 @@ app.logger.addHandler(file_handler)
import logging_tree
logging_tree.printout()
-import sys
-print("At startup, path is:", sys.path)
+#import sys
+#print("At startup, path is:", sys.path)
+
+from werkzeug.contrib.fixers import ProxyFix
+app.wsgi_app = ProxyFix(app.wsgi_app)
#print("app.config is:", app.config)
diff --git a/wqflask/utility/__init__.py b/wqflask/utility/__init__.py
index d0e4a3fa..d9856eed 100755
--- a/wqflask/utility/__init__.py
+++ b/wqflask/utility/__init__.py
@@ -1,5 +1,6 @@
from pprint import pformat as pf
+# Todo: Move these out of __init__
class Bunch(object):
"""Like a dictionary but using object notation"""
@@ -10,3 +11,25 @@ class Bunch(object):
return pf(self.__dict__)
+class Struct(object):
+ '''The recursive class for building and representing objects with.
+
+ From http://stackoverflow.com/a/6573827/1175849
+
+ '''
+
+ def __init__(self, obj):
+ for k, v in obj.iteritems():
+ if isinstance(v, dict):
+ setattr(self, k, Struct(v))
+ else:
+ setattr(self, k, v)
+
+ def __getitem__(self, val):
+ return self.__dict__[val]
+
+ def __repr__(self):
+ return '{%s}' % str(', '.join('%s : %s' % (k, repr(v)) for
+ (k, v) in self.__dict__.iteritems()))
+
+
diff --git a/wqflask/wqflask/model.py b/wqflask/wqflask/model.py
index 8e7a823e..5c514bde 100644
--- a/wqflask/wqflask/model.py
+++ b/wqflask/wqflask/model.py
@@ -1,7 +1,9 @@
from __future__ import print_function, division, absolute_import
import uuid
+import datetime
+from flask import request
from flask.ext.sqlalchemy import SQLAlchemy
#from flask.ext.security import Security, SQLAlchemyUserDatastore, UserMixin, RoleMixin
@@ -84,9 +86,15 @@ class Login(Base):
__tablename__ = "login"
id = Column(Unicode(36), primary_key=True, default=lambda: unicode(uuid.uuid4()))
user = Column(Unicode(36), ForeignKey('user.id'))
- timestamp = Column(DateTime())
+ timestamp = Column(DateTime(), default=lambda: datetime.datetime.utcnow())
ip_address = Column(Unicode(39))
-
+ successful = Column(Boolean(), nullable=False) # False if wrong password was entered
+ session_id = Column(Text) # Set only if successfully logged in, otherwise should be blank
+
+ def __init__(self, user):
+ self.user = user.id
+ self.ip_address = request.remote_addr
+
# Setup Flask-Security
#user_datastore = SQLAlchemyUserDatastore(db, User, Role)
diff --git a/wqflask/wqflask/templates/base.html b/wqflask/wqflask/templates/base.html
index 6e7119fe..077e4705 100644
--- a/wqflask/wqflask/templates/base.html
+++ b/wqflask/wqflask/templates/base.html
@@ -26,10 +26,39 @@
+{% macro header(main, second) %}
+
+
+ {{ flash_me() }}
+{% endmacro %}
+
+
+{% macro flash_me() -%}
+ {% with messages = get_flashed_messages(with_categories=true) %}
+ {% if messages %}
+
+
+ {% for category, message in messages %}
+
{{ message }}
+ {% endfor %}
+
+ {% endif %}
+ {% endwith %}
+{% endmacro %}
+
+
+