Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: prep for flarum/gdpr #34

Merged
merged 2 commits into from
Nov 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
"flarum/testing": "^1.8.0",
"fof/oauth": "*",
"flarum/phpstan": "^1.8",
"blomstra/gdpr": "@beta",
"flarum/gdpr": "dev-main",
"sycho/flarum-private-facade": "^0.1.16",
"blomstra/turnstile": "*"
}
Expand Down
4 changes: 2 additions & 2 deletions extend.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

namespace IanM\TwoFactor;

use Blomstra\Gdpr\Extend\UserData;
use Flarum\Api\Controller\ShowUserController;
use Flarum\Api\Serializer\BasicUserSerializer;
use Flarum\Api\Serializer\CurrentUserSerializer;
use Flarum\Api\Serializer\ForumSerializer;
use Flarum\Api\Serializer\GroupSerializer;
use Flarum\Extend;
use Flarum\Gdpr\Extend\UserData;
use Flarum\Group\Event\Saving as GroupSaving;
use Flarum\Group\Group;
use Flarum\User\User;
Expand Down Expand Up @@ -117,7 +117,7 @@
->addBackendRouteExclusion('twoFactor.oauth.verify')
]),
])
->whenExtensionEnabled('blomstra-gdpr', fn () => [
->whenExtensionEnabled('flarum-gdpr', fn () => [
(new UserData())
->addType(Data\TwoFactorData::class),
]),
Expand Down
2 changes: 1 addition & 1 deletion src/Data/TwoFactorData.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace IanM\TwoFactor\Data;

use Blomstra\Gdpr\Data\Type;
use Flarum\Gdpr\Data\Type;
use IanM\TwoFactor\Model\TwoFactor;
use Illuminate\Support\Arr;

Expand Down
Loading