changed auth process to just ask server if session is active

brain/api/v1/AuthAPI.inc.php

@@ -9,6 +9,7 @@ class AuthAPI
   public static function status()
   {
     $result = [];
+    //internal check for admin action
     if (Auth::status()) {
       $result = [
         "message" => "Authorized",

brain/controller/APIControl.inc.php

@@ -19,14 +19,7 @@ class APIControl
     $filename = "";
     switch (isset($args["third"]) ? $args["third"] : "none") {
       case "status":
-        if (Member::verifyKey($_GET["key"])) {
+        $result = AuthAPI::status();
-          $result = AuthAPI::status();
-        } else {
-          $result = [
-            "message" => "Valid key required. API access denied, homie",
-            "type" => "API_ERROR",
-          ];
-        }
 
         break;
       case "page":

brain/views/dash/start.twig

@@ -23,5 +23,5 @@
     {% endblock %}
 
     {% block javascripts %}
-        <script src="/assets/scripts/dash.min.js" type="text/javascript"></script>
+        <script src="/assets/scripts/dash.min.js?" type="text/javascript"></script>
     {% endblock %}

src/com/controllers/NavIndex.js

@@ -11,10 +11,7 @@ export default class NavIndex {
   //--------------------------
   constructor() {
     this.processing = false;
-    this.admin = new FipamoAdminAPI(
+    this.admin = new FipamoAdminAPI(null);
-      null,
-      "fe79df250470815bf32dcea70221384c89163cad3a827a9c3da25d87159ed55a"
-    );
     this.start();
   }
   //--------------------------

src/com/controllers/PageEditor.js

@@ -19,10 +19,7 @@ export default class PostEditor {
   constructor() {
     this.processing = false;
     let self = this;
-    this.admin = new FipamoAdminAPI(
+    this.admin = new FipamoAdminAPI(null);
-      null,
-      "fe79df250470815bf32dcea70221384c89163cad3a827a9c3da25d87159ed55a"
-    );
     this.urlPieces = document.URL.split("/");
     this.post = [];
     this.postID = null;

src/com/controllers/SettingsIndex.js

@@ -14,10 +14,7 @@ export default class SettingsIndex {
   constructor() {
     this.processing = false;
     this.start();
-    this.admin = new FipamoAdminAPI(
+    this.admin = new FipamoAdminAPI(null);
-      null,
-      "fe79df250470815bf32dcea70221384c89163cad3a827a9c3da25d87159ed55a"
-    );
     this.mm = new Maintenance(null, null);
   }
   //--------------------------

src/libraries/FipamoAdminAPI.js

@@ -44,28 +44,23 @@ class FipamoAdminAPI {
   /**
    * @constructor
    * @param {string} baseURL - url of site; uses local when empty
-   * @param {string} key - user api key
    */
-  constructor(baseURL = null, key = null) {
+  constructor(baseURL = null) {
     this.percentComplete = 0; //for later
-    this.token = null;
     this.baseURL = null;
-    this.key = null;
+    this.status = false;
-    if (key) this.key = key;
     if (baseURL) this.baseURL = baseURL;
-    //if key is valid, checks to see if a session is active and returns
+    //asks server if a session is active
-    this._request(
+    this._request(this.baseURL ? this.baseURL + API_STATUS : API_STATUS).then(
-      this.baseURL
+      (response) => {
-        ? this.baseURL + API_STATUS + "?key=" + this.key
+        if (response.type === API_ACCESS_GOOD) {
-        : API_STATUS + "?key=" + this.key
+          this.token = response.token;
-    ).then((response) => {
+        } else {
-      if (response.type === API_ACCESS_GOOD) {
+          //don't set token
-        this.token = response.token;
+          //console.log("NO TOKEN");
-      } else {
+        }
-        //don't set token
-        //console.log("NO TOKEN");
       }
-    });
+    );
   }
   /**
    * Promise method for authenticating and starting a session\
@@ -262,7 +257,7 @@ class FipamoAdminAPI {
     }
 
     if (this.baseURL) {
-      data.key = this.key;
+      //data.key = this.key;
       data.remote = true;
     } else {
       data.remote = false;