mirror of
https://github.com/Bubka/2FAuth.git
synced 2025-06-26 06:52:13 +02:00
Fix pint issues
This commit is contained in:
parent
6158c6940b
commit
fee7a684b2
@ -34,8 +34,8 @@ class IconController extends Controller
|
|||||||
$name = Helpers::getRandomFilename($icon->extension());
|
$name = Helpers::getRandomFilename($icon->extension());
|
||||||
$isStored = IconStore::store($name, $content);
|
$isStored = IconStore::store($name, $content);
|
||||||
}
|
}
|
||||||
|
} catch (Exception) {
|
||||||
}
|
}
|
||||||
catch (Exception) { }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $isStored
|
return $isStored
|
||||||
|
@ -17,6 +17,7 @@ use Illuminate\Http\Resources\Json\JsonResource;
|
|||||||
* @property int|null $period
|
* @property int|null $period
|
||||||
* @property int|null $counter
|
* @property int|null $counter
|
||||||
* @property string $legacy_uri
|
* @property string $legacy_uri
|
||||||
|
*
|
||||||
* @method string getURI()
|
* @method string getURI()
|
||||||
*/
|
*/
|
||||||
class TwoFAccountExportResource extends JsonResource
|
class TwoFAccountExportResource extends JsonResource
|
||||||
|
@ -10,9 +10,7 @@ class ToggleIconReplicationToDatabase
|
|||||||
/**
|
/**
|
||||||
* Create the event listener.
|
* Create the event listener.
|
||||||
*/
|
*/
|
||||||
public function __construct()
|
public function __construct() {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Handle the event.
|
* Handle the event.
|
||||||
|
@ -43,7 +43,9 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
|
|||||||
* @property string|null $method
|
* @property string|null $method
|
||||||
* @property string|null $login_method
|
* @property string|null $login_method
|
||||||
* @property-read Model|\Eloquent $authenticatable
|
* @property-read Model|\Eloquent $authenticatable
|
||||||
|
*
|
||||||
* @mixin \Eloquent
|
* @mixin \Eloquent
|
||||||
|
*
|
||||||
* @method static \Database\Factories\AuthLogFactory factory($count = null, $state = [])
|
* @method static \Database\Factories\AuthLogFactory factory($count = null, $state = [])
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AuthLog newModelQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|AuthLog newModelQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|AuthLog newQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|AuthLog newQuery()
|
||||||
|
@ -20,6 +20,7 @@ use Illuminate\Support\Facades\Log;
|
|||||||
* @property int|null $user_id
|
* @property int|null $user_id
|
||||||
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\TwoFAccount[] $twofaccounts
|
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\TwoFAccount[] $twofaccounts
|
||||||
* @property-read \App\Models\User|null $user
|
* @property-read \App\Models\User|null $user
|
||||||
|
*
|
||||||
* @method static \Database\Factories\GroupFactory factory(...$parameters)
|
* @method static \Database\Factories\GroupFactory factory(...$parameters)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Group newModelQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|Group newModelQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Group newQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|Group newQuery()
|
||||||
@ -29,7 +30,9 @@ use Illuminate\Support\Facades\Log;
|
|||||||
* @method static \Illuminate\Database\Eloquent\Builder|Group whereName($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|Group whereName($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Group whereUpdatedAt($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|Group whereUpdatedAt($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Group whereUserId($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|Group whereUserId($value)
|
||||||
|
*
|
||||||
* @mixin \Eloquent
|
* @mixin \Eloquent
|
||||||
|
*
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Group orphans()
|
* @method static \Illuminate\Database\Eloquent\Builder|Group orphans()
|
||||||
*/
|
*/
|
||||||
class Group extends Model
|
class Group extends Model
|
||||||
|
@ -17,6 +17,7 @@ use Illuminate\Support\Facades\App;
|
|||||||
* @property \Illuminate\Support\Carbon|null $created_at
|
* @property \Illuminate\Support\Carbon|null $created_at
|
||||||
* @property \Illuminate\Support\Carbon|null $updated_at
|
* @property \Illuminate\Support\Carbon|null $updated_at
|
||||||
* @property-read \App\Models\TwoFAccount|null $twofaccount
|
* @property-read \App\Models\TwoFAccount|null $twofaccount
|
||||||
|
*
|
||||||
* @method static \Database\Factories\IconFactory factory($count = null, $state = [])
|
* @method static \Database\Factories\IconFactory factory($count = null, $state = [])
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Icon newModelQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|Icon newModelQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Icon newQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|Icon newQuery()
|
||||||
@ -31,7 +32,7 @@ class Icon extends Model
|
|||||||
/**
|
/**
|
||||||
* @use HasFactory<IconFactory>
|
* @use HasFactory<IconFactory>
|
||||||
*/
|
*/
|
||||||
use HasFactory, CanEncryptField;
|
use CanEncryptField, HasFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The primary key for the model.
|
* The primary key for the model.
|
||||||
@ -40,7 +41,6 @@ class Icon extends Model
|
|||||||
*/
|
*/
|
||||||
protected $primaryKey = 'name';
|
protected $primaryKey = 'name';
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The "type" of the primary key ID.
|
* The "type" of the primary key ID.
|
||||||
*
|
*
|
||||||
|
@ -10,12 +10,14 @@ use Illuminate\Database\Eloquent\Model;
|
|||||||
* @property int $id
|
* @property int $id
|
||||||
* @property string $key
|
* @property string $key
|
||||||
* @property string $value
|
* @property string $value
|
||||||
|
*
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Option newModelQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|Option newModelQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Option newQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|Option newQuery()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Option query()
|
* @method static \Illuminate\Database\Eloquent\Builder|Option query()
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Option whereId($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|Option whereId($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Option whereKey($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|Option whereKey($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|Option whereValue($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|Option whereValue($value)
|
||||||
|
*
|
||||||
* @mixin \Eloquent
|
* @mixin \Eloquent
|
||||||
*/
|
*/
|
||||||
class Option extends Model
|
class Option extends Model
|
||||||
|
@ -70,8 +70,11 @@ use SteamTotp\SteamTotp;
|
|||||||
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount whereService($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount whereService($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount whereUpdatedAt($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount whereUpdatedAt($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount whereUserId($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount whereUserId($value)
|
||||||
|
*
|
||||||
* @mixin \Eloquent
|
* @mixin \Eloquent
|
||||||
|
*
|
||||||
* @property-read \App\Models\Icon|null $iconResource
|
* @property-read \App\Models\Icon|null $iconResource
|
||||||
|
*
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount orphans()
|
* @method static \Illuminate\Database\Eloquent\Builder|TwoFAccount orphans()
|
||||||
*/
|
*/
|
||||||
class TwoFAccount extends Model implements Sortable
|
class TwoFAccount extends Model implements Sortable
|
||||||
@ -79,7 +82,7 @@ class TwoFAccount extends Model implements Sortable
|
|||||||
/**
|
/**
|
||||||
* @use HasFactory<TwoFAccountFactory>
|
* @use HasFactory<TwoFAccountFactory>
|
||||||
*/
|
*/
|
||||||
use HasFactory, SortableTrait, CanEncryptField;
|
use CanEncryptField, HasFactory, SortableTrait;
|
||||||
|
|
||||||
const TOTP = 'totp';
|
const TOTP = 'totp';
|
||||||
|
|
||||||
|
@ -47,6 +47,7 @@ use Laravel\Passport\HasApiTokens;
|
|||||||
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\AuthLog> $authentications
|
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\AuthLog> $authentications
|
||||||
* @property-read int|null $authentications_count
|
* @property-read int|null $authentications_count
|
||||||
* @property-read \App\Models\AuthLog|null $latestAuthentication
|
* @property-read \App\Models\AuthLog|null $latestAuthentication
|
||||||
|
*
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|User admins()
|
* @method static \Illuminate\Database\Eloquent\Builder|User admins()
|
||||||
* @method static \Database\Factories\UserFactory factory(...$parameters)
|
* @method static \Database\Factories\UserFactory factory(...$parameters)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
|
* @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
|
||||||
@ -63,7 +64,9 @@ use Laravel\Passport\HasApiTokens;
|
|||||||
* @method static \Illuminate\Database\Eloquent\Builder|User wherePreferences($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|User wherePreferences($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
|
||||||
|
*
|
||||||
* @mixin \Eloquent
|
* @mixin \Eloquent
|
||||||
|
*
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthId($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthId($value)
|
||||||
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthProvider($value)
|
* @method static \Illuminate\Database\Eloquent\Builder|User whereOauthProvider($value)
|
||||||
*/
|
*/
|
||||||
|
@ -4,8 +4,8 @@ namespace App\Providers;
|
|||||||
|
|
||||||
use App\Events\GroupDeleted;
|
use App\Events\GroupDeleted;
|
||||||
use App\Events\GroupDeleting;
|
use App\Events\GroupDeleting;
|
||||||
use App\Events\storeIconsInDatabaseSettingChanged;
|
|
||||||
use App\Events\ScanForNewReleaseCalled;
|
use App\Events\ScanForNewReleaseCalled;
|
||||||
|
use App\Events\storeIconsInDatabaseSettingChanged;
|
||||||
use App\Events\TwoFAccountDeleted;
|
use App\Events\TwoFAccountDeleted;
|
||||||
use App\Events\VisitedByProxyUser;
|
use App\Events\VisitedByProxyUser;
|
||||||
use App\Listeners\Authentication\FailedLoginListener;
|
use App\Listeners\Authentication\FailedLoginListener;
|
||||||
@ -15,10 +15,10 @@ use App\Listeners\Authentication\VisitedByProxyUserListener;
|
|||||||
use App\Listeners\CleanIconStorage;
|
use App\Listeners\CleanIconStorage;
|
||||||
use App\Listeners\DissociateTwofaccountFromGroup;
|
use App\Listeners\DissociateTwofaccountFromGroup;
|
||||||
use App\Listeners\LogNotificationListener;
|
use App\Listeners\LogNotificationListener;
|
||||||
use App\Listeners\ToggleIconReplicationToDatabase;
|
|
||||||
use App\Listeners\RegisterOpenId;
|
use App\Listeners\RegisterOpenId;
|
||||||
use App\Listeners\ReleaseRadar;
|
use App\Listeners\ReleaseRadar;
|
||||||
use App\Listeners\ResetUsersPreference;
|
use App\Listeners\ResetUsersPreference;
|
||||||
|
use App\Listeners\ToggleIconReplicationToDatabase;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Observers\UserObserver;
|
use App\Observers\UserObserver;
|
||||||
use Illuminate\Auth\Events\Failed;
|
use Illuminate\Auth\Events\Failed;
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
namespace App\Providers;
|
namespace App\Providers;
|
||||||
|
|
||||||
use App\Factories\MigratorFactoryInterface;
|
use App\Factories\MigratorFactoryInterface;
|
||||||
use App\Services\IconStoreService;
|
|
||||||
use App\Services\IconService;
|
use App\Services\IconService;
|
||||||
|
use App\Services\IconStoreService;
|
||||||
use App\Services\LogoService;
|
use App\Services\LogoService;
|
||||||
use App\Services\ReleaseRadarService;
|
use App\Services\ReleaseRadarService;
|
||||||
use App\Services\SettingService;
|
use App\Services\SettingService;
|
||||||
|
@ -19,7 +19,7 @@ class IconStoreService
|
|||||||
/**
|
/**
|
||||||
* The storage disk to use
|
* The storage disk to use
|
||||||
*/
|
*/
|
||||||
protected string|null $disk;
|
protected ?string $disk;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Icon replication to database to ease backup
|
* Icon replication to database to ease backup
|
||||||
@ -73,8 +73,7 @@ class IconStoreService
|
|||||||
if ($usesDatabase) {
|
if ($usesDatabase) {
|
||||||
$this->clearDatabase();
|
$this->clearDatabase();
|
||||||
$this->mirrorDiskToDatabase();
|
$this->mirrorDiskToDatabase();
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
$this->mirrorDatabaseToDisk();
|
$this->mirrorDatabaseToDisk();
|
||||||
$this->clearDatabase();
|
$this->clearDatabase();
|
||||||
}
|
}
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
namespace App\Services\Migrators;
|
namespace App\Services\Migrators;
|
||||||
|
|
||||||
use App\Exceptions\InvalidMigrationDataException;
|
use App\Exceptions\InvalidMigrationDataException;
|
||||||
use App\Services\IconService;
|
|
||||||
use App\Models\TwoFAccount;
|
use App\Models\TwoFAccount;
|
||||||
|
use App\Services\IconService;
|
||||||
use Illuminate\Support\Arr;
|
use Illuminate\Support\Arr;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\App;
|
use Illuminate\Support\Facades\App;
|
||||||
|
@ -3,8 +3,8 @@
|
|||||||
namespace App\Services\Migrators;
|
namespace App\Services\Migrators;
|
||||||
|
|
||||||
use App\Exceptions\InvalidMigrationDataException;
|
use App\Exceptions\InvalidMigrationDataException;
|
||||||
use App\Services\IconService;
|
|
||||||
use App\Models\TwoFAccount;
|
use App\Models\TwoFAccount;
|
||||||
|
use App\Services\IconService;
|
||||||
use Illuminate\Support\Arr;
|
use Illuminate\Support\Arr;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\App;
|
use Illuminate\Support\Facades\App;
|
||||||
|
@ -4,7 +4,6 @@ namespace Tests\Feature\Models;
|
|||||||
|
|
||||||
use App\Facades\IconStore;
|
use App\Facades\IconStore;
|
||||||
use App\Models\AuthLog;
|
use App\Models\AuthLog;
|
||||||
use App\Models\Dto\IconDto;
|
|
||||||
use App\Models\Group;
|
use App\Models\Group;
|
||||||
use App\Models\TwoFAccount;
|
use App\Models\TwoFAccount;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
|
@ -115,7 +115,7 @@ class IconStoreServiceTest extends FeatureTestCase
|
|||||||
'BPM' => [
|
'BPM' => [
|
||||||
OtpTestData::ICON_BMP,
|
OtpTestData::ICON_BMP,
|
||||||
OtpTestData::ICON_BMP_DATA,
|
OtpTestData::ICON_BMP_DATA,
|
||||||
'image/bmp|image/x-ms-bmp'
|
'image/bmp|image/x-ms-bmp',
|
||||||
],
|
],
|
||||||
'SVG' => [
|
'SVG' => [
|
||||||
OtpTestData::ICON_SVG,
|
OtpTestData::ICON_SVG,
|
||||||
|
@ -8,13 +8,11 @@ use App\Facades\IconStore;
|
|||||||
use App\Facades\Settings;
|
use App\Facades\Settings;
|
||||||
use App\Models\Icon;
|
use App\Models\Icon;
|
||||||
use App\Models\TwoFAccount;
|
use App\Models\TwoFAccount;
|
||||||
use App\Services\IconStoreService;
|
|
||||||
use App\Services\SettingService;
|
use App\Services\SettingService;
|
||||||
use Illuminate\Support\Facades\Cache;
|
use Illuminate\Support\Facades\Cache;
|
||||||
use Illuminate\Support\Facades\Crypt;
|
use Illuminate\Support\Facades\Crypt;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Support\Facades\Event;
|
use Illuminate\Support\Facades\Event;
|
||||||
use Mockery\MockInterface;
|
|
||||||
use PHPUnit\Framework\Attributes\CoversClass;
|
use PHPUnit\Framework\Attributes\CoversClass;
|
||||||
use PHPUnit\Framework\Attributes\DataProvider;
|
use PHPUnit\Framework\Attributes\DataProvider;
|
||||||
use PHPUnit\Framework\Attributes\Test;
|
use PHPUnit\Framework\Attributes\Test;
|
||||||
|
@ -3,7 +3,6 @@
|
|||||||
namespace Tests\Unit\Listeners;
|
namespace Tests\Unit\Listeners;
|
||||||
|
|
||||||
use App\Events\TwoFAccountDeleted;
|
use App\Events\TwoFAccountDeleted;
|
||||||
use App\Facades\Settings;
|
|
||||||
use App\Listeners\CleanIconStorage;
|
use App\Listeners\CleanIconStorage;
|
||||||
use App\Models\TwoFAccount;
|
use App\Models\TwoFAccount;
|
||||||
use App\Services\IconStoreService;
|
use App\Services\IconStoreService;
|
||||||
|
@ -6,7 +6,6 @@ use App\Exceptions\EncryptedMigrationException;
|
|||||||
use App\Exceptions\InvalidMigrationDataException;
|
use App\Exceptions\InvalidMigrationDataException;
|
||||||
use App\Exceptions\UnsupportedMigrationException;
|
use App\Exceptions\UnsupportedMigrationException;
|
||||||
use App\Facades\Icons;
|
use App\Facades\Icons;
|
||||||
use App\Facades\IconStore;
|
|
||||||
use App\Factories\MigratorFactory;
|
use App\Factories\MigratorFactory;
|
||||||
use App\Models\TwoFAccount;
|
use App\Models\TwoFAccount;
|
||||||
use App\Providers\MigrationServiceProvider;
|
use App\Providers\MigrationServiceProvider;
|
||||||
|
@ -149,7 +149,7 @@ class TwoFAccountModelTest extends ModelTestCase
|
|||||||
#[Test]
|
#[Test]
|
||||||
public function test_twofaccount_relation()
|
public function test_twofaccount_relation()
|
||||||
{
|
{
|
||||||
$model = new Icon();
|
$model = new Icon;
|
||||||
$relation = $model->twofaccount();
|
$relation = $model->twofaccount();
|
||||||
|
|
||||||
$this->assertInstanceOf(BelongsTo::class, $relation);
|
$this->assertInstanceOf(BelongsTo::class, $relation);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user