Merge branch '31466_limited_usage_chatbot+' into 'master'

31466_limited_usage_chatbot+

See merge request !118

@@ -9,13 +9,15 @@
     "react": "^18.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",
     "react-scripts": "5.0.1",
+    "serve": "^14.2.1",
     "web-vitals": "^2.1.4"
     "web-vitals": "^2.1.4"
   },
   },
   "scripts": {
   "scripts": {
     "start": "react-scripts start",
     "start": "react-scripts start",
     "build": "react-scripts build",
     "build": "react-scripts build",
     "test": "react-scripts test",
     "test": "react-scripts test",
-    "eject": "react-scripts eject"
+    "eject": "react-scripts eject",
+    "serve": "serve -s build"
   },
   },
   "eslintConfig": {
   "eslintConfig": {
     "extends": [
     "extends": [

@@ -131,14 +131,18 @@ function App() {
 
 
       if(data.status === 'invalid'){
       if(data.status === 'invalid'){
         if(data.limited) {
         if(data.limited) {
-          window.btutil_maxUsage();
+          window.btutil_modalRegisterUpgrade(false);
           return;
           return;
         }
         }
         if(data && data.status === 'max-tokens') {
         if(data && data.status === 'max-tokens') {
-          window.btutil_maxUsage();
+          if(data.ent_member === 'yes') {
+            window.btutil_modalMaxTokenUpgradeEntMembers();
             return;
             return;
           }
           }
-        window.btutil_maxUsage(true);
+          window.btutil_modalMaxTokenUpgrade();
+          return;
+        }
+        window.btutil_modalRegisterUpgrade(false);
         return;
         return;
       }
       }
       // "gpt-3.5-turbo"
       // "gpt-3.5-turbo"

@@ -74,7 +74,7 @@ app.use(cookieParser());
 
 
 const max_tokens = process.env.MAX_TOKENS_chatbot_plus ? parseInt(process.env.MAX_TOKENS_chatbot_plus) : 512;
 const max_tokens = process.env.MAX_TOKENS_chatbot_plus ? parseInt(process.env.MAX_TOKENS_chatbot_plus) : 512;
 // Routing
 // Routing
-const hostapi = process.env.REACT_APP_HOST_API || "https://api.ai-pro.org";
+const hostapi = process.env.API_URL || "https://api.ai-pro.org";
 const user_secret_id = process.env.USER_SECRET_ID || "aiwp_logged_in";
 const user_secret_id = process.env.USER_SECRET_ID || "aiwp_logged_in";
 const aiwp_app_id = "chatbot+";
 const aiwp_app_id = "chatbot+";
 // Primary Open AI Route
 // Primary Open AI Route
@@ -435,12 +435,13 @@ async function validation (aiwp_app_id, req, res) {
               res.json({ status: "invalid", restrict: true, redirect: auth.redirect });
               res.json({ status: "invalid", restrict: true, redirect: auth.redirect });
               res.end();
               res.end();
               return false;
               return false;
-            } else if (typeof auth.has_pro_access === "undefined" && !auth.has_pro_access) {
+          } else if (auth.subscription_type &&
+            typeof auth.has_pro_access === "undefined" && !auth.has_pro_access) {
               res.json({ status: "invalid", restrict: true });
               res.json({ status: "invalid", restrict: true });
               res.end();
               res.end();
               return false;
               return false;
           }
           }
-        }
+        } else {
             let data = await getUsage({
             let data = await getUsage({
                 aiwp_logged_in, app: 'chatbot+'
                 aiwp_logged_in, app: 'chatbot+'
             });
             });
@@ -450,8 +451,11 @@ async function validation (aiwp_app_id, req, res) {
                 res.status(200);
                 res.status(200);
                 return false;
                 return false;
             }
             }
+        }
       } else {
       } else {
       IS_FREE_USER = true;
       IS_FREE_USER = true;
+    }
+    if(IS_FREE_USER) {
       let data = await getLimitedUsage({
       let data = await getLimitedUsage({
         "aiwp_app_id": aiwp_app_id
         "aiwp_app_id": aiwp_app_id
       });
       });
@@ -459,14 +463,13 @@ async function validation (aiwp_app_id, req, res) {
       if (data.usage !== null) {
       if (data.usage !== null) {
         TRIED_USAGE = parseInt(data.usage);
         TRIED_USAGE = parseInt(data.usage);
       }
       }
-
-    }
-    if (IS_FREE_USER && TRIED_USAGE >= limit) {
+      if (TRIED_USAGE >= limit) {
           res.json({ status: "invalid", limited: true });
           res.json({ status: "invalid", limited: true });
           res.end();
           res.end();
           return false;
           return false;
       }
       }
-    if (IS_FREE_USER) TRIED_USAGE++;
+      TRIED_USAGE++;
+    }
 
 
 		return { IS_FREE_USER, aiwp_logged_in, TRIED_USAGE };
 		return { IS_FREE_USER, aiwp_logged_in, TRIED_USAGE };
 };
 };