Merge pull request #182 from bcc-code:feature/public-only-content

Add support for showing content explicitly to public users only

Author: rvanoord

docs/signon/configuration.md

@@ -26,8 +26,9 @@ It is strongly discouraged to enable the *OIDC_CREATE_USERS* setting. This funct
 This setting controls the default visability of new pages and posts.
 
 1. **Public** - visible to all users, without logging in
-2. **Authenticated Users** - only visible to logged in users
+2. **Logged In** - only visible to logged in users
 3. **Members** - only visible to members of the specified *Member Organization* (see below)
+4. **Not Logged In** - only visible to users who are not logged in
 
 ## Feed Key
 

plugins/bcc-login/includes/class-bcc-login-settings.php

@@ -295,8 +295,9 @@ function register_settings() {
                 'value' => $this->_settings->default_visibility,
                 'values' => array(
                     1 => __( 'Public', 'bcc-login' ),
-                    2 => __( 'Authenticated Users', 'bcc-login' ),    
-                    3 => __( 'Members', 'bcc-login' ),                   
+                    2 => __( 'Logged In', 'bcc-login' ),    
+                    3 => __( 'Members', 'bcc-login' ),   
+                    -1 => __( 'Not Logged In', 'bcc-login' ),                
                 )
             )
         );

plugins/bcc-login/includes/class-bcc-login-visibility.php

@@ -6,6 +6,7 @@ class BCC_Login_Visibility {
     private BCC_Login_Client $_client;
     private BCC_Coreapi_Client $_coreapi;
 
+    public const VISIBILITY_PUBLIC_ONLY = -1;
     public const VISIBILITY_DEFAULT = 0;
     public const VISIBILITY_PUBLIC = 1;
     public const VISIBILITY_SUBSCRIBER = 2;
@@ -15,14 +16,16 @@ class BCC_Login_Visibility {
     private $levels = array(
         'bcc-login-member' => self::VISIBILITY_MEMBER,
         'subscriber'       => self::VISIBILITY_SUBSCRIBER,
-        'public'           => self::VISIBILITY_PUBLIC
+        'public'           => self::VISIBILITY_PUBLIC,
+        'public-only'      => self::VISIBILITY_PUBLIC_ONLY
     );
 
     // A mapping of level -> title.
     private $titles = array(
         self::VISIBILITY_PUBLIC => 'Public',
-        self::VISIBILITY_SUBSCRIBER => 'Authenticated Users',
-        self::VISIBILITY_MEMBER => 'Members'
+        self::VISIBILITY_SUBSCRIBER => 'Logged In',
+        self::VISIBILITY_MEMBER => 'Members',
+        self::VISIBILITY_PUBLIC_ONLY => 'Not Logged In',
     );
 
     private $visibility_post_types = array( 'post', 'page', 'attachment', 'nav_menu_item' );
@@ -353,6 +356,19 @@ function filter_pre_get_posts( $query ) {
             'value'   => $this->_client->get_current_user_level()
         );
 
+        // If user is logged in, exclude posts where visiblity is set to public-only
+        if ( is_user_logged_in() ) {
+            $rules = array(
+                'relation' => 'AND',
+                $rules,
+                array(
+                    'key'     => 'bcc_login_visibility',
+                    'compare' => '!=',
+                    'value'   => self::VISIBILITY_PUBLIC_ONLY
+                )
+            );
+        }
+
         // Include also posts where visibility isn't specified based on the Default Content Access
         if ( $this->_client->get_current_user_level() >= $this->_settings->default_visibility ) {
             $rules = array(
@@ -455,9 +471,7 @@ function filter_by_queried_target_groups($query) {
      * @return WP_Post[]
      */
     function filter_menu_items( $items ) {
-        if ( current_user_can( 'edit_posts' ) || $this->_settings->show_protected_menu_items ) {
-            return $items;
-        }
+
 
         $level   = $this->_client->get_current_user_level();
         $removed = array();
@@ -476,6 +490,18 @@ function filter_menu_items( $items ) {
                     $visibility = $this->_settings->default_visibility;
                 }
 
+                // Hide public-only menu items for users who are logged in (including editors)
+                if ( $visibility == self::VISIBILITY_PUBLIC_ONLY && is_user_logged_in() ) {
+                    $removed[] = $item->ID;
+                    unset( $items[ $key ] );
+                    continue;
+                }
+
+                // Otherwise, show everything to editors
+                if ( current_user_can( 'edit_posts' ) || $this->_settings->show_protected_menu_items ) {
+                    continue;
+                }
+
                 if ( $visibility && $visibility > $level ) {
                     $removed[] = $item->ID;
                     unset( $items[ $key ] );
@@ -555,12 +581,24 @@ public function get_number_of_user_groups() {
      * @return string
      */
     function on_render_block( $block_content, $block ) {
+
+        $visibility_set = false;
+        if ( isset( $block['attrs']['bccLoginVisibility'] ) ) {
+            $visibility = (int) $block['attrs']['bccLoginVisibility'];
+            $visibility_set = true;
+        }
+
+        // Hide public-only blocks for users who are logged in (including editors)
+        if ( $visibility_set && $visibility == self::VISIBILITY_PUBLIC_ONLY && is_user_logged_in() ) {
+            return '';
+        }
+
+        // Editors can see all other blocks
         if ( current_user_can( 'edit_posts' ) ) {
             return $block_content;
         }
 
-        if ( isset( $block['attrs']['bccLoginVisibility'] ) ) {
-            $visibility = (int) $block['attrs']['bccLoginVisibility'];
+        if ( $visibility_set) {
             if (!$visibility) {
                 $visibility = $this->_settings->default_visibility;
             }

plugins/bcc-login/src/visibility.js

@@ -29,12 +29,16 @@ const visibilityOptions = [
   },
   {
     value: levels.subscriber,
-    label: __("Authenticated Users"),
+    label: __("Logged In"),
   },
   {
     value: levels["bcc-login-member"],
     label: sprintf(__("%s Members"), localName),
   },
+  {
+    value: levels["public-only"],
+    label: __("Not Logged In"),
+  },
 ];
 
 function VisibilityOptions({