Skip to content

some tests using hypothesis #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

some tests using hypothesis #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3029e30
some tests using hypothesis
d3prof3t Jan 23, 2017
7be89b4
fixed str/unicode conflicts due to py2 and py3
d3prof3t Jan 23, 2017
8eb318b
fixed some failing test cases
d3prof3t Jan 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ venv
temp
tmp
__pycache__
.hypothesis

*.pyc
*.sqlite
Expand Down
7 changes: 7 additions & 0 deletions project/server/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# project/server/__init__.py

import os
import sys

from flask import Flask
from flask_bcrypt import Bcrypt
from flask_sqlalchemy import SQLAlchemy

if sys.version_info >= (3, 4):
py_version = 3
elif sys.version_info >= (2, 7):
py_version = 2

app = Flask(__name__)

app_settings = os.getenv(
Expand All @@ -18,4 +24,5 @@
db = SQLAlchemy(app)

from project.server.auth.views import auth_blueprint

app.register_blueprint(auth_blueprint)
152 changes: 93 additions & 59 deletions project/server/auth/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from flask import Blueprint, request, make_response, jsonify
from flask.views import MethodView

from project.server import bcrypt, db
from project.server import bcrypt, db, py_version
from project.server.models import User, BlacklistToken

auth_blueprint = Blueprint('auth', __name__)
Expand All @@ -18,81 +18,113 @@ class RegisterAPI(MethodView):
def post(self):
# get the post data
post_data = request.get_json()
# check if user already exists
user = User.query.filter_by(email=post_data.get('email')).first()
if not user:
try:
user = User(
email=post_data.get('email'),
password=post_data.get('password')
)
# insert the user
db.session.add(user)
db.session.commit()
# generate the auth token
auth_token = user.encode_auth_token(user.id)
responseObject = {
'status': 'success',
'message': 'Successfully registered.',
'auth_token': auth_token.decode()
}
return make_response(jsonify(responseObject)), 201
except Exception as e:
responseObject = {
'status': 'fail',
'message': 'Some error occurred. Please try again.'
}
return make_response(jsonify(responseObject)), 401
else:
responseObject = {
'status': 'fail',
'message': 'User already exists. Please Log in.',
}
return make_response(jsonify(responseObject)), 202
# validate post data
if py_version == 3:
if isinstance(post_data['email'], str) and isinstance(post_data['password'], str):
is_str = True
elif py_version == 2:
if isinstance(post_data['email'], unicode) and isinstance(post_data['password'], unicode):
is_str = True
if is_str:
if '@' in post_data['email'] and '.' in post_data['email'] and len(post_data['email']) >= 4 and len(
post_data['password']) >= 6:
# check if user already exists
user = User.query.filter_by(email=post_data.get('email')).first()
if not user:
try:
user = User(
email=post_data.get('email'),
password=post_data.get('password')
)
# insert the user
db.session.add(user)
db.session.commit()
# generate the auth token
auth_token = user.encode_auth_token(user.id)
responseObject = {
'status': 'success',
'message': 'Successfully registered.',
'auth_token': auth_token.decode()
}
return make_response(jsonify(responseObject)), 201
except Exception as e:
responseObject = {
'status': 'fail',
'message': 'Some error occurred. Please try again.'
}
return make_response(jsonify(responseObject)), 401
else:
responseObject = {
'status': 'fail',
'message': 'User already exists. Please Log in.',
}
return make_response(jsonify(responseObject)), 202
responseObject = {
'status': 'fail',
'message': 'Email or Password format is not correct.',
}
return make_response(jsonify(responseObject)), 202


class LoginAPI(MethodView):
"""
User Login Resource
"""

def post(self):
# get the post data
post_data = request.get_json()
try:
# fetch the user data
user = User.query.filter_by(
email=post_data.get('email')
).first()
if user and bcrypt.check_password_hash(
user.password, post_data.get('password')
):
auth_token = user.encode_auth_token(user.id)
if auth_token:
# validate post data
if py_version == 3:
if isinstance(post_data['email'], str) and isinstance(post_data['password'], str):
is_str = True
elif py_version == 2:
if isinstance(post_data['email'], unicode) and isinstance(post_data['password'], unicode):
is_str = True
if is_str:
if '@' in post_data['email'] and '.' in post_data['email'] and len(post_data['email']) >= 4 and len(
post_data['password']) >= 6:
try:
# fetch the user data
user = User.query.filter_by(
email=post_data.get('email')
).first()
if user and bcrypt.check_password_hash(
user.password, post_data.get('password')
):
auth_token = user.encode_auth_token(user.id)
if auth_token:
responseObject = {
'status': 'success',
'message': 'Successfully logged in.',
'auth_token': auth_token.decode()
}
return make_response(jsonify(responseObject)), 200
else:
responseObject = {
'status': 'fail',
'message': 'User does not exist.'
}
return make_response(jsonify(responseObject)), 404
except Exception as e:
print(e)
responseObject = {
'status': 'success',
'message': 'Successfully logged in.',
'auth_token': auth_token.decode()
'status': 'fail',
'message': 'Email or Password format is not correct.'
}
return make_response(jsonify(responseObject)), 200
else:
responseObject = {
'status': 'fail',
'message': 'User does not exist.'
}
return make_response(jsonify(responseObject)), 404
except Exception as e:
print(e)
responseObject = {
'status': 'fail',
'message': 'Try again'
}
return make_response(jsonify(responseObject)), 500
return make_response(jsonify(responseObject)), 202
responseObject = {
'status': 'fail',
'message': 'Email or Password format is not correct.',
}
return make_response(jsonify(responseObject)), 202


class UserAPI(MethodView):
"""
User Resource
"""

def get(self):
# get the auth token
auth_header = request.headers.get('Authorization')
Expand Down Expand Up @@ -131,6 +163,7 @@ class LogoutAPI(MethodView):
"""
Logout Resource
"""

def post(self):
# get auth token
auth_header = request.headers.get('Authorization')
Expand Down Expand Up @@ -171,6 +204,7 @@ def post(self):
}
return make_response(jsonify(responseObject)), 401


# define the API resources
registration_view = RegisterAPI.as_view('register_api')
login_view = LoginAPI.as_view('login_api')
Expand Down
Loading