| @@ -162,9 +162,9 @@ | ||
| 162 | 162 | * @return WP_Error |
| 163 | 163 | */ |
| 164 | 164 | protected function permission_error( $message, $endpoint = '') { |
| 165 | 165 | if( empty( $message ) ) { |
| 166 | - $message = __( 'Your session has expired. Please log in again.', 'templately' ); | |
| 166 | + $message = __( 'Sorry, you need to login/re-login again.', 'templately' ); | |
| 167 | 167 | } |
| 168 | 168 | |
| 169 | 169 | $_additional_data = [ |
| 170 | 170 | 'status' => rest_authorization_required_code(), |
| @@ -173,27 +173,18 @@ | ||
| 173 | 173 | if( ! empty( $endpoint ) ) { |
| 174 | 174 | $_additional_data['endpoint'] = $endpoint; |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - // Delete user logged meta data — pinned to the acting user, otherwise | |
| 178 | - // Options::user_id() resolves a linked user to the global-login | |
| 179 | - // administrator and clears the administrator's session instead. | |
| 180 | - $options = $this->utils('options'); | |
| 181 | - $options->use_current_user( true ); | |
| 177 | + // Delete user logged meta data | |
| 178 | + $this->utils('options') | |
| 179 | + ->remove('user') | |
| 180 | + ->remove('favourites') | |
| 181 | + ->remove('reviews') | |
| 182 | + ->remove('cloud_activity') | |
| 183 | + ->remove('api_key'); | |
| 182 | 184 | |
| 183 | - try { | |
| 184 | - $options | |
| 185 | - ->remove('user') | |
| 186 | - ->remove('favourites') | |
| 187 | - ->remove('reviews') | |
| 188 | - ->remove('cloud_activity') | |
| 189 | - ->remove('api_key'); | |
| 190 | - | |
| 191 | - if( $options->who_am_i() === 'global' ) { | |
| 192 | - $options->remove_global_login(); | |
| 193 | - } | |
| 194 | - } finally { | |
| 195 | - $options->use_current_user( false ); | |
| 185 | + if( $this->utils('options')->who_am_i() === 'global' ) { | |
| 186 | + $this->utils('options')->remove_global_login(); | |
| 196 | 187 | } |
| 197 | 188 | |
| 198 | 189 | return new WP_Error( 'invalid_api_key', $message, $_additional_data ); |
| 199 | 190 | } |
