Feature-old plugin compatibility

.github/workflows/phpcs.yml

@@ -11,7 +11,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "7.3"
+          php-version: "7.4"
           coverage: none
           tools: composer, cs2pr
 

composer.json

@@ -24,7 +24,7 @@
   ],
   "require": {
     "php": ">=5.5",
-    "league/csv": "^7.2",
+    "league/csv": "9.8",
     "appsero/client": "v2.0.4"
   },
   "require-dev": {

includes/Admin/Notice.php

@@ -71,7 +71,7 @@ public function connect_notice() {
                 update_option( 'wemail_site_connection_notice', 1 );
             }
         }
-        if ( ! get_user_meta( get_current_user_id(), 'wemail_api_key', true ) && (int) get_option( 'wemail_site_connection_notice' ) !== 1 && ! ( isset( $_GET['page'] ) && $_GET['page'] === 'wemail' ) ) {
+        if ( ! get_option( 'wemail_api_key' ) && (int) get_option( 'wemail_site_connection_notice' ) !== 1 && ! ( isset( $_GET['page'] ) && $_GET['page'] === 'wemail' ) ) {
             add_action( 'admin_notices', array( $this, 'connect_notice_html' ) );
         }
     }

includes/Admin/Scripts.php

@@ -64,7 +64,7 @@
     public function enqueue_scripts() {
         wp_enqueue_media();
 
         wp_register_script( 'wemail-tiny-mce', site_url( '/wp-includes/js/tinymce/tinymce.min.js' ), array(), true );
         wp_register_script( 'wemail-tiny-mce-code', wemail()->wemail_cdn . '/vendor/tinymce/plugins/code/plugin.min.js', array( 'wemail-tiny-mce' ), $this->version, true );
         wp_register_script( 'wemail-tiny-mce-hr', wemail()->wemail_cdn . '/vendor/tinymce/plugins/hr/plugin.min.js', array( 'wemail-tiny-mce-code' ), $this->version, true );
 
@@ -139,7 +139,8 @@
             'user'                 => array(
                 'hash'             => $user->hash,
                 'role'             => $user->role,
-                'permissions'      => $user->permissions,
+                'allowed'          => $user->allowed,
+                // 'permissions'      => $user->permissions,
             ),
             'currentUser' => $current_user ? array(
                 'name' => $current_user->display_name,

includes/Core/Api/Api.php

@@ -169,6 +169,17 @@ public function has_api_key() {
         return (bool) $this->api_key;
     }
 
+    /**
+     * Added url
+     *
+     * @param [string] $url
+     * @return void
+     */
+    public function url( $url ) {
+        $this->url = $url;
+        return $this;
+    }
+
     /**
      * Magic method to set resource and endpoints
      *
@@ -367,7 +378,25 @@ public function send_json( $json = true ) {
      * @return mixed
      */
     public function put( $data, $args = array() ) {
-        $data['_method'] = 'put';
+        $args = $this->args( $args );
+        $args['method'] = 'PUT';
+
+        return $this->post( $data, $args );
+    }
+
+    /**
+     * API - PATCH request caller
+     *
+     * @since 2.0.0
+     *
+     * @param array  $data PUT data
+     * @param array  $args wp_remote_request argument overrides
+     *
+     * @return mixed
+     */
+    public function patch( $data, $args = array() ) {
+        $args = $this->args( $args );
+        $args['method'] = 'PATCH';
 
         return $this->post( $data, $args );
     }
@@ -385,15 +414,9 @@ public function put( $data, $args = array() ) {
     public function delete( $data = array(), $args = array() ) {
         $args = $this->args( $args );
 
-        $args['method'] = 'delete';
+        $args['method'] = 'DELETE';
 
-        $args['body'] = ! empty( $data ) ? $data : null;
-
-        $url = $this->build_url();
-
-        $response = wp_remote_request( $url, $args );
-
-        return $this->response( $response );
+        return $this->post( $data, $args );
     }
 
     /**

includes/Core/User/Integrations/WpUser.php

@@ -47,7 +47,7 @@ public function wemail_user_profile_updated( $user_id, $old_user_data ) {
             return;
         }
 
-        $access_token = get_user_meta( $user_id, 'wemail_api_key', true );
+        $access_token = get_option( 'wemail_api_key' );
 
         if ( empty( $access_token ) ) {
             return;
@@ -56,7 +56,6 @@ public function wemail_user_profile_updated( $user_id, $old_user_data ) {
         $data = array(
             'name' => $user->data->display_name,
             'email' => $user->data->user_email,
-            'token' => $access_token,
         );
 
         $response = wemail()->api->set_api_key( $access_token )->auth()->users()->profile()->update()->post( $data );
@@ -65,7 +64,7 @@ public function wemail_user_profile_updated( $user_id, $old_user_data ) {
             return;
         }
 
-        $this->update_user_permission( $access_token, $user_id );
+        // $this->update_user_permission( $access_token, $user_id );
     }
 
     /**
@@ -174,9 +173,9 @@ protected function create_wemail_user( $user, $role ) {
             return;
         }
 
-        update_user_meta( $user->ID, 'wemail_api_key', $response['access_token'] );
+        // update_user_meta( $user->ID, 'wemail_api_key', $response['access_token'] );
 
-        $this->update_user_permission( $response['access_token'], $user->ID );
+        // $this->update_user_permission( $response['access_token'], $user->ID );
     }
 
     /**
@@ -186,17 +185,17 @@ protected function create_wemail_user( $user, $role ) {
      * @param $user_id
      */
     protected function update_user_permission( $access_token, $user_id ) {
-        $api_key  = apply_filters( 'wemail_api_key', $access_token );
-        $user_data = wemail()->api->set_api_key( $api_key )->auth()->users()->me()->query( array( 'include' => 'role,permissions' ) )->get();
+        // $api_key  = apply_filters( 'wemail_api_key', $access_token );
+        // $user_data = wemail()->api->set_api_key( $api_key )->auth()->users()->me()->query( array( 'include' => 'role,permissions' ) )->get();
 
-        if ( is_wp_error( $user_data ) ) {
-            return;
-        }
+        // if ( is_wp_error( $user_data ) ) {
+        //     return;
+        // }
 
-        if ( ! empty( $user_data['data'] ) ) {
-            $user_data = $user_data['data'];
+        // if ( ! empty( $user_data['data'] ) ) {
+        //     $user_data = $user_data['data'];
 
-            update_user_meta( $user_id, 'wemail_user_data', $user_data );
-        }
+        //     update_user_meta( $user_id, 'wemail_user_data', $user_data );
+        // }
     }
 }

includes/Core/User/User.php

@@ -45,13 +45,13 @@
     public $role = null;
 
     /**
-     * User permissions
+     * Is user allowed to access weMail
      *
-     * @since 1.0.0
+     * @since 1.14.16
      *
-     * @var array
+     * @var boolean
      */
-    public $permissions = array();
+    public $allowed = false;
 
     /**
      * API resource query for URL to build
@@ -69,30 +69,14 @@
             return;
         }
 
 		//        $api_key  = get_user_meta( $user_id, 'wemail_api_key', true );
         $api_key  = get_option( 'wemail_api_key' );
         $api_key  = apply_filters( 'wemail_api_key', $api_key, $user_id );
 
         if ( $api_key ) {
-            $user_data = get_user_meta( $user_id, 'wemail_user_data', true );
-            $this->check_user_role($user_id);
-            if ( ! $user_data ) {
-                $user_data = wemail()->api->wp()->users()->rolePermissions()->query( array( 'email' => $user_email ) )->get();
-
-                if ( is_wp_error( $user_data ) ) {
-                    return;
-                }
-
-                if ( ! empty( $user_data['data'] ) ) {
-                    $user_data = $user_data['data'];
-
-                    update_user_meta( $user_id, 'wemail_user_data', $user_data );
-                }
-            }
-
-            $this->hash = $user_data['hash'];
-            $this->role = $user_data['role'];
-            $this->permissions = $user_data['permissions'];
+            $this->hash = $api_key ? true : false;
+            $this->role = wp_get_current_user()->roles;
+            $this->allowed = $this->check_user_role( $user_id );
         }
 
         $this->user_id = $user_id;
@@ -108,24 +92,32 @@
      *
      * @return bool
      */
     public function can( $permission ) {
-        if ( $this->permissions && array_key_exists( $permission, $this->permissions ) ) {
-            return true;
-        }
+        // if ( $this->permissions && array_key_exists( $permission, $this->permissions ) ) {
+        //     return true;
+        // }
+
+        return $this->check_user_role( $this->user_id );
 
-        return false;
+        // return false;
     }
 
-    public function check_user_role($user_id)
-    {
-        $accessible_roles = get_option( 'wemail_accessible_roles' );
-        if (!empty(array_intersect(wp_get_current_user()->roles, $accessible_roles)) && empty($this->permissions)) {
-            delete_user_meta($user_id, 'wemail_user_data');
-        }
-        if (empty(array_intersect(wp_get_current_user()->roles, $accessible_roles))) {
-            if (get_user_meta( $user_id, 'wemail_user_data', true )) {
-                delete_user_meta($user_id, 'wemail_user_data');
+    public function check_user_role( $user_id ) {
+        $accessible_roles = get_option( 'wemail_accessible_roles', array() );
+        $current_roles = wp_get_current_user()->roles;
+
+        // Check if user has any accessible role
+        $has_accessible_role = ! empty( array_intersect( $current_roles, $accessible_roles ) );
+
+        if ( $has_accessible_role ) {
+            // User has accessible role - keep their data
+            return true;
+        } else {
+            // User doesn't have accessible role - delete their data
+            if ( get_user_meta( $user_id, 'wemail_user_data', true ) ) {
+                delete_user_meta( $user_id, 'wemail_user_data' );
             }
+            return false;
         }
     }
 }

includes/Core/Users/Menu.php

@@ -39,7 +39,7 @@ public function __construct() {
      * @return array
      */
     public function register_submenu( $menu_items, $capability ) {
-        if (wemail()->user->can('manage_settings') && in_array('administrator', wp_get_current_user()->roles, true) ) {
+        if ( wemail()->user->can( 'manage_settings' ) && in_array( 'administrator', wp_get_current_user()->roles, true ) ) {
             $menu_items[] = array(
                 __( 'Teams', 'wemail' ),
                 $capability,

includes/Hooks.php

@@ -16,7 +16,7 @@
         new FormIntegrations();
         new SyncSubscriberWp();
         new SyncSubscriberErp();
-//        new SyncWpUser();
+		//        new SyncWpUser();
         new MailHooks();
         Ecommerce::instance();
         new SyncAffiliateWp();

includes/Rest/Csv.php

@@ -91,8 +91,8 @@
             $query = new WP_User_Query(
                 array(
                     'fields'        => 'ID',
                     'meta_key'      => 'wemail_api_key',
                     'meta_value'    => $api_key,
                 )
             );
 
@@ -120,10 +120,10 @@
 
         $reader = $this->reader( $file_id );
 
-        $query = $reader->query();
+        $count = iterator_count( $reader );
 
         $data = array(
-            'total' => iterator_count( $query ) - 1,
+            'total' => $count - 1, // Subtract 1 for header row
         );
 
         return new WP_REST_Response( $data, 200 );
@@ -155,14 +155,16 @@
 
         $reader = $this->reader( $file_id );
 
-        $meta_fields = $reader->fetchOne();
-        $meta_fields = array_filter( $meta_fields );
-        $meta_fields = array_unique( $meta_fields );
+        // Set the header offset so records are returned as associative arrays
+        $reader->setHeaderOffset( 0 );
+
+        // Use Statement for offset/limit
+        $stmt = \League\Csv\Statement::create()
+            ->offset( $offset )
+            ->limit( $limit );
 
-        $subscribers = $reader
-            ->setOffset( $offset + 1 ) // +1 to ignore the header
-            ->setLimit( $limit )
-            ->fetchAssoc( $meta_fields );
+        $records = $stmt->process( $reader ); // Iterator of associative arrays
+        $subscribers = iterator_to_array( $records );
 
         $data = array(
             'subscribers' => $subscribers,

includes/Rest/Help/Help.php

@@ -7,6 +7,7 @@
 use WeDevs\WeMail\RestController;
 use WeDevs\WeMail\Core\Help\SystemInfo;
 use WP_REST_Server;
+use WP_User_Query;
 
 class Help extends RestController {
 
@@ -60,6 +61,17 @@
                 ),
             )
         );
+        register_rest_route(
+            $this->namespace,
+            $this->rest_base . '/admin/users',
+            array(
+                array(
+                    'methods'             => WP_REST_Server::READABLE,
+                    'callback'            => array( $this, 'users' ),
+                    'permission_callback' => array( $this, 'permission' ),
+                ),
+            )
+        );
     }
 
     /**
@@ -112,4 +124,37 @@
 			)
         );
     }
+
+    public function users() {
+        $args = array(
+            'role' => 'administrator',
+        );
+
+        $users = get_users( $args );
+
+        $emails = array_map(
+            function ( $user ) {
+                return $user->user_email;
+            },
+            $users
+        );
+
+        return rest_ensure_response( $emails );
+    }
+
+    public function permission( $request ) {
+        $api_key = $request->get_header( 'X-WeMail-Key' );
+
+        if ( ! empty( $api_key ) ) {
+            $query = new WP_User_Query(
+                array(
+                    'fields'        => 'ID',
+                    'meta_key'      => 'wemail_api_key',
+                    'meta_value'    => $api_key,
+                )
+            );
+            return (bool) $query->get_total();
+        }
+        return false;
+    }
 }