Skip to content
This repository was archived by the owner on Jan 14, 2025. It is now read-only.

v1.0.18 #44

Merged
merged 2 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions api/src/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from function.google import secret_key

from function.db import get_db
from function.loadconfig import config, UPLOAD_FOLDER
from function.loadconfig import config, UPLOAD_FOLDER, isDev


# list route file
Expand All @@ -37,7 +37,7 @@ def tree_route(startpath):
app = Flask(__name__)


isDev = config['DEV'].lower() == "true"

if not isDev:
CORS(app, supports_credentials=True, resources={r"/api/*": {"origins": config['DOMAIN']}})
else:
Expand Down
4 changes: 3 additions & 1 deletion api/src/function/loadconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@
# load config
config = dotenv_values("config/.env")

UPLOAD_FOLDER = os.path.join('files', 'UploadFile')
UPLOAD_FOLDER = os.path.join('files', 'UploadFile')

isDev = config['DEV'].lower() == "true"
20 changes: 18 additions & 2 deletions api/src/route/api/glob/auth/checkauth_GET.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,28 @@
from flask import jsonify, g
from flask import jsonify, g, request
from flask_jwt_extended import jwt_required, get_jwt_identity

from function.loadconfig import isDev
from function.db import get_db


import pytz
from datetime import datetime

gmt_timezone = pytz.timezone('Asia/Bangkok')

@jwt_required()
def main():
email = get_jwt_identity()['email']

conn = get_db()
cur = conn.cursor()

cur = g.db.cursor()
if not isDev:
# log ip
UID = email.split("@")[0]
query = "INSERT INTO `iplog` (`IP`, `UID`, `Timestamp`) VALUES (%s,%s,%s)"
cur.execute(query, (f"{request.headers.get('X-Real-IP')} ; {request.headers.get('X-Forwarded-For')}", UID, datetime.now(gmt_timezone)))
conn.commit()

query = """
SELECT
Expand Down
4 changes: 2 additions & 2 deletions api/src/route/api/glob/auth/testCallback_POST.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
from function.db import get_db
import re

from function.loadconfig import config
from function.loadconfig import config, isDev

from flask_jwt_extended import create_access_token, set_access_cookies, get_csrf_token

regex = r'\b[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Z|a-z]{2,7}\b'

def main():
if not config['DEV'].lower() == "true":
if not isDev:
return jsonify({
'success': False,
'msg': '',
Expand Down
Loading