Merge remote-tracking branch 'origin/social_authentication' into subscription

# Conflicts:
#	.env.example
#	composer.lock
#	public/mix-manifest.json
#	resources/js/views/User/Password.vue
#	routes/api.php
#	src/App/Users/Actions/CreateNewUserAction.php
#	tests/App/Users/UserAccountTest.php
This commit is contained in:
Čarodej
2022-01-10 07:38:56 +01:00
22 changed files with 481 additions and 32 deletions
+21 -15
View File
@@ -3,9 +3,9 @@ namespace App\Users\Actions;
use App\Users\Models\User;
use Illuminate\Http\Response;
use App\Users\Models\UserSettings;
use App\Http\Controllers\Controller;
use Illuminate\Auth\Events\Registered;
use App\Users\Requests\RegisterUserRequest;
use Illuminate\Contracts\Auth\StatefulGuard;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
@@ -20,13 +20,14 @@ class CreateNewUserAction extends Controller
/**
* Validate and create a new user.
*/
public function __invoke(
RegisterUserRequest $request
): Application | ResponseFactory | Response {
public function __invoke($data)
{
$settings = get_settings([
'default_max_storage_amount', 'registration', 'user_verification',
'storage_default', 'registration', 'user_verification',
]);
$is_socialite = is_null($data->password);
// Check if account registration is enabled
if (! intval($settings['registration'])) {
abort(401);
@@ -34,28 +35,33 @@ class CreateNewUserAction extends Controller
// Create user
$user = User::create([
'password' => bcrypt($request->input('password')),
'email' => $request->input('email'),
'password' => $is_socialite ? null : bcrypt($data->password),
'oauth_provider' => $data->oauth_provider,
'email' => $data->email,
]);
// Mark as verified if verification is disabled
if (! intval($settings['user_verification'])) {
$user->markEmailAsVerified();
}
UserSettings::unguard();
$user
->settings()
->create([
'name' => $request->input('name'),
'name' => $data->name,
'storage_capacity' => $settings['storage_default'],
'avatar' => $data->avatar,
]);
UserSettings::reguard();
// Mark as verified if verification is disabled
if ($is_socialite || ! intval($settings['user_verification'])) {
$user->markEmailAsVerified();
}
event(new Registered($user));
// Log in if verification is disabled
if (! intval($settings['user_verification'])) {
if ($is_socialite || ! intval($settings['user_verification'])) {
$this->guard->login($user);
}
return response('User registered successfully', 201);
}
}
@@ -22,9 +22,10 @@ class CheckAccountController extends Controller
}
return [
'name' => $user->settings->name,
'avatar' => $user->settings->avatar,
'verified' => $user->email_verified_at ? 1 : 0,
'name' => $user->settings->name,
'avatar' => $user->settings->avatar,
'verified' => $user->email_verified_at ? 1 : 0,
'oauth_provider' => $user->password ? null : $user->oauth_provider,
];
}
}
@@ -0,0 +1,22 @@
<?php
namespace App\Users\Controllers\Authentication;
use App\Users\DTO\CreateUserData;
use App\Http\Controllers\Controller;
use App\Users\Actions\CreateNewUserAction;
use App\Users\Requests\RegisterUserRequest;
class RegisterAuthenticationController extends Controller
{
public function __construct(
public CreateNewUserAction $createNewUser,
) {
}
public function __invoke(RegisterUserRequest $request)
{
$data = CreateUserData::fromRequest($request);
($this->createNewUser)($data);
}
}
+36
View File
@@ -0,0 +1,36 @@
<?php
namespace App\Users\DTO;
use Spatie\DataTransferObject\DataTransferObject;
class CreateUserData extends DataTransferObject
{
public $name;
public $email;
public $password;
public $oauth_provider;
public $avatar;
public static function fromRequest($request): self
{
return new self([
'name' => $request->input('name'),
'email' => $request->input('email'),
'avatar' => $request->input('avatar') ?? null,
'password' => $request->input('password'),
'oauth_provider' => $request->input('oauth_provider') ?? null,
]);
}
public static function fromArray(array $array): self
{
return new self([
'name' => $array['name'] ?? null,
'email' => $array['email'],
'avatar' => $array['avatar'],
'password' => $array['password'] ?? null,
'oauth_provider' => $array['oauth_provider'],
]);
}
}
+1
View File
@@ -55,6 +55,7 @@ class User extends Authenticatable implements MustVerifyEmail
protected $fillable = [
'email',
'password',
'oauth_provider',
];
protected $hidden = [
+1
View File
@@ -35,6 +35,7 @@ class UserResource extends JsonResource
'email' => is_demo() ? obfuscate_email($this->email) : $this->email,
'role' => $this->role,
'two_factor_authentication' => $this->two_factor_secret ? true : false,
'socialite_account' => $this->password ? false : true,
'folders' => $this->folder_tree,
'storage' => $this->storage,
'created_at' => format_date($this->created_at, '%d. %b. %Y'),