[OPS] Dockerize application and few minor fixes

Author: pratapaprasanna

Dockerfile

@@ -0,0 +1,11 @@
+FROM python:3.8.1 as dev
+
+RUN pip install poetry==1.0.0
+ENV PATH="/root/.poetry/bin:${PATH}"
+
+WORKDIR /app/
+
+ADD . /app
+RUN poetry install
+
+CMD poetry run python /app/authenticator/app.py

authenticator/__init__.py

@@ -1 +1 @@
-__version__ = '0.1.0'
+__version__ = "0.1.0"

authenticator/adapters/db/api.py

@@ -5,23 +5,30 @@
 class MongoAdapters(object):
     def __init__(self, app):
         self.client = PyMongo(app)
-        self.db = self.client.db['nomad']
+        self.db = self.client.db["authenticator"]
 
     def get_all_users(self):
-        collection = self.client.db['users']
+        collection = self.client.db["users"]
         output = []
         for user in collection.find():
-            output.append({'name': user['name'], 'email': user['email']})
-        return jsonify({'result': output})
+            output.append({"name": user["name"], "email": user["email"]})
+        return jsonify({"result": output})
 
-    def add_users(self, name, email, provider):
+    def add_users(self, name, email, creation_time, provider=None, user_type="user"):
         try:
-            collection = self.client.db['users']
-            count = collection.count_documents({'email': email})
+            collection = self.client.db["users"]
+            count = collection.count_documents({"email": email})
             if count == 0:
                 collection_id = collection.insert(
-                    {'name': name, 'email': email, 'provider': provider})
-                return jsonify({'result': str(collection_id)})
-            return jsonify({'result': "User already signed up"})
+                    {
+                        "name": name,
+                        "email": email,
+                        "provider": provider,
+                        "creation_time": creation_time,
+                        "user_type": user_type,
+                    }
+                )
+                return jsonify({"result": str(collection_id)})
+            return jsonify({"token": "User already signed up"})
         except Exception:
             print("ISSUE")

authenticator/adapters/login/loginmanager.py

@@ -2,6 +2,5 @@
 
 
 class loginManager(object):
-
     def __init__(self, app):
         self.auth = OAuth(app)

authenticator/app.py

@@ -1,4 +1,4 @@
-from configparser import ConfigParser
+import os
 
 from flask import Flask
 from flask import jsonify
@@ -7,73 +7,78 @@
 
 from authenticator.adapters.db import api as db_api
 from authenticator.adapters.login import loginmanager
+from authenticator.utils import utils
 
-config = ConfigParser()
-config.read("config.ini")
-
-database = config.get('default', 'db')
-host = config.get('default', 'db_host')
-port = config.get('default', 'db_port')
+database = os.environ.get("db", "authenticator")
+host = os.environ.get("db_host", "mongo")
+port = os.environ.get("db_port", "27017")
 
 app = Flask(__name__)
-app.config['MONGO_URI'] = f'mongodb://{host}:{port}/{database}'
-app.config['SECRET_KEY'] = "b9dd1b2f"
-app.config['GOOGLE_CLIENT_ID'] = config.get('google-oauth', 'client_id')
-app.config['GOOGLE_CLIENT_SECRET'] = config.get(
-    'google-oauth', 'client_secret')
+app.config["MONGO_URI"] = f"mongodb://{host}:{port}/{database}"
+app.config["SECRET_KEY"] = "b9dd1b2f"
+app.config["GOOGLE_CLIENT_ID"] = os.environ.get("GOOGLE_CLIENT_ID", None)
+app.config["GOOGLE_CLIENT_SECRET"] = os.environ.get("GOOGLE_CLIENT_SECRET", None)
 
 
 db_obj = db_api.MongoAdapters(app)
 login_obj = loginmanager.loginManager(app)
 
 
-@app.route('/users', methods=['GET'])
+@app.route("/users", methods=["GET"])
 def get_users():
     return db_obj.get_all_users()
 
 
-@app.route('/', methods=['GET'])
+@app.route("/", methods=["GET"])
 def index():
     return "Welcome to nomad Authenticator."
 
 
 def add_users(name, email, provider):
-    return db_obj.add_users(name, email, provider)
+    if email == "[email protected]":
+        print("HELOO")
+        return db_obj.add_users(
+            name, email, utils.get_current_time(), provider, "admin"
+        )
+    return db_obj.add_users(name, email, utils.get_current_time(), provider, "user")
 
 
-@app.route('/login/google')
+@app.route("/login/google")
 def google_login():
     login_obj.auth.register(
-        name='google',
+        name="google",
         client_id=app.config["GOOGLE_CLIENT_ID"],
         client_secret=app.config["GOOGLE_CLIENT_SECRET"],
-        access_token_url='https://accounts.google.com/o/oauth2/token',
+        access_token_url="https://accounts.google.com/o/oauth2/token",
         access_token_params=None,
-        authorize_url='https://accounts.google.com/o/oauth2/auth',
+        authorize_url="https://accounts.google.com/o/oauth2/auth",
         authorize_params=None,
-        api_base_url='https://www.googleapis.com/oauth2/v1/',
-        userinfo_endpoint='https://openidconnect.googleapis.com/v1/userinfo',
-        client_kwargs={'scope': 'openid email profile'},
+        api_base_url="https://www.googleapis.com/oauth2/v1/",
+        userinfo_endpoint="https://openidconnect.googleapis.com/v1/userinfo",
+        client_kwargs={"scope": "openid email profile"},
     )
-    google = login_obj.auth.create_client('google')
-    redirect_uri = url_for('google_authorize', _external=True)
+    google = login_obj.auth.create_client("google")
+    redirect_uri = url_for("google_authorize", _external=True)
     return google.authorize_redirect(redirect_uri)
 
 
-@app.route('/login/google/authorize')
+@app.route("/login/google/authorize")
 def google_authorize():
-    google = login_obj.auth.create_client('google')
-    token = google.authorize_access_token()
-    resp = google.get('userinfo').json()
-    return add_users(resp['name'], resp['email'], "google")
+    google = login_obj.auth.create_client("google")
+    try:
+        token = google.authorize_access_token()
+        resp = google.get("userinfo").json()
+        return add_users(resp["name"], resp["email"], "google")
+    except Exception:
+        return redirect("/login/google")
 
 
-@app.route('/logout')
+@app.route("/logout")
 def user_logout():
     for key in list(session.keys()):
         session.pop(key)
-    return redirect('/')
+    return redirect("/")
 
 
-if __name__ == '__main__':
-    app.run(debug=True)
+if __name__ == "__main__":
+    app.run(debug=True, host="0.0.0.0", port=5000)

authenticator/config.ini

@@ -1,5 +1,5 @@
 [default]
-db = nomad
+db = authenticator
 db_host = localhost
 db_port = 27017
 app_port = 5000

authenticator/utils/cryptic.py

@@ -0,0 +1,9 @@
+import cryptocode
+
+
+def encrypt_me(word, api_key):
+    return cryptocode.encrypt(word, api_key)
+
+
+def decrypt_me(word, api_key):
+    return cryptocode.decrypt(word, api_key)

authenticator/utils/utils.py

@@ -1,5 +1,5 @@
-import requests
+import time
 
 
-def get_google_provider_cfg(discovery_url):
-    return requests.get(discovery_url).json()
+def get_current_time():
+    return int(time.time()) * 1000

docker-compose.override.yml

@@ -0,0 +1,21 @@
+version: "3.7"
+services:
+
+  authenticator:
+    volumes:
+      - ./:/app
+    environment:
+      GOOGLE_CLIENT_ID: "1034883885605-gvj78f1cg3urngprb0jjfr3p0olqh8tr.apps.googleusercontent.com"
+      GOOGLE_CLIENT_SECRET: "jPbO8Hxm20DkefDqmD4EyhCs"
+      GITHUB_CLIENT_ID:  "147d2cadb82f19a22ab9"
+      GITHUB_CLIENT_SECRET : "7f8b6dcd2fa7272698b3cd4906c0d537baa23382"
+  mongo:
+    image: mongo:latest
+    volumes:
+      - ~/work/data:/data/db
+    ports:
+      - 27017:27017
+    networks:
+      main:
+        aliases:
+          - mongo

docker-compose.yml

@@ -0,0 +1,18 @@
+version: "3.7"
+
+services:
+  authenticator:
+    image: authenticator_service_dev
+    volumes:
+      - ./:/app
+    build: .
+    environment:
+      SECRET_KEY: "b9dd1b2f"
+    ports:
+      - 5000:5000
+    networks:
+      main:
+        aliases:
+          - authenticator.svc.cluster.local
+networks:
+  main: