mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2026-07-22 03:48:41 -07:00
Merge branch 'develop' into adminlte
This commit is contained in:
@@ -27,7 +27,9 @@ namespace FireflyIII\Api\V1\Controllers\System;
|
||||
use FireflyIII\Api\V1\Controllers\Controller;
|
||||
use FireflyIII\Api\V1\Requests\System\UserStoreRequest;
|
||||
use FireflyIII\Api\V1\Requests\System\UserUpdateRequest;
|
||||
use FireflyIII\Events\Security\System\NewUserRegistered;
|
||||
use FireflyIII\Exceptions\FireflyException;
|
||||
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
|
||||
use FireflyIII\Repositories\User\UserRepositoryInterface;
|
||||
use FireflyIII\Transformers\UserTransformer;
|
||||
use FireflyIII\User;
|
||||
@@ -142,13 +144,17 @@ final class UserController extends Controller
|
||||
{
|
||||
$data = $request->getAll();
|
||||
$user = $this->repository->store($data);
|
||||
|
||||
Log::info(sprintf('Registered new user %s', $user->email));
|
||||
$owner = new OwnerNotifiable();
|
||||
event(new NewUserRegistered($owner, $user));
|
||||
|
||||
$manager = $this->getManager();
|
||||
|
||||
// make resource
|
||||
|
||||
/** @var UserTransformer $transformer */
|
||||
$transformer = app(UserTransformer::class);
|
||||
$transformer->setParameters($this->parameters);
|
||||
|
||||
$resource = new Item($user, $transformer, 'users');
|
||||
|
||||
|
||||
@@ -25,9 +25,12 @@ declare(strict_types=1);
|
||||
namespace FireflyIII\Console\Commands\System;
|
||||
|
||||
use FireflyIII\Console\Commands\ShowsFriendlyMessages;
|
||||
use FireflyIII\Events\Security\System\NewUserRegistered;
|
||||
use FireflyIII\Notifications\Notifiables\OwnerNotifiable;
|
||||
use FireflyIII\Repositories\User\UserRepositoryInterface;
|
||||
use Illuminate\Console\Command;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class CreatesFirstUser extends Command
|
||||
@@ -63,6 +66,10 @@ class CreatesFirstUser extends Command
|
||||
$user->save();
|
||||
$user->setRememberToken(Str::random(60));
|
||||
|
||||
Log::info(sprintf('Registered new user %s', $user->email));
|
||||
$owner = new OwnerNotifiable();
|
||||
event(new NewUserRegistered($owner, $user));
|
||||
|
||||
$this->friendlyInfo(sprintf('Created new admin user (ID #%d) with email address "%s" and password "%s".', $user->id, $user->email, $password));
|
||||
$this->friendlyWarning('Change this password.');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user