Merge pull request #5 from sorrelbri/sj-auth

sj auth

app.py

@@ -10,7 +10,8 @@ from flask_cors import CORS
 
 def create_app():
     app = Flask(__name__)
-    CORS(app, origins="http://localhost:3004")
+    CORS(app, resources={r"/api/*": {"origins": "http://localhost:3000"},
+    r"/auth/*": {"origins": "http://localhost:3000"}})
     app.config['CORS_HEADERS'] = 'Content-Type'
     app.config.from_object(DevelopmentConfig)
     db.init_app(app)

auth/auth.py

@@ -1,5 +1,4 @@
 from flask import Blueprint, request, jsonify, session
-
 from database import db
 from models.User import User
 
@@ -10,33 +9,36 @@ def auth_signup():
     data = request.get_json()
     user = User.query.filter_by(email=data.get('email')).first()
     if not user:
-        try:
+        user = User.query.filter_by(username=data.get('username')).first()
-            print('getting here 1')
+        if not user:
-            user = User(
+            try:
-                email = data['email'],
+                user = User(
-                password = data['password'],
+                    username = data['username'],
-            )
+                    email = data['email'],
-            print('getting here 2')
+                    password = data['password'],
-            db.session.add(user)
+                )
-            print('wtf')
+                db.session.add(user)
-            db.session.commit()
+                db.session.commit()
-            print('user')
+                auth_token = user.encode_auth_token(user.id)
-            auth_token = user.encode_auth_token(user.id)
+                response = {
-            print('getting here 4')
+                    'status': 'success',
-            response = {
+                    'message': 'Succesfully registered.',
-                'status': 'success',
+                    'auth_token': auth_token.decode()
-                'message': 'Succesfully registered.',
+                }
-                'auth_token': auth_token.decode()
+                return jsonify(response), 201
-            }
+            except Exception as e:
-            return jsonify(response), 201
+                print(e.__dict__)
-        except Exception as e:
+                response = {
-            print(e.__dict__)
+                    'status': 'fail',
+                    'message': 'There was an error. Please try again.'
+                }
+                return jsonify(response), 401
+        else: # username is taken
             response = {
                 'status': 'fail',
-                'message': 'There was an error. Please try again.'
+                'message': 'User already exists. Please login.'
             }
-            return jsonify(response), 401
+    else: # email is taken
-    else: 
         response = {
             'status': 'fail',
             'message': 'User already exists. Please login.'
@@ -45,5 +47,26 @@ def auth_signup():
 
 @auth.route('/login', methods=['POST'])
 def auth_login():
-    response = {"message": "login post"}
+    # get the post data
-    return jsonify(response)
+    data = request.get_json()
+    try:
+        # fetch the user data
+        print('getting here')
+        user = User.query.filter_by(email=data['email']).first()
+        print(user.username)
+        auth_token = user.encode_auth_token(user.id)
+        print(auth_token)
+        if auth_token:
+            response = {
+                'status': 'success',
+                'message': 'Successfully logged in.',
+                'auth_token': auth_token.decode()
+            }
+            return jsonify(response), 200
+    except Exception as e:
+        print(e)
+        response = {
+            'status': 'fail',
+            'message': 'Try again'
+        }
+        return jsonify(response), 500

models/User.py

@@ -1,9 +1,12 @@
 from database import db, ma
+from marshmallow import fields
 from app import bcrypt
 from configuration import config
 import datetime
 import enum
+import json
 import jwt
+import os
 
 class Ranks(enum.Enum): # with minimal Elo rating
     D7 = "Seven Dan" # Elo 2700+
@@ -58,7 +61,9 @@ class User(db.Model):
     elo = db.Column(db.Integer)
     rank_certainty = db.Column(db.Boolean, nullable=False, default=False)
 
-    def __init__(self, username, email, password, rank='RU', admin=False):
+    def __init__(self, username, email, password, rank=Ranks.K1, admin=False):
+        print(rank)
+        print(Ranks)
         self.username = username
         self.email = email
         self.password = bcrypt.generate_password_hash(
@@ -81,7 +86,7 @@ class User(db.Model):
             }
             return jwt.encode(
                 payload,
-                app.config.get('SECRET_KEY'),
+                os.environ.get('SECRET_KEY'),
                 algorithm='HS256'
             )
         except Exception as e:
@@ -95,7 +100,7 @@ class User(db.Model):
         :return: integer|string
         """
         try:
-            payload = jwt.decode(auth_token, app.config.get('SECRET_KEY'))
+            payload = jwt.decode(auth_token, os.environ.get('SECRET_KEY'))
             return payload['sub']
         except jwt.ExpiredSignatureError:
             return 'Signature expired. Please log in again.'
@@ -103,16 +108,14 @@ class User(db.Model):
             return 'Invalid token. Please log in again.'
 
 class UserSchema(ma.ModelSchema):
-    class Meta:
+    id = fields.Int()
-        fields = (
+    username = fields.Str()
-            'id', 
+    email = fields.Str()
-            'username',
+    registered_on = fields.Date()
-            'email', 
+    rank = fields.Str()
-            'registered_on', 
+    rank_certainty = fields.Bool()
-            'rank', 
+    elo = fields.Int()
-            'rank_certainty', 
+        
-            'elo'
-        )
 
 user_schema = UserSchema()
 users_schema = UserSchema(many=True)