feat: support login
- migrate old API into typescript but not finished (only webLogin works now) - seperate the logger of backend due to the shitty behavior of Flask (change logging level)
This commit is contained in:
@@ -1,8 +1,12 @@
|
||||
from flask import Flask
|
||||
from flask import request
|
||||
from dataclasses import dataclass
|
||||
from typing import Any, Callable
|
||||
|
||||
import config
|
||||
import database
|
||||
import utils
|
||||
from logger import LOGGER
|
||||
|
||||
app = Flask(__name__)
|
||||
calendar_db = database.CalendarDatabase()
|
||||
@@ -14,7 +18,7 @@ calendar_db = database.CalendarDatabase()
|
||||
@app.route('/common/salt', methods=['POST'])
|
||||
def api_common_saltHandle():
|
||||
return SmartDbCaller(calendar_db.common_salt,
|
||||
(('username', str, False), ),
|
||||
(FormField('username', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/common/login', methods=['POST'])
|
||||
@@ -27,10 +31,10 @@ def api_common_loginHandle():
|
||||
clientIp = request.remote_addr
|
||||
|
||||
return SmartDbCaller(calendar_db.common_login,
|
||||
(('username', str, False),
|
||||
('password', str, False),
|
||||
('clientUa', str, False),
|
||||
('clientIp', str, False)),
|
||||
(FormField('username', str, False),
|
||||
FormField('password', str, False),
|
||||
FormField('clientUa', str, False),
|
||||
FormField('clientIp', str, False)),
|
||||
{
|
||||
'clientUa': clientUa,
|
||||
'clientIp': clientIp
|
||||
@@ -44,12 +48,12 @@ def api_common_webLoginHandle():
|
||||
clientIp = request.headers.getlist("X-Forwarded-For")[0]
|
||||
else:
|
||||
clientIp = request.remote_addr
|
||||
|
||||
|
||||
return SmartDbCaller(calendar_db.common_webLogin,
|
||||
(('username', str, False),
|
||||
('password', str, False),
|
||||
('clientUa', str, False),
|
||||
('clientIp', str, False)),
|
||||
(FormField('username', str, False),
|
||||
FormField('password', str, False),
|
||||
FormField('clientUa', str, False),
|
||||
FormField('clientIp', str, False)),
|
||||
{
|
||||
'clientUa': clientUa,
|
||||
'clientIp': clientIp
|
||||
@@ -58,13 +62,13 @@ def api_common_webLoginHandle():
|
||||
@app.route('/common/logout', methods=['POST'])
|
||||
def api_common_logoutHandle():
|
||||
return SmartDbCaller(calendar_db.common_logout,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/common/tokenValid', methods=['POST'])
|
||||
def api_common_tokenValidHandle():
|
||||
return SmartDbCaller(calendar_db.common_tokenValid,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
# endregion
|
||||
@@ -74,60 +78,60 @@ def api_common_tokenValidHandle():
|
||||
@app.route('/calendar/getFull', methods=['POST'])
|
||||
def api_calendar_getFullHandle():
|
||||
return SmartDbCaller(calendar_db.calendar_getFull,
|
||||
(('token', str, False),
|
||||
('startDateTime', int, False),
|
||||
('endDateTime', int, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('startDateTime', int, False),
|
||||
FormField('endDateTime', int, False)),
|
||||
None)
|
||||
|
||||
@app.route('/calendar/getList', methods=['POST'])
|
||||
def api_calendar_getListHandle():
|
||||
return SmartDbCaller(calendar_db.calendar_getList,
|
||||
(('token', str, False),
|
||||
('startDateTime', int, False),
|
||||
('endDateTime', int, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('startDateTime', int, False),
|
||||
FormField('endDateTime', int, False)),
|
||||
None)
|
||||
|
||||
@app.route('/calendar/getDetail', methods=['POST'])
|
||||
def api_calendar_getDetailHandle():
|
||||
return SmartDbCaller(calendar_db.calendar_getDetail,
|
||||
(('token', str, False),
|
||||
('uuid', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/calendar/update', methods=['POST'])
|
||||
def api_calendar_updateHandle():
|
||||
return SmartDbCaller(calendar_db.calendar_update,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('belongTo', str, True),
|
||||
('title', str, True),
|
||||
('description', str, True),
|
||||
('eventDateTimeStart', int, True),
|
||||
('eventDateTimeEnd', int, True),
|
||||
('loopRules', str, True),
|
||||
('timezoneOffset', int, True),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('belongTo', str, True),
|
||||
FormField('title', str, True),
|
||||
FormField('description', str, True),
|
||||
FormField('eventDateTimeStart', int, True),
|
||||
FormField('eventDateTimeEnd', int, True),
|
||||
FormField('loopRules', str, True),
|
||||
FormField('timezoneOffset', int, True),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/calendar/add', methods=['POST'])
|
||||
def api_calendar_addHandle():
|
||||
return SmartDbCaller(calendar_db.calendar_add,
|
||||
(('token', str, False),
|
||||
('belongTo', str, False),
|
||||
('title', str, False),
|
||||
('description', str, False),
|
||||
('eventDateTimeStart', int, False),
|
||||
('eventDateTimeEnd', int, False),
|
||||
('loopRules', str, False),
|
||||
('timezoneOffset', int, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('belongTo', str, False),
|
||||
FormField('title', str, False),
|
||||
FormField('description', str, False),
|
||||
FormField('eventDateTimeStart', int, False),
|
||||
FormField('eventDateTimeEnd', int, False),
|
||||
FormField('loopRules', str, False),
|
||||
FormField('timezoneOffset', int, False)),
|
||||
None)
|
||||
|
||||
@app.route('/calendar/delete', methods=['POST'])
|
||||
def api_calendar_deleteHandle():
|
||||
return SmartDbCaller(calendar_db.calendar_delete,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
# endregion
|
||||
@@ -137,77 +141,77 @@ def api_calendar_deleteHandle():
|
||||
@app.route('/collection/getFullOwn', methods=['POST'])
|
||||
def api_collection_getFullOwnHandle():
|
||||
return SmartDbCaller(calendar_db.collection_getFullOwn,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/collection/getListOwn', methods=['POST'])
|
||||
def api_collection_getListOwnHandle():
|
||||
return SmartDbCaller(calendar_db.collection_getListOwn,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/collection/getDetailOwn', methods=['POST'])
|
||||
def api_collection_getDetailOwnHandle():
|
||||
return SmartDbCaller(calendar_db.collection_getDetailOwn,
|
||||
(('token', str, False),
|
||||
('uuid', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/collection/addOwn', methods=['POST'])
|
||||
def api_collection_addOwnHandle():
|
||||
return SmartDbCaller(calendar_db.collection_addOwn,
|
||||
(('token', str, False),
|
||||
('name', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('name', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/collection/updateOwn', methods=['POST'])
|
||||
def api_collection_updateOwnHandle():
|
||||
return SmartDbCaller(calendar_db.collection_updateOwn,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('name', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('name', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/collection/deleteOwn', methods=['POST'])
|
||||
def api_collection_deleteOwnHandle():
|
||||
return SmartDbCaller(calendar_db.collection_deleteOwn,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
|
||||
@app.route('/collection/getSharing', methods=['POST'])
|
||||
def api_collection_getSharingHandle():
|
||||
return SmartDbCaller(calendar_db.collection_getSharing,
|
||||
(('token', str, False),
|
||||
('uuid', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/collection/deleteSharing', methods=['POST'])
|
||||
def api_collection_deleteSharingHandle():
|
||||
return SmartDbCaller(calendar_db.collection_deleteSharing,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('target', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('target', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/collection/addSharing', methods=['POST'])
|
||||
def api_collection_addSharingHandle():
|
||||
return SmartDbCaller(calendar_db.collection_addSharing,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('target', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('target', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
|
||||
@app.route('/collection/getShared', methods=['POST'])
|
||||
def api_collection_getSharedHandle():
|
||||
return SmartDbCaller(calendar_db.collection_getShared,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
# endregion
|
||||
@@ -217,43 +221,43 @@ def api_collection_getSharedHandle():
|
||||
@app.route('/todo/getFull', methods=['POST'])
|
||||
def api_todo_getFullHandle():
|
||||
return SmartDbCaller(calendar_db.todo_getFull,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/todo/getList', methods=['POST'])
|
||||
def api_todo_getListHandle():
|
||||
return SmartDbCaller(calendar_db.todo_getList,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/todo/getDetail', methods=['POST'])
|
||||
def api_todo_getDetailHandle():
|
||||
return SmartDbCaller(calendar_db.todo_getDetail,
|
||||
(('token', str, False),
|
||||
('uuid', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/todo/add', methods=['POST'])
|
||||
def api_todo_addHandle():
|
||||
return SmartDbCaller(calendar_db.todo_add,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/todo/update', methods=['POST'])
|
||||
def api_todo_updateHandle():
|
||||
return SmartDbCaller(calendar_db.todo_update,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('data', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('data', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/todo/delete', methods=['POST'])
|
||||
def api_todo_deleteHandle():
|
||||
return SmartDbCaller(calendar_db.todo_delete,
|
||||
(('token', str, False),
|
||||
('uuid', str, False),
|
||||
('lastChange', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('uuid', str, False),
|
||||
FormField('lastChange', str, False)),
|
||||
None)
|
||||
|
||||
# endregion
|
||||
@@ -263,30 +267,30 @@ def api_todo_deleteHandle():
|
||||
@app.route('/admin/get', methods=['POST'])
|
||||
def api_admin_getHandle():
|
||||
return SmartDbCaller(calendar_db.admin_get,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/admin/add', methods=['POST'])
|
||||
def api_admin_addHandle():
|
||||
return SmartDbCaller(calendar_db.admin_add,
|
||||
(('token', str, False),
|
||||
('username', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('username', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/admin/update', methods=['POST'])
|
||||
def api_admin_updateHandle():
|
||||
return SmartDbCaller(calendar_db.admin_update,
|
||||
(('token', str, False),
|
||||
('username', str, False),
|
||||
('password', str, True),
|
||||
('isAdmin', utils.Str2Bool, True)),
|
||||
(FormField('token', str, False),
|
||||
FormField('username', str, False),
|
||||
FormField('password', str, True),
|
||||
FormField('isAdmin', utils.Str2Bool, True)),
|
||||
None)
|
||||
|
||||
@app.route('/admin/delete', methods=['POST'])
|
||||
def api_admin_deleteHandle():
|
||||
return SmartDbCaller(calendar_db.admin_delete,
|
||||
(('token', str, False),
|
||||
('username', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('username', str, False)),
|
||||
None)
|
||||
|
||||
# endregion
|
||||
@@ -296,27 +300,27 @@ def api_admin_deleteHandle():
|
||||
@app.route('/profile/isAdmin', methods=['POST'])
|
||||
def api_profile_isAdminHandle():
|
||||
return SmartDbCaller(calendar_db.profile_isAdmin,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/profile/changePassword', methods=['POST'])
|
||||
def api_profile_changePasswordHandle():
|
||||
return SmartDbCaller(calendar_db.profile_changePassword,
|
||||
(('token', str, False),
|
||||
('password', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('password', str, False)),
|
||||
None)
|
||||
|
||||
@app.route('/profile/getToken', methods=['POST'])
|
||||
def api_profile_getTokenHandle():
|
||||
return SmartDbCaller(calendar_db.profile_getToken,
|
||||
(('token', str, False), ),
|
||||
(FormField('token', str, False), ),
|
||||
None)
|
||||
|
||||
@app.route('/profile/deleteToken', methods=['POST'])
|
||||
def api_profile_deleteTokenHandle():
|
||||
return SmartDbCaller(calendar_db.profile_deleteToken,
|
||||
(('token', str, False),
|
||||
('deleteToken', str, False)),
|
||||
(FormField('token', str, False),
|
||||
FormField('deleteToken', str, False)),
|
||||
None)
|
||||
|
||||
# endregion
|
||||
@@ -325,41 +329,64 @@ def api_profile_deleteTokenHandle():
|
||||
|
||||
# region: Misc Functions
|
||||
|
||||
def SmartDbCaller(dbMethod, paramTuple, extraDict):
|
||||
result = (False, 'Invalid parameter', None)
|
||||
optCount = 0
|
||||
paramList = []
|
||||
optParamDict = {}
|
||||
# for each item,
|
||||
# item[0] is field name.
|
||||
# item[1] is type.
|
||||
# item[2] is whether it is optional field
|
||||
realForm = request.form.to_dict()
|
||||
if extraDict is not None:
|
||||
realForm.update(extraDict)
|
||||
for item in paramTuple:
|
||||
cache = item[1](realForm.get(item[0], None))
|
||||
if item[2]:
|
||||
# optional param
|
||||
if cache is not None:
|
||||
optParamDict[item[0]] = cache
|
||||
optCount += 1
|
||||
else:
|
||||
if cache is None:
|
||||
break
|
||||
paramList.append(cache)
|
||||
else:
|
||||
# at least one opt param
|
||||
if optCount == 0 or len(optParamDict) != 0:
|
||||
result = dbMethod(*paramList, **optParamDict)
|
||||
@dataclass(frozen=True)
|
||||
class FormField:
|
||||
name: str
|
||||
"""The name of form field."""
|
||||
ty: Callable[[str], Any]
|
||||
"""The type of form field."""
|
||||
is_optional: bool
|
||||
"""True if this form field is optional, otherwise false."""
|
||||
|
||||
def SmartDbCaller(db_method: Callable, fields: tuple[FormField, ...], padding_form: dict[str, Any] | None) -> dict[str, Any]:
|
||||
result = ResponseBody(False, 'Invalid parameter', None)
|
||||
opt_param_counter = 0
|
||||
param_list: list[Any] = []
|
||||
opt_param_dict: dict[str, Any] = {}
|
||||
|
||||
real_form = request.form.to_dict()
|
||||
LOGGER.debug(f'Form: {real_form}')
|
||||
if padding_form is not None:
|
||||
real_form.update(padding_form)
|
||||
|
||||
for field in fields:
|
||||
value = real_form.get(field.name, None)
|
||||
if value is not None:
|
||||
value = field.ty(value)
|
||||
|
||||
if field.is_optional:
|
||||
# optional param
|
||||
if value is not None:
|
||||
opt_param_dict[field.name] = value
|
||||
opt_param_counter += 1
|
||||
else:
|
||||
# required param
|
||||
if value is None:
|
||||
break
|
||||
param_list.append(value)
|
||||
|
||||
# at least one opt param
|
||||
LOGGER.debug(f'All Optional Parameter: {opt_param_counter}')
|
||||
LOGGER.debug(f'Optional Parameter Count: {len(opt_param_dict)}')
|
||||
if opt_param_counter == 0 or len(opt_param_dict) != 0:
|
||||
result: ResponseBody = db_method(*param_list, **opt_param_dict)
|
||||
|
||||
return ConstructResponseBody(result)
|
||||
|
||||
def ConstructResponseBody(returnedTuple):
|
||||
@dataclass(frozen=True)
|
||||
class ResponseBody:
|
||||
success: bool
|
||||
"""True if this operation is successful, otherwise false."""
|
||||
error: str
|
||||
"""The error message provided when operation failed."""
|
||||
data: Any
|
||||
"""The payload provided when operation successed."""
|
||||
|
||||
def ConstructResponseBody(body: ResponseBody) -> dict[str, Any]:
|
||||
return {
|
||||
'success': returnedTuple[0],
|
||||
'error': returnedTuple[1],
|
||||
'data': returnedTuple[2]
|
||||
'success': body.success,
|
||||
'error': body.error,
|
||||
'data': body.data
|
||||
}
|
||||
|
||||
def run():
|
||||
|
||||
Reference in New Issue
Block a user