Merge pull request #15 from app-generator/restructure

Codebase restructured

Author: Mominur Rahman

.gitignore

@@ -33,3 +33,5 @@ apps/static/assets/.temp
 
 
 #migrations
+
+node_modules/

apps/__init__.py

@@ -22,12 +22,24 @@ def register_blueprints(app):
         module = import_module('apps.{}.routes'.format(module_name))
         app.register_blueprint(module.blueprint)
 
-from apps.authentication.oauth import github_blueprint
+from apps.authentication.oauth import github_blueprint, google_blueprint
 
 def create_app(config):
-    app = Flask(__name__)
+
+    # Contextual
+    static_prefix = '/static'
+    templates_dir = os.path.dirname(config.BASE_DIR)
+
+    TEMPLATES_FOLDER = os.path.join(templates_dir,'templates')
+    STATIC_FOLDER = os.path.join(templates_dir,'static')
+
+    print(' > TEMPLATES_FOLDER: ' + TEMPLATES_FOLDER)
+
+    app = Flask(__name__, static_url_path=static_prefix, template_folder=TEMPLATES_FOLDER, static_folder=STATIC_FOLDER)
+
     app.config.from_object(config)
     register_extensions(app)
     register_blueprints(app)
     app.register_blueprint(github_blueprint, url_prefix="/login")    
+    app.register_blueprint(google_blueprint, url_prefix="/login")    
     return app

apps/authentication/models.py

@@ -5,7 +5,7 @@
 
 from flask_login import UserMixin
 
-from sqlalchemy.orm import relationship
+from sqlalchemy.exc import SQLAlchemyError, IntegrityError
 from flask_dance.consumer.storage.sqla import OAuthConsumerMixin
 
 from apps import db, login_manager
@@ -26,6 +26,7 @@ class Users(db.Model, UserMixin):
     password      = db.Column(db.LargeBinary)
 
     oauth_github  = db.Column(db.String(100), nullable=True)
+    oauth_google  = db.Column(db.String(100), nullable=True)
 
     def __init__(self, **kwargs):
         for property, value in kwargs.items():
@@ -65,7 +66,7 @@ def save(self) -> None:
             db.session.rollback()
             db.session.close()
             error = str(e.__dict__['orig'])
-            raise InvalidUsage(error, 422)
+            raise IntegrityError(error, 422)
 
     def delete_from_db(self) -> None:
         try:
@@ -75,7 +76,7 @@ def delete_from_db(self) -> None:
             db.session.rollback()
             db.session.close()
             error = str(e.__dict__['orig'])
-            raise InvalidUsage(error, 422)
+            raise IntegrityError(error, 422)
         return
 
 @login_manager.user_loader

apps/authentication/oauth.py

@@ -8,6 +8,7 @@
 from flask_login import current_user, login_user
 from flask_dance.consumer import oauth_authorized
 from flask_dance.contrib.github import github, make_github_blueprint
+from flask_dance.contrib.google import google, make_google_blueprint
 from flask_dance.consumer.storage.sqla import SQLAlchemyStorage
 from sqlalchemy.orm.exc import NoResultFound
 from apps.config import Config
@@ -56,3 +57,53 @@ def github_logged_in(blueprint, token):
 
             login_user(user)
 
+
+
+
+# Google
+
+google_blueprint = make_google_blueprint(
+    client_id=Config.GOOGLE_ID,
+    client_secret=Config.GOOGLE_SECRET,
+    scope=[
+        "openid",
+        "https://www.googleapis.com/auth/userinfo.email",
+        "https://www.googleapis.com/auth/userinfo.profile",
+    ],
+    storage=SQLAlchemyStorage(
+        OAuth,
+        db.session,
+        user=current_user,
+        user_required=False,        
+    ),
+   
+)
+
+@oauth_authorized.connect_via(google_blueprint)
+def google_logged_in(blueprint, token):
+    info = google.get("/oauth2/v1/userinfo")
+
+    if info.ok:
+        account_info = info.json()
+        username     = account_info["given_name"]
+        email        = account_info["email"]
+
+        query = Users.query.filter_by(oauth_google=username)
+        try:
+
+            user = query.one()
+            login_user(user)
+
+        except NoResultFound:
+            # Save to db
+            user              = Users()
+            user.username     = '(google)' + username
+            user.oauth_google = username
+            user.email        = email
+
+            # Save current user
+            db.session.add(user)
+            db.session.commit()
+
+            login_user(user)
+

apps/authentication/routes.py

@@ -10,6 +10,7 @@
     logout_user
 )
 from flask_dance.contrib.github import github
+from flask_dance.contrib.google import google
 
 from apps import db, login_manager
 from apps.authentication import blueprint
@@ -31,6 +32,15 @@ def login_github():
     return redirect(url_for('home_blueprint.index'))
 
 
+@blueprint.route("/google")
+def login_google():
+    """ Google login """
+    if not google.authorized:
+        return redirect(url_for("google.login"))
+
+    res = google.get("/oauth2/v1/userinfo")
+    return redirect(url_for('home_blueprint.index'))
+
 @blueprint.route('/login', methods=['GET', 'POST'])
 def login():
     login_form = LoginForm(request.form)
@@ -120,10 +130,12 @@ def logout():
 
 @blueprint.context_processor
 def has_github():
-    if Config.GITHUB_ID and Config.GITHUB_SECRET:
-        return {'has_github': True}
-    
-    return {'has_github': False}
+    return {'has_github': bool(Config.GITHUB_ID) and bool(Config.GITHUB_SECRET)}
+
+@blueprint.context_processor
+def has_google():
+    return {'has_google': bool(Config.GOOGLE_ID) and bool(Config.GOOGLE_SECRET)}
+
 
 @login_manager.unauthorized_handler
 def unauthorized_handler():

apps/config.py

@@ -4,22 +4,15 @@
 """
 
 import os
+from pathlib import Path
 
 class Config(object):
 
-    basedir = os.path.abspath(os.path.dirname(__file__))
-
-    # for Product model
-    CURRENCY     = { 'usd' : 'usd' , 'eur' : 'eur' }
-    STATE        = { 'completed' : 1 , 'pending' : 2, 'refunded' : 3 }
-    PAYMENT_TYPE = { 'cc' : 1 , 'paypal' : 2, 'wire' : 3 }
+    BASE_DIR = Path(__file__).resolve().parent
 
     USERS_ROLES  = { 'ADMIN'  :1 , 'USER'      : 2 }
     USERS_STATUS = { 'ACTIVE' :1 , 'SUSPENDED' : 2 }
 
-    # Assets Management
-    ASSETS_ROOT = os.getenv('ASSETS_ROOT', '/static/assets')  
-    
     # celery 
     CELERY_BROKER_URL     = "redis://localhost:6379"
     CELERY_RESULT_BACKEND = "redis://localhost:6379"
@@ -36,7 +29,14 @@ class Config(object):
 
     # Enable/Disable Github Social Login    
     if GITHUB_ID and GITHUB_SECRET:
-         SOCIAL_AUTH_GITHUB  = True        
+         SOCIAL_AUTH_GITHUB  = True    
+
+    GOOGLE_ID      = os.getenv('GOOGLE_ID'    , None)
+    GOOGLE_SECRET  = os.getenv('GOOGLE_SECRET', None)
+
+    # Enable/Disable Google Social Login    
+    if GOOGLE_ID and GOOGLE_SECRET:
+         SOCIAL_AUTH_GOOGLE  = True    
 
     SQLALCHEMY_TRACK_MODIFICATIONS = False
 
@@ -74,12 +74,15 @@ class Config(object):
     if USE_SQLITE:
 
         # This will create a file in <app> FOLDER
-        SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(basedir, 'db.sqlite3')
+        SQLALCHEMY_DATABASE_URI = 'sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3')
 
     DYNAMIC_DATATB = {
         "products": "apps.models.Product"
     }
 
+    CDN_DOMAIN = os.getenv('CDN_DOMAIN')
+    CDN_HTTPS = os.getenv('CDN_HTTPS', True)
+
 class ProductionConfig(Config):
     DEBUG = False