added subscriptions
This commit is contained in:
30
app/Filters/SubscriptionFilter.php
Normal file
30
app/Filters/SubscriptionFilter.php
Normal file
@@ -0,0 +1,30 @@
|
||||
<?php
|
||||
|
||||
namespace App\Filters;
|
||||
|
||||
use App\Models\Subscriber;
|
||||
|
||||
class SubscriptionFilter extends FilterAbstract
|
||||
{
|
||||
/**
|
||||
* The model class to filter
|
||||
*
|
||||
* @var mixed
|
||||
*/
|
||||
protected $class = '\App\Models\Subscription';
|
||||
|
||||
|
||||
/**
|
||||
* Return an array of attributes visible in the results
|
||||
*
|
||||
* @param array $attributes Attributes currently visible.
|
||||
* @param User|null $user Current logged in user or null.
|
||||
* @return mixed
|
||||
*/
|
||||
protected function seeAttributes(array $attributes, mixed $user)
|
||||
{
|
||||
if ($user?->hasPermission('admin/users') !== true) {
|
||||
return ['id', 'email', 'confirmed_at'];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,27 +2,12 @@
|
||||
|
||||
namespace App\Http\Controllers\Api;
|
||||
|
||||
use App\Enum\HttpResponseCodes;
|
||||
use App\Filters\UserFilter;
|
||||
use App\Http\Requests\UserUpdateRequest;
|
||||
use App\Http\Requests\UserStoreRequest;
|
||||
use App\Http\Requests\UserForgotPasswordRequest;
|
||||
use App\Http\Requests\UserForgotUsernameRequest;
|
||||
use App\Http\Requests\UserRegisterRequest;
|
||||
use App\Http\Requests\UserResendVerifyEmailRequest;
|
||||
use App\Http\Requests\UserResetPasswordRequest;
|
||||
use App\Http\Requests\UserVerifyEmailRequest;
|
||||
use App\Models\Subscription;
|
||||
use App\Filters\SubscriptionFilter;
|
||||
use App\Http\Requests\SubscriptionRequest;
|
||||
use App\Jobs\SendEmailJob;
|
||||
use App\Mail\ChangedEmail;
|
||||
use App\Mail\ChangedPassword;
|
||||
use App\Mail\ChangeEmailVerify;
|
||||
use App\Mail\ForgotUsername;
|
||||
use App\Mail\ForgotPassword;
|
||||
use App\Mail\EmailVerify;
|
||||
use App\Models\User;
|
||||
use App\Models\UserCode;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use App\Mail\SubscriptionConfirm;
|
||||
use App\Mail\SubscriptionUnsubscribed;
|
||||
|
||||
class SubscriptionController extends ApiController
|
||||
{
|
||||
@@ -32,16 +17,16 @@ class SubscriptionController extends ApiController
|
||||
public function __construct()
|
||||
{
|
||||
$this->middleware('auth:sanctum')
|
||||
->except([]);
|
||||
->except(['store', 'destroyByEmail']);
|
||||
}
|
||||
|
||||
/**
|
||||
* Display a listing of the resource.
|
||||
* Display a listing of subscribers.
|
||||
*
|
||||
* @param \App\Filters\UserFilter $filter Filter object.
|
||||
* @param \App\Filters\SubscriptionFilter $filter Filter object.
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function index(UserFilter $filter)
|
||||
public function index(SubscriptionFilter $filter)
|
||||
{
|
||||
$collection = $filter->filter();
|
||||
return $this->respondAsResource(
|
||||
@@ -51,76 +36,97 @@ class SubscriptionController extends ApiController
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created user in the database.
|
||||
* Store a subscriber email in the database.
|
||||
*
|
||||
* @param UserStoreRequest $request The user update request.
|
||||
* @param SubscriptionRequest $request The subscriber update request.
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(UserStoreRequest $request)
|
||||
public function store(SubscriptionRequest $request)
|
||||
{
|
||||
if ($request->user()->hasPermission('admin/user') !== true) {
|
||||
return $this->respondForbidden();
|
||||
if (Subscription::where('email', $request->email)->first() !== null) {
|
||||
return $this->respondWithErrors(['email' => 'This email address has already subscribed']);
|
||||
}
|
||||
|
||||
$user = User::create($request->all());
|
||||
return $this->respondAsResource((new UserFilter($request))->filter($user), [], HttpResponseCodes::HTTP_CREATED);
|
||||
Subscription::create($request->all());
|
||||
dispatch((new SendEmailJob($request->email, new SubscriptionConfirm($request->email))))->onQueue('mail');
|
||||
|
||||
return $this->respondCreated();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Display the specified user.
|
||||
*
|
||||
* @param UserFilter $filter The user filter.
|
||||
* @param User $user The user model.
|
||||
* @param SubscriptionFilter $filter The subscription filter.
|
||||
* @param Subscription $subscription The subscription model.
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function show(UserFilter $filter, User $user)
|
||||
public function show(SubscriptionFilter $filter, Subscription $subscription)
|
||||
{
|
||||
return $this->respondAsResource($filter->filter($user));
|
||||
return $this->respondAsResource($filter->filter($subscription));
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the specified resource in storage.
|
||||
*
|
||||
* @param UserUpdateRequest $request The user update request.
|
||||
* @param User $user The specified user.
|
||||
* @param SubscriptionRequest $request The subscription update request.
|
||||
* @param Subscription $subscription The specified subscription.
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function update(UserUpdateRequest $request, User $user)
|
||||
public function update(SubscriptionRequest $request, Subscription $subscription)
|
||||
{
|
||||
$input = [];
|
||||
$updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
|
||||
// $input = [];
|
||||
// $updatable = ['username', 'first_name', 'last_name', 'email', 'phone', 'password'];
|
||||
|
||||
if ($request->user()->hasPermission('admin/user') === true) {
|
||||
$updatable = array_merge($updatable, ['email_verified_at']);
|
||||
} elseif ($request->user()->is($user) !== true) {
|
||||
return $this->respondForbidden();
|
||||
}
|
||||
// if ($request->user()->hasPermission('admin/user') === true) {
|
||||
// $updatable = array_merge($updatable, ['email_verified_at']);
|
||||
// } elseif ($request->user()->is($user) !== true) {
|
||||
// return $this->respondForbidden();
|
||||
// }
|
||||
|
||||
$input = $request->only($updatable);
|
||||
if (array_key_exists('password', $input) === true) {
|
||||
$input['password'] = Hash::make($request->input('password'));
|
||||
}
|
||||
// $input = $request->only($updatable);
|
||||
// if (array_key_exists('password', $input) === true) {
|
||||
// $input['password'] = Hash::make($request->input('password'));
|
||||
// }
|
||||
|
||||
$user->update($input);
|
||||
// $user->update($input);
|
||||
|
||||
return $this->respondAsResource((new UserFilter($request))->filter($user));
|
||||
// return $this->respondAsResource((new UserFilter($request))->filter($user));
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Remove the user from the database.
|
||||
*
|
||||
* @param User $user The specified user.
|
||||
* @param Subscription $subscription The specified subscription.
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroy(User $user)
|
||||
public function destroy(Subscription $subscription)
|
||||
{
|
||||
if ($user->hasPermission('admin/user') === false) {
|
||||
return $this->respondForbidden();
|
||||
// if ($user->hasPermission('admin/user') === false) {
|
||||
// return $this->respondForbidden();
|
||||
// }
|
||||
|
||||
$email = $subscription->email;
|
||||
|
||||
$subscription->delete();
|
||||
return $this->respondNoContent();
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the user from the database.
|
||||
*
|
||||
* @param SubscriptionRequest $request The specified subscription.
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function destroyByEmail(SubscriptionRequest $request)
|
||||
{
|
||||
$subscription = Subscription::where('email', $request->email)->first();
|
||||
if ($subscription !== null) {
|
||||
$subscription->delete();
|
||||
dispatch((new SendEmailJob($request->email, new SubscriptionUnsubscribed($request->email))))->onQueue('mail');
|
||||
}
|
||||
|
||||
$user->delete();
|
||||
return $this->respondNoContent();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,6 +40,8 @@ class BaseRequest extends FormRequest
|
||||
$rules = $this->mergeRules($rules, $this->postRules());
|
||||
} elseif (method_exists($this, 'putRules') === true && request()->isMethod('put') === true) {
|
||||
$rules = $this->mergeRules($rules, $this->postRules());
|
||||
} elseif (method_exists($this, 'destroyRules') === true && request()->isMethod('delete') === true) {
|
||||
$rules = $this->mergeRules($rules, $this->destroyRules());
|
||||
}
|
||||
|
||||
return $rules;
|
||||
|
||||
34
app/Http/Requests/SubscriptionRequest.php
Normal file
34
app/Http/Requests/SubscriptionRequest.php
Normal file
@@ -0,0 +1,34 @@
|
||||
<?php
|
||||
|
||||
namespace App\Http\Requests;
|
||||
|
||||
use App\Rules\Recaptcha;
|
||||
|
||||
class SubscriptionRequest extends BaseRequest
|
||||
{
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function postRules()
|
||||
{
|
||||
return [
|
||||
'email' => 'required|email',
|
||||
'captcha_token' => [new Recaptcha()],
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array<string, mixed>
|
||||
*/
|
||||
public function destroyRules()
|
||||
{
|
||||
return [
|
||||
'email' => 'required|email',
|
||||
'captcha_token' => [new Recaptcha()],
|
||||
];
|
||||
}
|
||||
}
|
||||
61
app/Mail/SubscriptionConfirm.php
Normal file
61
app/Mail/SubscriptionConfirm.php
Normal file
@@ -0,0 +1,61 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
class SubscriptionConfirm extends Mailable
|
||||
{
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* The email address.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public $email;
|
||||
|
||||
|
||||
/**
|
||||
* Create a new message instance.
|
||||
*
|
||||
* @param string $email The email address.
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(string $email)
|
||||
{
|
||||
$this->email = $email;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the message envelope.
|
||||
*
|
||||
* @return \Illuminate\Mail\Mailables\Envelope
|
||||
*/
|
||||
public function envelope()
|
||||
{
|
||||
return new Envelope(
|
||||
subject: '🗞️ You\'re on the mailing list!',
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the message content definition.
|
||||
*
|
||||
* @return \Illuminate\Mail\Mailables\Content
|
||||
*/
|
||||
public function content()
|
||||
{
|
||||
return new Content(
|
||||
view: 'emails.user.subscription_confirm',
|
||||
text: 'emails.user.subscription_confirm_plain',
|
||||
);
|
||||
}
|
||||
}
|
||||
61
app/Mail/SubscriptionUnsubscribed.php
Normal file
61
app/Mail/SubscriptionUnsubscribed.php
Normal file
@@ -0,0 +1,61 @@
|
||||
<?php
|
||||
|
||||
namespace App\Mail;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Mail\Mailable;
|
||||
use Illuminate\Mail\Mailables\Content;
|
||||
use Illuminate\Mail\Mailables\Envelope;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
class SubscriptionUnsubscribed extends Mailable
|
||||
{
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* The email address.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
public $email;
|
||||
|
||||
|
||||
/**
|
||||
* Create a new message instance.
|
||||
*
|
||||
* @param string $email The email address.
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(string $email)
|
||||
{
|
||||
$this->email = $email;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the message envelope.
|
||||
*
|
||||
* @return \Illuminate\Mail\Mailables\Envelope
|
||||
*/
|
||||
public function envelope()
|
||||
{
|
||||
return new Envelope(
|
||||
subject: 'You have been unsubscribed',
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the message content definition.
|
||||
*
|
||||
* @return \Illuminate\Mail\Mailables\Content
|
||||
*/
|
||||
public function content()
|
||||
{
|
||||
return new Content(
|
||||
view: 'emails.user.subscription_unsubscribed',
|
||||
text: 'emails.user.subscription_unsubscribed_plain',
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user