Merge branch '27190_loggedin' into '1DEVT'

27190_loggedin See merge request !52

Merge branch '27190_loggedin' into '1DEVT'
27190_loggedin See merge request !52
Jonille Arreglo
Showing 5 changed files with 30 additions and 47 deletions
client/public/assets/js/auth.js
client/public/index.html
client/src/App.js
client/src/handlers/appendScript.js
client/src/index.js
--- a/client/public/assets/js/auth.js deleted 100644 → 0
View file @b804a97
+++ b/client/public/assets/js/auth.js deleted 100644 → 0
View file @b804a97
-let aiUser = btutil_getCookie('aiwp_logged_in');
-let objBody = { aiwp_logged_in: aiUser };
-
-let params = [];
-params['objBody'] = objBody;
-params['strUrl'] = 'https://test.api.ai-pro.org/e/v1/authenticate/'; //use envvar for https://test.api.ai-pro.org/ only
-
-btutil_checkAuthentication(params, cbCheckAuthentication, cbErrCheckAuthentication);
-function cbCheckAuthentication(res) {
-    // console.log(res);
-    if (!res.success) {
-        window.location.href = "https://ai-pro.org/redirect-account-required/";  //use  envvar
-    } else {
-        document.getElementById("root").classList.add("active");
-    }
-}
-
-function cbErrCheckAuthentication(res) {
-    console.log(res);
-}
\ No newline at end of file
--- a/client/public/index.html
View file @8d826f8
+++ b/client/public/index.html
View file @8d826f8
@@ -26,6 +26,33 @@
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
    <title>AI-Pro ChatGPT</title>
+    <script src='%REACT_APP_S3_LINK%/common/btutil-authenticate.min.js'></script>
+    <script>
+      let aiUser = btutil_getCookie('aiwp_logged_in');
+      if(!aiUser) {
+        window.location.href = '%REACT_APP_REDIRECT_ACCOUNT%';
+      } else {
+        let objBody = { aiwp_logged_in: aiUser };
+
+        let params = [];
+        params['objBody'] = objBody;
+        params['strUrl'] = '%REACT_APP_API_LINK%/e/v1/authenticate/';
+
+        btutil_checkAuthentication(params, cbCheckAuthentication, cbErrCheckAuthentication);
+        function cbCheckAuthentication(res) {
+            // console.log(res);
+            if (!res.success) {
+                window.location.href = '%REACT_APP_REDIRECT_ACCOUNT%';
+            } else {
+                document.getElementById("root").classList.add("active");
+            }
+        }
+
+        function cbErrCheckAuthentication(res) {
+            console.log(res);
+        }
+      }
+    </script>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/client/src/App.js
View file @8d826f8
+++ b/client/src/App.js
View file @8d826f8
@@ -47,7 +47,9 @@ function App() {
      let model_list = [];
      for( var i = 1; i < data.models.data.length; i++ ) {
        let model = data.models.data[i];
-        if(model.id != "whisper-1") model_list.push(model);
+        if( !(model.id == "whisper-1"
+        || model.id == "gpt-4"
+        || model.id == "gpt-4-0314") ) model_list.push(model);
      }
      setModels(model_list)
    })
--- a/client/src/handlers/appendScript.js deleted 100644 → 0
View file @b804a97
+++ b/client/src/handlers/appendScript.js deleted 100644 → 0
View file @b804a97
-const appendScript = (scriptToAppend, callback = null) => {
-    const script = document.createElement("script");
-    script.src = scriptToAppend;
-    script.async = false;
-    document.body.appendChild(script);
-
-    if(!callback) return;
-    if(script.readyState) {  // only required for IE <9
-        script.onreadystatechange = function() {
-          if ( script.readyState === "loaded" || script.readyState === "complete" ) {
-            script.onreadystatechange = null;
-            callback();
-          }
-        };
-    } else {  //Others
-        script.onload = function() {
-          callback();
-        };
-    }
-}
-
-export default appendScript;
\ No newline at end of file
--- a/client/src/index.js
View file @8d826f8
+++ b/client/src/index.js
View file @8d826f8
@@ -2,7 +2,6 @@ import React from 'react';
 import ReactDOM from 'react-dom/client';
 import './index.css';
 import App from './App';
-import appendScript from './handlers/appendScript';
 import reportWebVitals from './reportWebVitals';

 const root = ReactDOM.createRoot(document.getElementById('root'));
@@ -16,6 +15,3 @@ root.render(
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
 reportWebVitals();
-
-appendScript("https://btcomponent-1devt.s3.us-east-1.amazonaws.com/common/btutil-authenticate.min.js");
-appendScript("http://localhost:3000/assets/js/auth.js");
\ No newline at end of file