From aa2f624e26c33c16c86a7e30bdbe3a42834c4e24 Mon Sep 17 00:00:00 2001
From: AngryDragonite <109293673+AngryDragonite@users.noreply.github.com>
Date: Sun, 29 Sep 2024 19:43:58 +0200
Subject: [PATCH] Feat/add optional policies (#51)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: added 'optional' field to fof-terms-policies table
feat: added 'is_accepted' field to fof-terms-policy-user table
feat: added settings to opt out of consents in user profile
feat: added functionality that allows users to decline policies that were declared optional

* feat: accept policies really accepted by user instead of all

* feat: added 'additionalInfo' model attribute
feat: added 'ExtensionData' component

* feat: changes in policy consents in profile settings now save automatically
feat: changed 'ExtensionData' component, so it allows other extensions to sync with fof/terms
fix: synced new model field name to its DB column

* refactor: minor changes in 'ExtensionData' and 'PolicyEdit'

feat: started writing guide on how to integrate fof/terms with other extensions in README.md

* refactor: simplified addManagePoliciesOption code
feat: added translations
feat: improved ExtensionData component
feat: added recipe for integrating fof/terms with other extensions in README
fix: additionalInfo is now properly saved into DB
chore: removed redundant imports and comments

* Apply fixes from StyleCI

* refactor: changed additionalInfo column name into additional_info

* fix: fixed bug that caused inappropriate behaviour when deleting policies.

* style: formatted README.md

* fix: optional policies that were not accepted during registration are now saved properly.

* chore: added phpstan ignore to User::$fofTermsPoliciesState.

* Update resources/locale/en.yml

Co-authored-by: Davide Iadeluca <146922689+DavideIadeluca@users.noreply.github.com>

* Update resources/locale/en.yml

Co-authored-by: Davide Iadeluca <146922689+DavideIadeluca@users.noreply.github.com>

* chore: minor changes in addManagePoliciesOption.js

* chore: renamed migration files

* chore: revert file permissions

* chore: reverted file permissions
chore: removed accidently added files

* chore: fixed migration files' names

* chore: reset js/dist folder changes

* Delete js/dist/forum.js.map

* Delete js/dist/admin.js

* Delete js/dist/forum.js

* Delete js/dist/admin.js.map

* chore: sync fork and reset dist and package.json files

* style: reformat addManagePoliciesOption.js

* remove var_dump

* style: one array access method

* Apply fixes from StyleCI

* style: use link component

* fix: replace JSON column with longText for compatibility

* refactor: simplify migrations

* Apply fixes from StyleCI

* fix: mark existing policies as accepted for all users, then set the default value to false for new users

* Apply fixes from StyleCI

* chore: resolve merge conflict

---------

Co-authored-by: Rafał Całka <calka.rafal@gmail.com>
Co-authored-by: rafaucau <rafaucau@users.noreply.github.com>
Co-authored-by: Davide Iadeluca <146922689+DavideIadeluca@users.noreply.github.com>
Co-authored-by: flarum-bot <bot@flarum.org>
---
 README.md                                     | 152 ++++++++++++++++++
 extend.php                                    |  20 +--
 js/src/admin/components/ExtensionData.js      |  32 ++++
 js/src/admin/components/PolicyEdit.js         |  32 +++-
 js/src/admin/components/index.js              |   2 +
 js/src/common/models/Policy.js                |   2 +
 .../forum/components/AcceptPoliciesModal.js   |   4 +-
 .../components/addManagePoliciesOption.js     |  55 +++++++
 js/src/forum/index.js                         |   2 +
 ..._01_add_optional_policies_user_columns.php |  20 +++
 ...04_24_01_add_optional_policies_columns.php |  19 +++
 ...01_change_accepted_state_default_value.php |  26 +++
 resources/less/admin.less                     |  16 ++
 resources/less/forum.less                     |   5 +
 resources/locale/en.yml                       |   4 +-
 src/Controllers/PolicyDeclineController.php   |  56 +++++++
 src/Controllers/PolicyStoreController.php     |   1 +
 src/Data/UserPolicyData.php                   |   2 +
 src/Middlewares/RegisterMiddleware.php        |  59 +++++--
 src/Policy.php                                |  21 +++
 src/Repositories/PolicyRepository.php         |  30 +++-
 src/Validators/RegisterPolicyValidator.php    |   4 +-
 22 files changed, 523 insertions(+), 41 deletions(-)
 create mode 100644 js/src/admin/components/ExtensionData.js
 create mode 100644 js/src/forum/components/addManagePoliciesOption.js
 create mode 100644 migrations/2024_04_11_01_add_optional_policies_user_columns.php
 create mode 100644 migrations/2024_04_24_01_add_optional_policies_columns.php
 create mode 100644 migrations/2024_06_17_01_change_accepted_state_default_value.php
 create mode 100644 resources/less/forum.less
 create mode 100644 src/Controllers/PolicyDeclineController.php

diff --git a/README.md b/README.md
index f47ae66..c1e3155 100644
--- a/README.md
+++ b/README.md
@@ -56,6 +56,158 @@ You can customize who can skip the modal without accepting the new terms immedia
 
 Admins can see the date at which a user accepted the terms by going to their profile page and selecting the terms button in the dropdown menu. You can customize who can see those dates in the permissions.
 
+## For developers
+
+You can easily add a custom field in PolicyEdit component to integrate fof/terms with other extensions. In 
+`fof-terms-policies`, there is a column, `additionalInfo` dedicated to save your custom data into `fof/terms` database.
+Data is stored inside one, global JSON object, allowing multiple extensions to save their data. 
+
+```
+  additionalInfo JSON object example
+  
+  {
+    "fof/extension-1": "extension1 data",
+    "fof/extension-2": true,
+    "fof/extension-3": {"extension-3-boolval": false, "extension-3-stringval": "extension-3 data"}
+  }
+```
+
+You can save any value, as long as it is a primitive or a valid JSON object.
+
+To add your field to `additionalInfo`, you must follow these steps:
+1) Choose a custom **key** value, it is recommended to select Your extension's name to avoid naming conflicts. 
+2) Prepare a component, which You would want to insert into `PolicyEdit`
+3) Extend `PolicyEdit.prototype`'s `fields` method, and add Your component, wrapped inside `ExtensionData` component:
+```js
+  import { extend } from 'flarum/common/extend';
+  import PolicyEdit from 'fof/terms/components/PolicyEdit';
+  import ExtensionData from 'fof/terms/components/ExtensionData';
+  
+  export default function() {
+    extend(PolicyEdit.prototype, 'fields', function  (items) {
+      const key = 'fof/extension-1';
+      const priority = 81;
+      
+      items.add(
+        key,
+        <ExtensionData
+          keyattr={key}
+          policy={this.policy}
+          setDirty={() => {
+            this.dirty = true;
+          }}
+        >
+          {({ keyattr, policy, updateAttribute }) => 
+            <YourComponent 
+              keyattr={keyattr} 
+              policy={policy} 
+              updateAttribute={updateAttribute} 
+            />
+          }
+        </ExtensionData>,
+        priority
+      )
+    });
+  }
+``` 
+As shown above, `ExtensionData` component takes three props:
+1) `keyattr` - specified key, usually Your extension's name,
+2) `policy` - reference to `policy` object,
+3) `setDirty` - reference to function that allows saving the policy, if any change is made
+
+Your component should also take three props:
+1) `keyattr` - same as in above
+2) `policy` - same as above
+3) `updateAttribute` - reference to `ExtensionData`'s method that manages saving Your data into database 
+( it is a bit different than `PolicyEdit`'s updateAttribute method )
+
+
+Your component could look something like this:
+```js
+import Component from 'flarum/common/Component';
+
+export default class YourComponent extends Component {
+  oninit(vnode) {
+    super.oninit(vnode);
+    this.keyattr = vnode.attrs.keyattr; 
+    this.policy = vnode.attrs.policy; 
+    this.updateAttribute = vnode.attrs.updateAttribute;
+  }
+
+  view() {
+    return (
+      <>
+        <label>{this.keyattr}</label>
+        <textarea
+          class={'FormControl'}
+          value={this.policy.additionalInfo()[this.keyattr] || ''}
+          oninput={(val) => {
+            this.updateAttribute(val.target.value);
+          }}
+        />
+      </>
+    );
+  }
+}
+```
+This example shows a way to save data only as string format: `key: <string>`, however if You want to use data in a more
+sophisticated format, there are some rules that should be followed. Let's say You want to save a JSON object instead of 
+simple string, in a such form:
+`{"boolval": <boolean>,  "stringval": <string>}`.
+
+Here is an example how to obtain such behaviour:
+
+```js
+import Component from 'flarum/common/Component';
+import Switch from 'flarum/common/components/Switch';
+
+export default class YourSophisticatedComponent extends Component {
+  oninit(vnode) {
+    super.oninit(vnode);
+    this.keyattr = vnode.attrs.keyattr; 
+    this.policy = vnode.attrs.policy; 
+    this.updateAttribute = vnode.attrs.updateAttribute;
+  }
+
+  view() {
+    return (
+      <>
+        <label>{this.keyattr}</label>
+        <Switch
+          state={this.policy.additionalInfo()[this.keyattr]?.boolval || false}
+          onchange={(val) => {
+            let objectAttributes = this.policy.additionalInfo()[this.keyattr];
+            if (objectAttributes === undefined) {
+              objectAttributes = {};
+            }
+            objectAttributes['boolval'] = val;
+            this.updateAttribute(objectAttributes);
+          }}
+        >
+          boolval
+        </Switch>
+        <textarea
+          class={'FormControl'}
+          value={this.policy.additionalInfo()[this.keyattr]?.stringval || ''}
+          oninput={(val) => {
+            let objectAttributes = this.policy.additionalInfo()[this.keyattr];
+            if (objectAttributes === undefined) {
+              objectAttributes = {};
+            }
+            objectAttributes['stringval'] = val.target.value;
+            this.updateAttribute(objectAttributes);
+          }}
+        />
+      </>
+    );
+  }
+}
+```
+Note that `oninput` handler is a bit more complicated - in order to save some subvalue, you need to fetch the whole 
+JSON object, assign its subvalue, and then call `this.updateAttribute` method. 
+  
+As mentioned above, it is possible to store every value imaginable, as long as it is a primitive, or valid JSON object.
+
 ## Data Export
 
 In case you want to export the data (for your GDPR logs for example), a JSON and CSV export is available.
diff --git a/extend.php b/extend.php
index 50fa619..179d66f 100644
--- a/extend.php
+++ b/extend.php
@@ -17,7 +17,6 @@
 use Flarum\Api\Serializer\ForumSerializer;
 use Flarum\Database\AbstractModel;
 use Flarum\Extend;
-use Flarum\User\Event\Registered;
 use Flarum\User\User;
 use FoF\Terms\Middlewares\RegisterMiddleware;
 use FoF\Terms\Repositories\PolicyRepository;
@@ -29,7 +28,8 @@
         ->js(__DIR__.'/js/dist/admin.js')
         ->css(__DIR__.'/resources/less/admin.less'),
     (new Extend\Frontend('forum'))
-        ->js(__DIR__.'/js/dist/forum.js'),
+        ->js(__DIR__.'/js/dist/forum.js')
+        ->css(__DIR__.'/resources/less/forum.less'),
 
     new Extend\Locales(__DIR__.'/resources/locale'),
 
@@ -40,6 +40,7 @@
         ->patch('/fof/terms/policies/{id:[0-9]+}', 'fof.terms.api.policies.update', Controllers\PolicyUpdateController::class)
         ->delete('/fof/terms/policies/{id:[0-9]+}', 'fof.terms.api.policies.delete', Controllers\PolicyDeleteController::class)
         ->post('/fof/terms/policies/{id:[0-9]+}/accept', 'fof.terms.api.policies.accept', Controllers\PolicyAcceptController::class)
+        ->post('/fof/terms/policies/{id:[0-9]+}/decline', 'fof.terms.api.policies.decline', Controllers\PolicyDeclineController::class)
         ->get('/fof/terms/policies/{id:[0-9]+}/export.{format:json|csv}', 'fof.terms.api.policies.export', Controllers\PolicyExportController::class),
 
     (new Extend\Middleware('forum'))
@@ -48,6 +49,9 @@
     (new Extend\Model(User::class))
         ->relationship('fofTermsPolicies', function (AbstractModel $user): BelongsToMany {
             return $user->belongsToMany(Policy::class, 'fof_terms_policy_user')->withPivot('accepted_at');
+        })
+        ->relationship('fofTermsPoliciesState', function (AbstractModel $user): BelongsToMany {
+            return $user->belongsToMany(Policy::class, 'fof_terms_policy_user')->withPivot('is_accepted');
         }),
 
     (new Extend\User())
@@ -55,18 +59,6 @@
             return PermissionGroupProcessor::process($actor, $groupIds);
         }),
 
-    (new Extend\Event())
-        ->listen(Registered::class, function (Registered $event) {
-            /**
-             * @var PolicyRepository $policies
-             */
-            $policies = resolve(PolicyRepository::class);
-
-            // When a user registers, we automatically accept all policies
-            // We assume the checkboxes validation has been properly done pre-registration by the middleware
-            $policies->acceptAll($event->user);
-        }),
-
     (new Extend\Policy())
         ->modelPolicy(Policy::class, Access\PolicyPolicy::class)
         ->modelPolicy(User::class, Access\UserPolicy::class),
diff --git a/js/src/admin/components/ExtensionData.js b/js/src/admin/components/ExtensionData.js
new file mode 100644
index 0000000..5c74b8d
--- /dev/null
+++ b/js/src/admin/components/ExtensionData.js
@@ -0,0 +1,32 @@
+import Component from 'flarum/common/Component';
+
+export default class ExtensionData extends Component {
+  oninit(vnode) {
+    super.oninit(vnode);
+    this.keyattr = vnode.attrs.keyattr;
+    this.policy = vnode.attrs.policy;
+    this.setDirty = vnode.attrs.setDirty;
+    this.children = vnode.children;
+
+    this.updateAttribute = this.updateAttribute.bind(this); // Bind this to updateAttribute
+  }
+
+  view() {
+    let children =
+      typeof this.children[0] === 'function'
+        ? this.children[0]({ keyattr: this.keyattr, policy: this.policy, updateAttribute: this.updateAttribute })
+        : this.children;
+
+    return <div class={'Form-group'}>{children}</div>;
+  }
+
+  updateAttribute(value) {
+    let attributes = this.policy.additional_info();
+    attributes[this.keyattr] = value;
+    this.policy.pushAttributes({
+      ['additional_info']: attributes,
+    });
+
+    this.setDirty();
+  }
+}
diff --git a/js/src/admin/components/PolicyEdit.js b/js/src/admin/components/PolicyEdit.js
index 30b3081..c96058d 100644
--- a/js/src/admin/components/PolicyEdit.js
+++ b/js/src/admin/components/PolicyEdit.js
@@ -4,6 +4,7 @@ import extractText from 'flarum/common/utils/extractText';
 import ItemList from 'flarum/common/utils/ItemList';
 import withAttr from 'flarum/common/utils/withAttr';
 import Button from 'flarum/common/components/Button';
+import Switch from 'flarum/common/components/Switch';
 
 /* global m, dayjs */
 
@@ -26,6 +27,8 @@ export default class PolicyEdit {
         url: '',
         update_message: '',
         terms_updated_at: '',
+        optional: false,
+        additional_info: {},
       },
     });
   }
@@ -84,7 +87,7 @@ export default class PolicyEdit {
                   type: 'submit',
                   className: 'Button Button--danger',
                   loading: this.processing,
-                  onclick: this.deletePolicy.bind(this),
+                  onclick: (event) => this.deletePolicy(event),
                 },
                 app.translator.trans('fof-terms.admin.buttons.delete-policy')
               )
@@ -166,6 +169,26 @@ export default class PolicyEdit {
       85
     );
 
+    fields.add(
+      'optional',
+      <>
+        <div class={'Form-group'}>
+          <div class={' fof-terms-optional-checkbox'}>
+            <label class={'Form-group>label'}>{app.translator.trans('fof-terms.admin.policies.optional')}</label>
+            <Switch
+              className={'fof-terms-Switch-off'}
+              state={this.policy.optional()}
+              onchange={() => {
+                this.updateAttribute('optional', !this.policy.optional());
+              }}
+            />
+          </div>
+          <div class={'helpText'}>{app.translator.trans('fof-terms.admin.policies.optional-help')}</div>
+        </div>
+      </>,
+      83
+    );
+
     if (this.policy.exists) {
       fields.add(
         'export-url',
@@ -205,7 +228,6 @@ export default class PolicyEdit {
     this.policy.pushAttributes({
       [attribute]: value,
     });
-
     this.dirty = true;
   }
 
@@ -215,11 +237,8 @@ export default class PolicyEdit {
 
   savePolicy(event) {
     event.preventDefault();
-
     this.processing = true;
-
     const createNewRecord = !this.policy.exists;
-
     this.policy
       .save(this.policy.data.attributes)
       .then(() => {
@@ -240,7 +259,8 @@ export default class PolicyEdit {
       });
   }
 
-  deletePolicy() {
+  deletePolicy(event) {
+    event.preventDefault();
     if (
       !confirm(
         extractText(
diff --git a/js/src/admin/components/index.js b/js/src/admin/components/index.js
index 6fbb803..2d2b3ef 100644
--- a/js/src/admin/components/index.js
+++ b/js/src/admin/components/index.js
@@ -1,9 +1,11 @@
 import PolicyEdit from './PolicyEdit';
 import PolicyList from './PolicyList';
 import TermsSettingsPage from './TermsSettingsPage';
+import ExtensionData from './ExtensionData';
 
 export const components = {
   PolicyEdit,
   PolicyList,
   TermsSettingsPage,
+  ExtensionData,
 };
diff --git a/js/src/common/models/Policy.js b/js/src/common/models/Policy.js
index b67f101..88a54de 100644
--- a/js/src/common/models/Policy.js
+++ b/js/src/common/models/Policy.js
@@ -7,6 +7,8 @@ export default class Policy extends Model {
   url = Model.attribute('url');
   update_message = Model.attribute('update_message');
   terms_updated_at = Model.attribute('terms_updated_at');
+  optional = Model.attribute('optional');
+  additional_info = Model.attribute('additional_info');
   form_key = computed('id', (id) => 'fof_terms_policy_' + id);
 
   apiEndpoint() {
diff --git a/js/src/forum/components/AcceptPoliciesModal.js b/js/src/forum/components/AcceptPoliciesModal.js
index 0ce3778..b7ebc5c 100644
--- a/js/src/forum/components/AcceptPoliciesModal.js
+++ b/js/src/forum/components/AcceptPoliciesModal.js
@@ -88,7 +88,7 @@ export default class AcceptPoliciesModal extends Modal {
         Button.component(
           {
             className: 'Button Button--primary',
-            disabled: !this[policy.form_key()],
+            disabled: !this[policy.form_key()] && !policy.optional(),
             onclick: () => {
               // We need to save the "must accept" property before performing the request
               // Because an updated user serializer will be returned
@@ -96,7 +96,7 @@ export default class AcceptPoliciesModal extends Modal {
 
               app
                 .request({
-                  url: app.forum.attribute('apiUrl') + policy.apiEndpoint() + '/accept',
+                  url: app.forum.attribute('apiUrl') + policy.apiEndpoint() + (this[policy.form_key()] ? '/accept' : '/decline'),
                   method: 'POST',
                   errorHandler: this.onerror.bind(this),
                 })
diff --git a/js/src/forum/components/addManagePoliciesOption.js b/js/src/forum/components/addManagePoliciesOption.js
new file mode 100644
index 0000000..ed3b221
--- /dev/null
+++ b/js/src/forum/components/addManagePoliciesOption.js
@@ -0,0 +1,55 @@
+import { extend } from 'flarum/common/extend';
+import app from 'flarum/forum/app';
+import SettingsPage from 'flarum/forum/components/SettingsPage';
+import FieldSet from 'flarum/common/components/FieldSet';
+import Switch from 'flarum/common/components/Switch';
+import Link from 'flarum/common/components/Link';
+
+async function updatePolicy(policy, value) {
+  const endpoint = `${app.forum.attribute('apiUrl')}${policy.apiEndpoint()}${value ? '/accept' : '/decline'}`;
+  const updated = await app.request({
+    url: endpoint,
+    method: 'POST',
+  });
+  app.store.pushPayload(updated);
+}
+
+export default function () {
+  extend(SettingsPage.prototype, 'settingsItems', function (items) {
+    const policies = app.store.all('fof-terms-policies').filter((policy) => policy.optional());
+
+    let policyState = app.session.user.fofTermsPoliciesState();
+
+    items.add(
+      'policies',
+      <FieldSet label={'Policies'}>
+        {policies.map((policy) => {
+          const { is_accepted } = policyState[policy.id()];
+          return (
+            <div class={'Fof-Terms-Policy-User-Settings-Management'}>
+              <Switch
+                state={is_accepted}
+                onchange={async (value) => {
+                  policyState[policy.id()].is_accepted = value;
+                  this[policy.form_key()] = value;
+                  await updatePolicy(policy, value);
+                  m.redraw();
+                }}
+              >
+                {' '}
+                {policy.url() ? (
+                  <Link target="_blank" href={policy.url()}>
+                    {policy.name()}
+                  </Link>
+                ) : (
+                  policy.name()
+                )}
+              </Switch>
+            </div>
+          );
+        })}
+      </FieldSet>,
+      -200
+    );
+  });
+}
diff --git a/js/src/forum/index.js b/js/src/forum/index.js
index 60a01c1..50356b4 100644
--- a/js/src/forum/index.js
+++ b/js/src/forum/index.js
@@ -6,6 +6,7 @@ import addAcceptModal from './addAcceptModal';
 import addFieldsToRegister from './addFieldsToRegister';
 import addUpdateAlert from './addUpdateAlert';
 import addUserPoliciesStateControl from './addUserPoliciesStateControl';
+import addManagePoliciesOption from './components/addManagePoliciesOption';
 
 export * from './components';
 export * from '../common/models';
@@ -23,4 +24,5 @@ app.initializers.add('fof-terms', () => {
   addFieldsToRegister();
   addUpdateAlert();
   addUserPoliciesStateControl();
+  addManagePoliciesOption();
 });
diff --git a/migrations/2024_04_11_01_add_optional_policies_user_columns.php b/migrations/2024_04_11_01_add_optional_policies_user_columns.php
new file mode 100644
index 0000000..09284ea
--- /dev/null
+++ b/migrations/2024_04_11_01_add_optional_policies_user_columns.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of fof/terms.
+ *
+ * Copyright (c) FriendsOfFlarum.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Flarum\Database\Migration;
+
+return Migration::addColumns('fof_terms_policy_user', [
+    'is_accepted' => [
+        'boolean',
+        // Prior to this migration, all policies were required, so we mark them as accepted.
+        'default' => true,
+    ],
+]);
diff --git a/migrations/2024_04_24_01_add_optional_policies_columns.php b/migrations/2024_04_24_01_add_optional_policies_columns.php
new file mode 100644
index 0000000..6d607d7
--- /dev/null
+++ b/migrations/2024_04_24_01_add_optional_policies_columns.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of fof/terms.
+ *
+ * Copyright (c) FriendsOfFlarum.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Flarum\Database\Migration;
+
+return Migration::addColumns('fof_terms_policies', [
+    'optional' => ['boolean', 'default' => false],
+    // This could be a JSON column type, but Flarum requires MySQL 5.6+ / MariaDB 10.0.5+.
+    // JSON columns are supported in MySQL 5.7+ / MariaDB 10.2+.
+    'additional_info' => ['longText', 'nullable' => true],
+]);
diff --git a/migrations/2024_06_17_01_change_accepted_state_default_value.php b/migrations/2024_06_17_01_change_accepted_state_default_value.php
new file mode 100644
index 0000000..1c0d090
--- /dev/null
+++ b/migrations/2024_06_17_01_change_accepted_state_default_value.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of fof/terms.
+ *
+ * Copyright (c) FriendsOfFlarum.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+
+return [
+    'up' => function (Builder $schema) {
+        $schema->table('fof_terms_policy_user', function (Blueprint $table) {
+            $table->boolean('is_accepted')->default(false)->change();
+        });
+    },
+    'down' => function (Builder $schema) {
+        $schema->table('fof_terms_policy_user', function (Blueprint $table) {
+            $table->boolean('is_accepted')->default(true)->change();
+        });
+    },
+];
diff --git a/resources/less/admin.less b/resources/less/admin.less
index 2ea4133..487c05c 100644
--- a/resources/less/admin.less
+++ b/resources/less/admin.less
@@ -62,3 +62,19 @@
         max-width: none;
     }
 }
+
+.fof-terms-optional-checkbox {
+    display: flex;
+    align-items: center;
+    width: 70%;
+    justify-content: space-between;
+
+    font-size: 14px;
+    font-weight: bold;
+    margin-bottom: 0;
+    color: var(--text-color);
+}
+
+.fof-terms-Switch-off {
+    --control-bg: #AAAAAA !important;
+}
diff --git a/resources/less/forum.less b/resources/less/forum.less
new file mode 100644
index 0000000..abb2e94
--- /dev/null
+++ b/resources/less/forum.less
@@ -0,0 +1,5 @@
+.Fof-Terms-Policy-User-Settings-Management {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
diff --git a/resources/locale/en.yml b/resources/locale/en.yml
index 58196e3..b7adfaa 100644
--- a/resources/locale/en.yml
+++ b/resources/locale/en.yml
@@ -43,6 +43,8 @@ fof-terms:
             export-url-help: >
                 Any user with permission "Export all policies data" can access those URLs to download the list of users who accepted this policy.
                 You can find more details about the available options on the <a>extension wiki</a>.
+            optional: Optional Policy
+            optional-help: When enabled, users can use and interact with the forum without accepting this policy.
 
         permissions:
             see-user-policies-state: See the user policies state
@@ -80,4 +82,4 @@ blomstra-gdpr:
         data:
             userpolicydata:
                 export_description: Details about the user's acceptance of the terms
-                delete_description: Removes the user's acceptance of the terms
\ No newline at end of file
+                delete_description: Removes the user's acceptance of the terms
diff --git a/src/Controllers/PolicyDeclineController.php b/src/Controllers/PolicyDeclineController.php
new file mode 100644
index 0000000..3c7be92
--- /dev/null
+++ b/src/Controllers/PolicyDeclineController.php
@@ -0,0 +1,56 @@
+<?php
+
+/*
+ * This file is part of fof/terms.
+ *
+ * Copyright (c) FriendsOfFlarum.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FoF\Terms\Controllers;
+
+use Flarum\Api\Controller\AbstractShowController;
+use Flarum\Api\Serializer\BasicUserSerializer;
+use Flarum\Http\RequestUtil;
+use Flarum\User\Exception\NotAuthenticatedException;
+use FoF\Terms\Repositories\PolicyRepository;
+use Illuminate\Support\Arr;
+use Psr\Http\Message\ServerRequestInterface;
+use Tobscure\JsonApi\Document;
+
+class PolicyDeclineController extends AbstractShowController
+{
+    public $serializer = BasicUserSerializer::class;
+
+    protected $policies;
+
+    public function __construct(PolicyRepository $policies)
+    {
+        $this->policies = $policies;
+    }
+
+    /**
+     * @param ServerRequestInterface $request
+     * @param Document               $document
+     *
+     * @throws NotAuthenticatedException
+     *
+     * @return mixed
+     */
+    protected function data(ServerRequestInterface $request, Document $document)
+    {
+        $id = Arr::get($request->getQueryParams(), 'id');
+
+        $policy = $this->policies->findOrFail($id);
+
+        $actor = RequestUtil::getActor($request);
+
+        $actor->assertRegistered();
+
+        $this->policies->declineOptional($actor, $policy);
+
+        return $actor;
+    }
+}
diff --git a/src/Controllers/PolicyStoreController.php b/src/Controllers/PolicyStoreController.php
index 03f0fff..0cba9f3 100644
--- a/src/Controllers/PolicyStoreController.php
+++ b/src/Controllers/PolicyStoreController.php
@@ -47,6 +47,7 @@ protected function data(ServerRequestInterface $request, Document $document)
         $actor->assertAdmin();
 
         $attributes = Arr::get($request->getParsedBody(), 'data.attributes', []);
+        $attributes['additional_info'] = Arr::get($attributes, 'additional_info', '{}');
 
         return $this->policies->store($actor, $attributes);
     }
diff --git a/src/Data/UserPolicyData.php b/src/Data/UserPolicyData.php
index 7a2d2c5..6b80aad 100644
--- a/src/Data/UserPolicyData.php
+++ b/src/Data/UserPolicyData.php
@@ -50,9 +50,11 @@ protected function constructExportData(Policy $policy): array
             'created_at'       => $policy->created_at,
             'update_message'   => $policy->update_message,
             'terms_updated_at' => $policy->terms_updated_at,
+            'optional'         => $policy->optional,
             'accepted_at'      => $accepted_at,
             'has_update'       => $has_update,
             'must_accept'      => $has_update && !$this->user->can('postponeAccept', $policy),
+            'additional_info'  => $policy->additional_info,
         ];
     }
 
diff --git a/src/Middlewares/RegisterMiddleware.php b/src/Middlewares/RegisterMiddleware.php
index c083b1a..7f34538 100644
--- a/src/Middlewares/RegisterMiddleware.php
+++ b/src/Middlewares/RegisterMiddleware.php
@@ -13,7 +13,10 @@
 
 use Flarum\Foundation\ErrorHandling\ExceptionHandler\IlluminateValidationExceptionHandler;
 use Flarum\Foundation\ErrorHandling\JsonApiFormatter;
+use Flarum\User\User;
+use FoF\Terms\Repositories\PolicyRepository;
 use FoF\Terms\Validators\RegisterPolicyValidator;
+use Illuminate\Support\Arr;
 use Illuminate\Validation\ValidationException;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
@@ -34,28 +37,54 @@ class RegisterMiddleware implements MiddlewareInterface
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         // Compare if the current path is the register endpoint
-        if ($request->getUri()->getPath() === '/register') {
+        if ($request->getUri()->getPath() !== '/register') {
+            return $handler->handle($request);
+        }
+
+        /**
+         * @var RegisterPolicyValidator $validator
+         */
+        $validator = resolve(RegisterPolicyValidator::class);
+
+        try {
+            $validator->assertValid($request->getParsedBody());
+        } catch (ValidationException $exception) {
             /**
-             * @var RegisterPolicyValidator $validator
+             * @var IlluminateValidationExceptionHandler $handler
              */
-            $validator = resolve(RegisterPolicyValidator::class);
+            $handler = resolve(IlluminateValidationExceptionHandler::class);
+
+            // We need to handle/format the error ourselves because the front-end (forum) doesn't have that error handler
+            // Only the API-end has it (that's where the remaining of the sign up / login logic is)
+            $error = $handler->handle($exception);
+
+            return (new JsonApiFormatter())->format($error, $request);
+        }
+
+        $response = $handler->handle($request);
+        if ($response->getStatusCode() < 400) {
+            $response->getBody()->rewind();
+            $payload = json_decode($response->getBody()->getContents(), true);
+
+            /** @var User $user */
+            $user = User::find(Arr::get($payload, 'data.id'));
 
-            try {
-                $validator->assertValid($request->getParsedBody());
-            } catch (ValidationException $exception) {
-                /**
-                 * @var IlluminateValidationExceptionHandler $handler
-                 */
-                $handler = resolve(IlluminateValidationExceptionHandler::class);
+            /**
+             * @var PolicyRepository $policies
+             */
+            $policies = resolve(PolicyRepository::class);
 
-                // We need to handle/format the error ourselves because the front-end (forum) doesn't have that error handler
-                // Only the API-end has it (that's where the remaining of the sign up / login logic is)
-                $error = $handler->handle($exception);
+            $requestBody = $request->getParsedBody();
 
-                return (new JsonApiFormatter())->format($error, $request);
+            foreach ($policies->all() as $policy) {
+                if (isset($requestBody['fof_terms_policy_'.$policy->id]) && $requestBody['fof_terms_policy_'.$policy->id] === true) {
+                    $policies->accept($user, $policy);
+                } else {
+                    $policies->declineOptional($user, $policy);
+                }
             }
         }
 
-        return $handler->handle($request);
+        return $response;
     }
 }
diff --git a/src/Policy.php b/src/Policy.php
index 216cf1d..5a63998 100644
--- a/src/Policy.php
+++ b/src/Policy.php
@@ -24,6 +24,8 @@
  * @property Carbon $terms_updated_at
  * @property Carbon $created_at
  * @property Carbon $updated_at
+ * @property bool   $optional
+ * @property array  $additional_info
  */
 class Policy extends AbstractModel
 {
@@ -31,6 +33,10 @@ class Policy extends AbstractModel
 
     public $timestamps = true;
 
+    protected $casts = [
+        'additional_info' => 'array',
+    ];
+
     protected $dates = [
         'terms_updated_at',
     ];
@@ -41,6 +47,8 @@ class Policy extends AbstractModel
         'url',
         'update_message',
         'terms_updated_at',
+        'optional',
+        'additional_info',
     ];
 
     protected $fillable = [
@@ -48,6 +56,9 @@ class Policy extends AbstractModel
         'url',
         'update_message',
         'terms_updated_at',
+        'optional',
+        'additional_info',
+
     ];
 
     public function users()
@@ -69,4 +80,14 @@ protected function setTermsUpdatedAtAttribute($value)
     {
         $this->attributes['terms_updated_at'] = $value ? Carbon::parse($value) : null;
     }
+
+    protected function setOptionalAttribute($value)
+    {
+        $this->attributes['optional'] = $value ? true : false;
+    }
+
+    protected function setAdditionalInfoAttribute($value)
+    {
+        $this->attributes['additional_info'] = json_encode($value);
+    }
 }
diff --git a/src/Repositories/PolicyRepository.php b/src/Repositories/PolicyRepository.php
index f4b37c4..dbb452f 100644
--- a/src/Repositories/PolicyRepository.php
+++ b/src/Repositories/PolicyRepository.php
@@ -88,12 +88,21 @@ public function state(User $user)
             foreach ($this->all() as $policy) {
                 $accepted_at = $userPolicies->has($policy->id) ? Carbon::parse($userPolicies->get($policy->id)->pivot->accepted_at) : null;
                 $has_update = !$accepted_at || (($policy->terms_updated_at !== null) && $policy->terms_updated_at->gt($accepted_at));
+                $optional = $policy->optional;
+
+                /**
+                 * @var bool $is_accepted
+                 *
+                 * @phpstan-ignore-next-line
+                 */
+                $is_accepted = $user->fofTermsPoliciesState->keyBy('id')->get($policy->id)->pivot->is_accepted;
 
                 $this->rememberState[$policy->id] = [
                     // Same format as Flarum is using for the serializer responses
                     'accepted_at' => $accepted_at ? $accepted_at->format(DateTime::RFC3339) : null,
                     'has_update'  => $has_update,
-                    'must_accept' => $has_update && !$user->can('postponeAccept', $policy),
+                    'must_accept' => $has_update && !$user->can('postponeAccept', $policy) && !$optional,
+                    'is_accepted' => $is_accepted,
                 ];
             }
         }
@@ -194,6 +203,7 @@ public function accept(User $user, Policy $policy)
 
         $pivot = [
             'accepted_at' => Carbon::now(),
+            'is_accepted' => true,
         ];
 
         if ($exists) {
@@ -206,16 +216,32 @@ public function accept(User $user, Policy $policy)
     public function acceptAll(User $user)
     {
         $relationship = [];
-
         foreach ($this->all() as $policy) {
             $relationship[$policy->id] = [
                 'accepted_at' => Carbon::now(),
+                'is_accepted' => true,
             ];
         }
 
         $this->getUserPolicyRelationship($user)->attach($relationship);
     }
 
+    public function declineOptional(User $user, Policy $policy)
+    {
+        $exists = $this->getUserPolicyRelationship($user)->where('id', $policy->id)->exists();
+
+        $pivot = [
+            'accepted_at' => null,
+            'is_accepted' => false,
+        ];
+
+        if ($exists) {
+            $this->getUserPolicyRelationship($user)->updateExistingPivot($policy->id, $pivot);
+        } else {
+            $this->getUserPolicyRelationship($user)->attach($policy->id, $pivot);
+        }
+    }
+
     public function declineAll(User $user)
     {
         $this->getUserPolicyRelationship($user)->detach();
diff --git a/src/Validators/RegisterPolicyValidator.php b/src/Validators/RegisterPolicyValidator.php
index c08f49d..51c9ef8 100644
--- a/src/Validators/RegisterPolicyValidator.php
+++ b/src/Validators/RegisterPolicyValidator.php
@@ -26,7 +26,9 @@ protected function getRules()
         $rules = [];
 
         foreach ($policies->all() as $policy) {
-            $rules['fof_terms_policy_'.$policy->id] = 'accepted';
+            if (!$policy->optional) {
+                $rules['fof_terms_policy_'.$policy->id] = 'accepted';
+            }
         }
 
         return $rules;