From 796e045fa33972e4d0cc39e2195ba07cfc9d7385 Mon Sep 17 00:00:00 2001
From: GareArc <chen4851@purdue.edu>
Date: Mon, 9 Jun 2025 19:45:36 +0900
Subject: [PATCH] fix: show app not published  error

---
 api/controllers/web/app.py   | 4 ++--
 api/controllers/web/wraps.py | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/api/controllers/web/app.py b/api/controllers/web/app.py
index c3048b9b10..0bed3897a7 100644
--- a/api/controllers/web/app.py
+++ b/api/controllers/web/app.py
@@ -2,7 +2,7 @@
 from controllers.common import fields
 from controllers.common import helpers as controller_helpers
 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 flask import request
 from flask_restful import Resource, marshal_with, reqparse  # type: ignore
@@ -30,7 +30,7 @@ class AppParameterApi(WebApiResource):
         else:
             app_model_config = app_model.app_model_config
             if app_model_config is None:
-                raise AppNotPublishedError()
+                raise AppUnavailableError()
 
             features_dict = app_model_config.to_dict()
 
diff --git a/api/controllers/web/wraps.py b/api/controllers/web/wraps.py
index ef4b7872be..a9b82ac8e0 100644
--- a/api/controllers/web/wraps.py
+++ b/api/controllers/web/wraps.py
@@ -1,7 +1,8 @@
 from datetime import UTC, datetime
 from functools import wraps
 
-from controllers.web.error import (WebAppAuthAccessDeniedError,
+from controllers.web.error import (AppNotPublishedError,
+                                   WebAppAuthAccessDeniedError,
                                    WebAppAuthRequiredError)
 from extensions.ext_database import db
 from flask import request
@@ -55,8 +56,8 @@ def decode_jwt_token():
             raise NotFound()
         if not app_code or not site:
             raise BadRequest("Site URL is no longer valid.")
-        if app_model.enable_site is False:
-            raise BadRequest("Site is disabled.")
+        if app_model.enable_site is False or app_model.status != "normal":
+            raise AppNotPublishedError()
         end_user_id = decoded.get("end_user_id")
         end_user = db.session.query(EndUser).filter(EndUser.id == end_user_id).first()
         if not end_user: