fix: show app not published error

fix/app-not-published-error
GareArc 11 months ago
parent 07c39d7b92
commit 796e045fa3
No known key found for this signature in database

@ -2,7 +2,7 @@
from controllers.common import fields from controllers.common import fields
from controllers.common import helpers as controller_helpers from controllers.common import helpers as controller_helpers
from controllers.web import api from controllers.web import api
from controllers.web.error import AppNotPublishedError, AppUnavailableError from controllers.web.error import AppUnavailableError
from controllers.web.wraps import WebApiResource from controllers.web.wraps import WebApiResource
from flask import request from flask import request
from flask_restful import Resource, marshal_with, reqparse # type: ignore from flask_restful import Resource, marshal_with, reqparse # type: ignore
@ -30,7 +30,7 @@ class AppParameterApi(WebApiResource):
else: else:
app_model_config = app_model.app_model_config app_model_config = app_model.app_model_config
if app_model_config is None: if app_model_config is None:
raise AppNotPublishedError() raise AppUnavailableError()
features_dict = app_model_config.to_dict() features_dict = app_model_config.to_dict()

@ -1,7 +1,8 @@
from datetime import UTC, datetime from datetime import UTC, datetime
from functools import wraps from functools import wraps
from controllers.web.error import (WebAppAuthAccessDeniedError, from controllers.web.error import (AppNotPublishedError,
WebAppAuthAccessDeniedError,
WebAppAuthRequiredError) WebAppAuthRequiredError)
from extensions.ext_database import db from extensions.ext_database import db
from flask import request from flask import request
@ -55,8 +56,8 @@ def decode_jwt_token():
raise NotFound() raise NotFound()
if not app_code or not site: if not app_code or not site:
raise BadRequest("Site URL is no longer valid.") raise BadRequest("Site URL is no longer valid.")
if app_model.enable_site is False: if app_model.enable_site is False or app_model.status != "normal":
raise BadRequest("Site is disabled.") raise AppNotPublishedError()
end_user_id = decoded.get("end_user_id") end_user_id = decoded.get("end_user_id")
end_user = db.session.query(EndUser).filter(EndUser.id == end_user_id).first() end_user = db.session.query(EndUser).filter(EndUser.id == end_user_id).first()
if not end_user: if not end_user:

Loading…
Cancel
Save