wip

app/classes/api_controller.php

@@ -18,6 +18,8 @@ use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Bedrock\Functions\Session;
 use TheTempusProject\Bedrock\Classes\Config;
 use TheTempusProject\Models\Token;
+use TheTempusProject\Canary\Bin\Canary as Debug;
+use TheTempusProject\Houdini\Classes\Views;
 
 class ApiController extends Controller {
     protected static $canAccessApplicationApi = false;
@@ -26,16 +28,15 @@ class ApiController extends Controller {
     protected static $authToken;
 
     public function __construct( $secure = true ) {
+        header('Content-Type: application/json; charset=utf-8');
         parent::__construct();
-        $this->verifyApiRequest();
-        if ( $secure && ! $this->canUseApi() ) {
-            Session::flash( 'error', 'You do not have permission to view this page.' );
-            return Redirect::home();
-        }
+        Template::setTemplate( 'api' );
         Template::noFollow();
         Template::noIndex();
-        Template::addHeader( 'Content-Type: application/json; charset=utf-8' );
-        Template::setTemplate( 'api' );
+        $res = $this->verifyApiRequest();
+        if ( $secure && ! $this->canUseApi() ) {
+            exit( $res );
+        }
     }
 
     protected function canUseApi() {
@@ -72,16 +73,16 @@ class ApiController extends Controller {
         } else {
             $secret = $this->getSecretToken();
             if ( empty( $secret ) ) {
-                return;
+                return Views::simpleView( 'api.response', ['response' => json_encode( [ 'error' => 'invalid secret' ], true )]);
             }
             $token = $tokens->findBySecret( $secret );
         }
         if ( empty( $token ) ) {
-            return;
+            return Views::simpleView( 'api.response', ['response' => json_encode( [ 'error' => 'invalid token' ], true )]);
         }
         self::$authToken = $token;
         if ( $token->expiresAt <= time() && empty( $secret ) ) {
-            return;
+            return Views::simpleView( 'api.response', ['response' => json_encode( [ 'error' => 'token expired' ], true )]);
         }
         if ( $token->expiresAt <= time() ) {
             self::$canAccessAuthenticationApi = true;

app/classes/forms.php

@@ -114,6 +114,7 @@ class Forms extends Check {
         self::addHandler( 'install',             __CLASS__, 'install' );
         self::addHandler( 'adminCreateToken',    __CLASS__, 'adminCreateToken' );
         self::addHandler( 'apiLogin',            __CLASS__, 'apiLogin' );
+        self::addHandler( 'updatePreference',    __CLASS__, 'updatePreference' );
         self::addHandler( 'installStart',        __CLASS__, 'install', [ 'start' ] );
         self::addHandler( 'installAgreement',    __CLASS__, 'install', [ 'agreement' ] );
         self::addHandler( 'installCheck',        __CLASS__, 'install', [ 'check' ] );
@@ -650,4 +651,16 @@ class Forms extends Check {
         }
         return true;
     }
+
+    public static function updatePreference() {
+        if ( !Input::exists( 'prefName' ) ) {
+            self::addUserError( 'You must specify a name' );
+            return false;
+        }
+        if ( !Input::exists( 'prefValue' ) ) {
+            self::addUserError( 'You must specify a value' );
+            return false;
+        }
+        return true;
+    }
 }

app/classes/preferences.php

@@ -201,6 +201,8 @@ class Preferences {
             $tempPrefsArray = $this->normalizePreferenceArray( $name, $details );
             if ( isset( $populated[ $name ] ) ) {
                 $tempPrefsArray['value'] = $populated[$name];
+            } else {
+                $tempPrefsArray['value'] = $tempPrefsArray['default'];
             }
             // $form .= Forms::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['default'], $tempPrefsArray['options'] );
             if ( $tempPrefsArray['type'] == 'checkbox' ) {