Skip to content

fix(federatedfilesharing): use DI in migration #61441

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.

Sign up for GitHub

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

Open
enriquepablo wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −9
Open

fix(federatedfilesharing): use DI in migration #61441

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 11 additions & 9 deletions apps/federatedfilesharing/lib/Migration/Version1012Date20260306120000.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
use OCP\IUserManager;
use OCP\Migration\IOutput;
use OCP\Migration\SimpleMigrationStep;
use OCP\Server;
use OCP\Share\IShare;

/**
Expand All @@ -36,18 +35,21 @@
* oc_authtoken are silently repaired.
*/
class Version1012Date20260306120000 extends SimpleMigrationStep {
public function __construct(
private readonly IDBConnection $db,
private readonly PublicKeyTokenProvider $tokenProvider,
private readonly IUserManager $userManager,
) {
}

#[\Override]
public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
return null;
}

#[\Override]
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
$db = Server::get(IDBConnection::class);
$tokenProvider = Server::get(PublicKeyTokenProvider::class);
$userManager = Server::get(IUserManager::class);

$qb = $db->getQueryBuilder();
$qb = $this->db->getQueryBuilder();
$result = $qb->select('id', 'token', 'uid_initiator')
->from('share')
->where($qb->expr()->in(
Expand Down Expand Up @@ -78,18 +80,18 @@ public function postSchemaChange(IOutput $output, Closure $schemaClosure, array

// Long token — check if it's already in oc_authtoken.
try {
$tokenProvider->getToken($token);
$this->tokenProvider->getToken($token);
$skipped++;
continue;
} catch (InvalidTokenException) {
// Not registered yet — fall through to create it.
}

$user = $userManager->get($uid);
$user = $this->userManager->get($uid);
$name = $user?->getDisplayName() ?? $uid;

try {
$tokenProvider->generateToken(
$this->tokenProvider->generateToken(
$token,
$uid,
$uid,
Expand Down
Loading