'motp_enable' is StringField with "on"/"off" choices and required now.

This allow to properly set conditions for 'password'

Author: vitspec99

pfSense-pkg-RESTAPI/files/usr/local/pkg/RESTAPI/Models/FreeRADIUSUser.inc

@@ -27,7 +27,7 @@ class FreeRADIUSUser extends Model {
     public StringField $username;
     public StringField $password;
     public StringField $password_encryption;
-    public BooleanField $motp_enable;
+    public StringField $motp_enable;
     public StringField $motp_authmethod;
     public StringField $motp_secret;
     public StringField $motp_pin;
@@ -58,44 +58,42 @@ class FreeRADIUSUser extends Model {
 
         $this->password = new StringField(
             required: true,
-            conditions: ['motp_enable' => false],
+            conditions: ['motp_enable' => 'off'],
             allow_empty: false,
             allow_null: false,
             internal_name: 'varuserspassword',
             sensitive: true,
         );
         $this->password_encryption = new StringField(
             required: false,
-            conditions: ['motp_enable' => false],
+            conditions: ['motp_enable' => 'off'],
             choices: [ 'Cleartext-Password', 'MD5-Password', 'MD5-Password-hashed', 'NT-Password-hashed' ],
             default: 'Cleartext-Password',
             internal_name: 'varuserspasswordencryption',
         );
 
-        $this->motp_enable = new BooleanField(
-            required: false,
-            default: false,
-            indicates_true: 'on',
-            indicates_false: 'off',
+        $this->motp_enable = new StringField(
+            required: true,
+            choices: [ 'on', 'off' ],
             internal_name: 'varusersmotpenable',
         );
         $this->motp_authmethod = new StringField(
             required: false,
-            conditions: ['motp_enable' => true],
+            conditions: ['motp_enable' => 'on'],
             choices: [ 'motp', 'googleauth' ],
             default: 'googleauth',
             internal_name: 'varusersauthmethod',
         );
         $this->motp_secret = new StringField(
             required: true,
-            conditions: ['motp_enable' => true],
+            conditions: ['motp_enable' => 'on'],
             allow_null: false,
             internal_name: 'varusersmotpinitsecret',
             sensitive: true,
         );
         $this->motp_pin = new StringField(
             required: true,
-            conditions: ['motp_enable' => true],
+            conditions: ['motp_enable' => 'on'],
             allow_null: false,
             minimum_length: 4,
             maximum_length: 4,
@@ -104,7 +102,7 @@ class FreeRADIUSUser extends Model {
         );
         $this->motp_offset = new IntegerField(
             required: false,
-            conditions: ['motp_enable' => true],
+            conditions: ['motp_enable' => 'on'],
             allow_null: false,
             default: 0,
             internal_name: 'varusersmotpoffset',
@@ -129,7 +127,12 @@ class FreeRADIUSUser extends Model {
     public function _create() {
         $input_errors = [];
 
+        if ( $this->motp_enable->value == 'off' ) {
+            $this->motp_enable->value = '';
+        }
+
         $user = $this->to_internal();
+
         freeradius_validate_users($user, $input_errors);
 
         if ( ! empty($input_errors) ) {