Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename verify_api_key -> require_api_auth

This commit is contained in:
Son NK 2020-04-24 14:08:00 +02:00 committed by Son NK
parent 78e94da08c
commit 48202e905f
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/base.py
View File

@ -9,7 +9,7 @@ from app.models import ApiKey
api_bp = Blueprint(name="api", import_name=__name__, url_prefix="/api") api_bp = Blueprint(name="api", import_name=__name__, url_prefix="/api")
def verify_api_key(f): def require_api_auth(f):
@wraps(f) @wraps(f)
def decorated(*args, **kwargs): def decorated(*args, **kwargs):
if current_user.is_authenticated: if current_user.is_authenticated:

22
app/api/views/alias.py
View File

@ -3,7 +3,7 @@ from flask import jsonify
from flask import request from flask import request
from flask_cors import cross_origin from flask_cors import cross_origin
from app.api.base import api_bp, verify_api_key from app.api.base import api_bp, require_api_auth
from app.api.serializer import ( from app.api.serializer import (
AliasInfo, AliasInfo,
serialize_alias_info, serialize_alias_info,
@ -25,7 +25,7 @@ from app.utils import random_string
@api_bp.route("/aliases", methods=["GET", "POST"]) @api_bp.route("/aliases", methods=["GET", "POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def get_aliases(): def get_aliases():
""" """
Get aliases Get aliases
@ -68,7 +68,7 @@ def get_aliases():
@api_bp.route("/v2/aliases", methods=["GET", "POST"]) @api_bp.route("/v2/aliases", methods=["GET", "POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def get_aliases_v2(): def get_aliases_v2():
""" """
Get aliases Get aliases
@ -119,7 +119,7 @@ def get_aliases_v2():
@api_bp.route("/aliases/<int:alias_id>", methods=["DELETE"]) @api_bp.route("/aliases/<int:alias_id>", methods=["DELETE"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def delete_alias(alias_id): def delete_alias(alias_id):
""" """
Delete alias Delete alias
@ -143,7 +143,7 @@ def delete_alias(alias_id):
@api_bp.route("/aliases/<int:alias_id>/toggle", methods=["POST"]) @api_bp.route("/aliases/<int:alias_id>/toggle", methods=["POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def toggle_alias(alias_id): def toggle_alias(alias_id):
""" """
Enable/disable alias Enable/disable alias
@ -169,7 +169,7 @@ def toggle_alias(alias_id):
@api_bp.route("/aliases/<int:alias_id>/activities") @api_bp.route("/aliases/<int:alias_id>/activities")
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def get_alias_activities(alias_id): def get_alias_activities(alias_id):
""" """
Get aliases Get aliases
@ -225,7 +225,7 @@ def get_alias_activities(alias_id):
@api_bp.route("/aliases/<int:alias_id>", methods=["PUT"]) @api_bp.route("/aliases/<int:alias_id>", methods=["PUT"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def update_alias(alias_id): def update_alias(alias_id):
""" """
Update alias note Update alias note
@ -256,7 +256,7 @@ def update_alias(alias_id):
@api_bp.route("/aliases/<int:alias_id>", methods=["GET"]) @api_bp.route("/aliases/<int:alias_id>", methods=["GET"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def get_alias(alias_id): def get_alias(alias_id):
""" """
Get alias Get alias
@ -277,7 +277,7 @@ def get_alias(alias_id):
@api_bp.route("/aliases/<int:alias_id>/contacts") @api_bp.route("/aliases/<int:alias_id>/contacts")
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def get_alias_contacts_route(alias_id): def get_alias_contacts_route(alias_id):
""" """
Get alias contacts Get alias contacts
@ -311,7 +311,7 @@ def get_alias_contacts_route(alias_id):
@api_bp.route("/aliases/<int:alias_id>/contacts", methods=["POST"]) @api_bp.route("/aliases/<int:alias_id>/contacts", methods=["POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def create_contact_route(alias_id): def create_contact_route(alias_id):
""" """
Create contact for an alias Create contact for an alias
@ -366,7 +366,7 @@ def create_contact_route(alias_id):
@api_bp.route("/contacts/<int:contact_id>", methods=["DELETE"]) @api_bp.route("/contacts/<int:contact_id>", methods=["DELETE"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def delete_contact(contact_id): def delete_contact(contact_id):
""" """
Delete contact Delete contact

8
app/api/views/alias_options.py
View File

@ -2,7 +2,7 @@ from flask import jsonify, request, g
from flask_cors import cross_origin from flask_cors import cross_origin
from sqlalchemy import desc from sqlalchemy import desc
from app.api.base import api_bp, verify_api_key from app.api.base import api_bp, require_api_auth
from app.config import ALIAS_DOMAINS, DISABLE_ALIAS_SUFFIX from app.config import ALIAS_DOMAINS, DISABLE_ALIAS_SUFFIX
from app.extensions import db from app.extensions import db
from app.log import LOG from app.log import LOG
@ -12,7 +12,7 @@ from app.utils import convert_to_id, random_word
@api_bp.route("/alias/options") @api_bp.route("/alias/options")
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def options(): def options():
""" """
Return what options user has when creating new alias. Return what options user has when creating new alias.
@ -88,7 +88,7 @@ def options():
@api_bp.route("/v2/alias/options") @api_bp.route("/v2/alias/options")
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def options_v2(): def options_v2():
""" """
Return what options user has when creating new alias. Return what options user has when creating new alias.
@ -167,7 +167,7 @@ def options_v2():
@api_bp.route("/v3/alias/options") @api_bp.route("/v3/alias/options")
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def options_v3(): def options_v3():
""" """
Return what options user has when creating new alias. Return what options user has when creating new alias.

4
app/api/views/apple.py
View File

@ -7,7 +7,7 @@ from flask import jsonify
from flask import request from flask import request
from flask_cors import cross_origin from flask_cors import cross_origin
from app.api.base import api_bp, verify_api_key from app.api.base import api_bp, require_api_auth
from app.config import APPLE_API_SECRET from app.config import APPLE_API_SECRET
from app.extensions import db from app.extensions import db
from app.log import LOG from app.log import LOG
@ -23,7 +23,7 @@ _PROD_URL = "https://buy.itunes.apple.com/verifyReceipt"
@api_bp.route("/apple/process_payment", methods=["POST"]) @api_bp.route("/apple/process_payment", methods=["POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def apple_process_payment(): def apple_process_payment():
""" """
Process payment Process payment

4
app/api/views/new_custom_alias.py
View File

@ -2,7 +2,7 @@ from flask import g
from flask import jsonify, request from flask import jsonify, request
from flask_cors import cross_origin from flask_cors import cross_origin
from app.api.base import api_bp, verify_api_key from app.api.base import api_bp, require_api_auth
from app.api.serializer import serialize_alias_info, get_alias_info from app.api.serializer import serialize_alias_info, get_alias_info
from app.config import MAX_NB_EMAIL_FREE_PLAN, ALIAS_DOMAINS from app.config import MAX_NB_EMAIL_FREE_PLAN, ALIAS_DOMAINS
from app.dashboard.views.custom_alias import verify_prefix_suffix from app.dashboard.views.custom_alias import verify_prefix_suffix
@ -14,7 +14,7 @@ from app.utils import convert_to_id
@api_bp.route("/alias/custom/new", methods=["POST"]) @api_bp.route("/alias/custom/new", methods=["POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def new_custom_alias(): def new_custom_alias():
""" """
Create a new custom alias Create a new custom alias

4
app/api/views/new_random_alias.py
View File

@ -2,7 +2,7 @@ from flask import g
from flask import jsonify, request from flask import jsonify, request
from flask_cors import cross_origin from flask_cors import cross_origin
from app.api.base import api_bp, verify_api_key from app.api.base import api_bp, require_api_auth
from app.api.serializer import serialize_alias_info, get_alias_info from app.api.serializer import serialize_alias_info, get_alias_info
from app.config import MAX_NB_EMAIL_FREE_PLAN from app.config import MAX_NB_EMAIL_FREE_PLAN
from app.extensions import db from app.extensions import db
@ -12,7 +12,7 @@ from app.models import Alias, AliasUsedOn, AliasGeneratorEnum
@api_bp.route("/alias/random/new", methods=["POST"]) @api_bp.route("/alias/random/new", methods=["POST"])
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def new_random_alias(): def new_random_alias():
""" """
Create a new random alias Create a new random alias

4
app/api/views/user_info.py
View File

@ -1,12 +1,12 @@
from flask import jsonify, g from flask import jsonify, g
from flask_cors import cross_origin from flask_cors import cross_origin
from app.api.base import api_bp, verify_api_key from app.api.base import api_bp, require_api_auth
@api_bp.route("/user_info") @api_bp.route("/user_info")
@cross_origin() @cross_origin()
@verify_api_key @require_api_auth
def user_info(): def user_info():
""" """
Return user info given the api-key Return user info given the api-key