From de74add928b8ae81a295379b4f89b0b95e0c142f Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 14 Jan 2026 12:21:36 +0100 Subject: [PATCH 01/12] feat(user-picker): start moving the users_picker app as the shipped user_picker Signed-off-by: Julien Veyssier --- .gitignore | 1 + apps/user_picker/appinfo/info.xml | 15 + apps/user_picker/img/app-dark.svg | 1 + apps/user_picker/img/app.svg | 1 + apps/user_picker/l10n/.gitkeep | 0 apps/user_picker/lib/AppInfo/Application.php | 30 ++ .../Listener/UserPickerReferenceListener.php | 24 ++ .../ProfilePickerReferenceProvider.php | 176 ++++++++ .../src/components/ProfilesCustomPicker.vue | 211 ++++++++++ apps/user_picker/src/reference.js | 37 ++ .../views/ProfilePickerReferenceWidget.vue | 154 +++++++ apps/user_picker/tests/bootstrap.php | 20 + .../ProfilePickerReferenceProviderTest.php | 377 ++++++++++++++++++ .../tests/unit/Service/ApplicationTest.php | 13 + build/frontend/apps/user_picker | 1 + build/frontend/vite.config.ts | 3 + core/shipped.json | 1 + 17 files changed, 1065 insertions(+) create mode 100644 apps/user_picker/appinfo/info.xml create mode 100644 apps/user_picker/img/app-dark.svg create mode 100644 apps/user_picker/img/app.svg create mode 100644 apps/user_picker/l10n/.gitkeep create mode 100644 apps/user_picker/lib/AppInfo/Application.php create mode 100644 apps/user_picker/lib/Listener/UserPickerReferenceListener.php create mode 100644 apps/user_picker/lib/Reference/ProfilePickerReferenceProvider.php create mode 100644 apps/user_picker/src/components/ProfilesCustomPicker.vue create mode 100644 apps/user_picker/src/reference.js create mode 100644 apps/user_picker/src/views/ProfilePickerReferenceWidget.vue create mode 100644 apps/user_picker/tests/bootstrap.php create mode 100644 apps/user_picker/tests/unit/Reference/ProfilePickerReferenceProviderTest.php create mode 100644 apps/user_picker/tests/unit/Service/ApplicationTest.php create mode 120000 build/frontend/apps/user_picker diff --git a/.gitignore b/.gitignore index 06cb1ac1eccfb..a2be8a67d8c9d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ node_modules/ !/apps/updatenotification !/apps/theming !/apps/twofactor_backupcodes +!/apps/user_picker !/apps/user_status !/apps/weather_status !/apps/webhook_listeners diff --git a/apps/user_picker/appinfo/info.xml b/apps/user_picker/appinfo/info.xml new file mode 100644 index 0000000000000..c3ca8047d0705 --- /dev/null +++ b/apps/user_picker/appinfo/info.xml @@ -0,0 +1,15 @@ + + + user_picker + Profile picker + Profile smart picker and link preview + + 1.0.0 + agpl + Julien Veyssier + UserPicker + integration + + + + diff --git a/apps/user_picker/img/app-dark.svg b/apps/user_picker/img/app-dark.svg new file mode 100644 index 0000000000000..2aa865d2cf108 --- /dev/null +++ b/apps/user_picker/img/app-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/user_picker/img/app.svg b/apps/user_picker/img/app.svg new file mode 100644 index 0000000000000..ed094bacbba2b --- /dev/null +++ b/apps/user_picker/img/app.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/user_picker/l10n/.gitkeep b/apps/user_picker/l10n/.gitkeep new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/apps/user_picker/lib/AppInfo/Application.php b/apps/user_picker/lib/AppInfo/Application.php new file mode 100644 index 0000000000000..2f0807707e33c --- /dev/null +++ b/apps/user_picker/lib/AppInfo/Application.php @@ -0,0 +1,30 @@ +registerReferenceProvider(ProfilePickerReferenceProvider::class); + $context->registerEventListener(RenderReferenceEvent::class, UserPickerReferenceListener::class); + } + + public function boot(IBootContext $context): void { + } +} diff --git a/apps/user_picker/lib/Listener/UserPickerReferenceListener.php b/apps/user_picker/lib/Listener/UserPickerReferenceListener.php new file mode 100644 index 0000000000000..e99f01a333cd0 --- /dev/null +++ b/apps/user_picker/lib/Listener/UserPickerReferenceListener.php @@ -0,0 +1,24 @@ + + */ +class UserPickerReferenceListener implements IEventListener { + public function handle(Event $event): void { + if (!$event instanceof RenderReferenceEvent) { + return; + } + + Util::addScript(Application::APP_ID, 'reference'); + } +} diff --git a/apps/user_picker/lib/Reference/ProfilePickerReferenceProvider.php b/apps/user_picker/lib/Reference/ProfilePickerReferenceProvider.php new file mode 100644 index 0000000000000..39635f05a9d99 --- /dev/null +++ b/apps/user_picker/lib/Reference/ProfilePickerReferenceProvider.php @@ -0,0 +1,176 @@ +l10n->t('Profile picker'); + } + + /** + * @inheritDoc + */ + public function getOrder(): int { + return 10; + } + + /** + * @inheritDoc + */ + public function getIconUrl(): string { + return $this->urlGenerator->imagePath(Application::APP_ID, 'app-dark.svg'); + } + + /** + * @inheritDoc + */ + public function matchReference(string $referenceText): bool { + return $this->getObjectId($referenceText) !== null; + } + + /** + * @inheritDoc + */ + public function resolveReference(string $referenceText): ?IReference { + if (!$this->matchReference($referenceText)) { + return null; + } + + $userId = $this->getObjectId($referenceText); + $user = $this->userManager->get($userId); + if ($user === null) { + return null; + } + if (!$this->profileManager->isProfileEnabled($user)) { + return null; + } + $account = $this->accountManager->getAccount($user); + + $currentUser = $this->userManager->get($this->userId); + + $reference = new Reference($referenceText); + + $userDisplayName = $user->getDisplayName(); + $userEmail = $user->getEMailAddress(); + $userAvatarUrl = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $userId, 'size' => '64']); + + $bioProperty = $account->getProperty(IAccountManager::PROPERTY_BIOGRAPHY); + $bio = null; + $fullBio = null; + if ($this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_BIOGRAPHY, $user, $currentUser)) { + $fullBio = $bioProperty->getValue(); + $bio = $fullBio !== '' + ? (mb_strlen($fullBio) > 80 + ? (mb_substr($fullBio, 0, 80) . '...') + : $fullBio) + : null; + } + $headline = $account->getProperty(IAccountManager::PROPERTY_HEADLINE); + $location = $account->getProperty(IAccountManager::PROPERTY_ADDRESS); + $website = $account->getProperty(IAccountManager::PROPERTY_WEBSITE); + $organisation = $account->getProperty(IAccountManager::PROPERTY_ORGANISATION); + $role = $account->getProperty(IAccountManager::PROPERTY_ROLE); + + // for clients who can't render the reference widgets + $reference->setTitle($userDisplayName); + $reference->setDescription($userEmail ?? $userDisplayName); + $reference->setImageUrl($userAvatarUrl); + + $isLocationVisible = $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ADDRESS, $user, $currentUser); + + // for the Vue reference widget + $reference->setRichObject( + self::RICH_OBJECT_TYPE, + [ + 'user_id' => $userId, + 'title' => $userDisplayName, + 'subline' => $userEmail ?? $userDisplayName, + 'email' => $userEmail, + 'bio' => $bio, + 'full_bio' => $fullBio, + 'headline' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_HEADLINE, $user, $currentUser) ? $headline->getValue() : null, + 'location' => $isLocationVisible ? $location->getValue() : null, + 'location_url' => $isLocationVisible ? $this->getOpenStreetLocationUrl($location->getValue()) : null, + 'website' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_WEBSITE, $user, $currentUser) ? $website->getValue() : null, + 'organisation' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ORGANISATION, $user, $currentUser) ? $organisation->getValue() : null, + 'role' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ROLE, $user, $currentUser) ? $role->getValue() : null, + 'url' => $referenceText, + ] + ); + return $reference; + } + + public function getObjectId(string $url): ?string { + $baseUrl = $this->urlGenerator->getBaseUrl(); + $baseWithIndex = $baseUrl . '/index.php'; + + preg_match('/^' . preg_quote($baseUrl, '/') . '\/u\/(\w+)$/', $url, $matches); + if (count($matches) > 1) { + return $matches[1]; + } + preg_match('/^' . preg_quote($baseWithIndex, '/') . '\/u\/(\w+)$/', $url, $matches); + if (count($matches) > 1) { + return $matches[1]; + } + + return null; + } + + public function getOpenStreetLocationUrl($location): string { + return 'https://www.openstreetmap.org/search?query=' . urlencode($location); + } + + /** + * @inheritDoc + */ + public function getCachePrefix(string $referenceId): string { + return $this->userId ?? ''; + } + + /** + * @inheritDoc + */ + public function getCacheKey(string $referenceId): ?string { + $objectId = $this->getObjectId($referenceId); + if ($objectId !== null) { + return $objectId; + } + return $referenceId; + } +} diff --git a/apps/user_picker/src/components/ProfilesCustomPicker.vue b/apps/user_picker/src/components/ProfilesCustomPicker.vue new file mode 100644 index 0000000000000..d1396bc8be5ad --- /dev/null +++ b/apps/user_picker/src/components/ProfilesCustomPicker.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/apps/user_picker/src/reference.js b/apps/user_picker/src/reference.js new file mode 100644 index 0000000000000..9803b823c3353 --- /dev/null +++ b/apps/user_picker/src/reference.js @@ -0,0 +1,37 @@ +import { registerWidget, registerCustomPickerElement, NcCustomPickerRenderResult } from '@nextcloud/vue/components/NcRichText' + +registerWidget('user_picker_profile', async (el, { richObjectType, richObject, accessible }) => { + const { createApp } = await import('vue') + const { default: ProfilePickerReferenceWidget } = await import('./views/ProfilePickerReferenceWidget.vue') + + const app = createApp( + ProfilePickerReferenceWidget, + { + richObjectType, + richObject, + accessible, + }, + ) + app.mixin({ methods: { t, n } }) + app.mount(el) +}, () => {}, { hasInteractiveView: false }) + +registerCustomPickerElement('profile_picker', async (el, { providerId, accessible }) => { + const { createApp } = await import('vue') + const { default: ProfilesCustomPicker } = await import('./components/ProfilesCustomPicker.vue') + + const app = createApp( + ProfilesCustomPicker, + { + providerId, + accessible, + }, + ) + app.mixin({ methods: { t, n } }) + app.mount(el) + + return new NcCustomPickerRenderResult(el, app) +}, (el, renderResult) => { + console.debug('Users picker custom picker destroy callback. el', el, 'renderResult:', renderResult) + renderResult.object.unmount() +}, 'normal') diff --git a/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue b/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue new file mode 100644 index 0000000000000..f082335bcf737 --- /dev/null +++ b/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue @@ -0,0 +1,154 @@ + + + + + diff --git a/apps/user_picker/tests/bootstrap.php b/apps/user_picker/tests/bootstrap.php new file mode 100644 index 0000000000000..b7bddb8a34f53 --- /dev/null +++ b/apps/user_picker/tests/bootstrap.php @@ -0,0 +1,20 @@ +loadApp('user_picker'); diff --git a/apps/user_picker/tests/unit/Reference/ProfilePickerReferenceProviderTest.php b/apps/user_picker/tests/unit/Reference/ProfilePickerReferenceProviderTest.php new file mode 100644 index 0000000000000..cddeef29e0dd5 --- /dev/null +++ b/apps/user_picker/tests/unit/Reference/ProfilePickerReferenceProviderTest.php @@ -0,0 +1,377 @@ + [ + 'user_id' => 'user1', + 'displayname' => 'First User', + 'email' => 'user1@domain.co', + 'avatarurl' => 'https://nextcloud.local/index.php/avatar/user1/64', + ], + 'user2' => [ + 'user_id' => 'user2', + 'displayname' => 'Second User', + 'email' => 'user2@domain.co', + 'avatarurl' => 'https://nextcloud.local/index.php/avatar/user2/64', + ], + 'user3' => null, + ]; + private array $testAccountsData = [ + 'user1' => [ + IAccountManager::PROPERTY_BIOGRAPHY => [ + 'scope' => IAccountManager::SCOPE_PRIVATE, + 'visible' => true, + 'value' => 'This is a first test user', + ], + IAccountManager::PROPERTY_HEADLINE => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => false, + 'value' => 'I\'m a first test user', + ], + IAccountManager::PROPERTY_ADDRESS => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'Odessa', + ], + IAccountManager::PROPERTY_WEBSITE => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'https://domain.co/testuser1', + ], + IAccountManager::PROPERTY_ORGANISATION => [ + 'scope' => IAccountManager::SCOPE_PRIVATE, + 'visible' => true, + 'value' => 'Nextcloud GmbH', + ], + IAccountManager::PROPERTY_ROLE => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'Non-existing user', + ], + IAccountManager::PROPERTY_PROFILE_ENABLED => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => '1', + ], + ], + 'user2' => [ + IAccountManager::PROPERTY_BIOGRAPHY => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'This is a test user', + ], + IAccountManager::PROPERTY_HEADLINE => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'Second test user', + ], + IAccountManager::PROPERTY_ADDRESS => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'Berlin', + ], + IAccountManager::PROPERTY_WEBSITE => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'https://domain.co/testuser2', + ], + IAccountManager::PROPERTY_ORGANISATION => [ + 'scope' => IAccountManager::SCOPE_PRIVATE, + 'visible' => true, + 'value' => 'Nextcloud GmbH', + ], + IAccountManager::PROPERTY_ROLE => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => 'Non-existing user', + ], + IAccountManager::PROPERTY_PROFILE_ENABLED => [ + 'scope' => IAccountManager::SCOPE_LOCAL, + 'visible' => true, + 'value' => '1', + ], + ], + 'user3' => null, + ]; + private string $baseUrl = 'https://nextcloud.local'; + private string $testLink = 'https://nextcloud.local/index.php/u/user'; + private array $testLinks = [ + 'user1' => 'https://nextcloud.local/index.php/u/user1', + 'user2' => 'https://nextcloud.local/index.php/u/user2', + 'user4' => 'https://nextcloud.local/index.php/u/user4', + ]; + + public function setUp(): void { + parent::setUp(); + + $this->l10n = $this->createMock(IL10N::class); + $this->urlGenerator = $this->createMock(IURLGenerator::class); + $this->userManager = $this->createMock(IUserManager::class); + $this->accountManager = $this->createMock(IAccountManager::class); + $this->profileManager = $this->createMock(IProfileManager::class); + + $this->referenceProvider = new ProfilePickerReferenceProvider( + $this->l10n, + $this->urlGenerator, + $this->userManager, + $this->accountManager, + $this->profileManager, + $this->userId + ); + + $this->urlGenerator->expects($this->any()) + ->method('getBaseUrl') + ->willReturn($this->baseUrl); + + $this->profileManager->expects($this->any()) + ->method('isProfileEnabled') + ->willReturn(true); + + $this->profileManager->expects($this->any()) + ->method('isProfileFieldVisible') + ->willReturnCallback(function (string $profileField, IUser $targetUser, ?IUser $visitingUser) { + return $this->testAccountsData[$targetUser->getUID()][$profileField]['visible'] + && $this->testAccountsData[$targetUser->getUID()][$profileField]['scope'] !== IAccountManager::SCOPE_PRIVATE; + }); + + $this->adminUser = $this->createMock(IUser::class); + $this->adminUser->expects($this->any()) + ->method('getUID') + ->willReturn('admin'); + $this->adminUser->expects($this->any()) + ->method('getDisplayName') + ->willReturn('admin'); + } + + private function getTestAccountPropertyValue(string $testUserId, string $property): mixed { + if (!$this->testAccountsData[$testUserId][$property]['visible'] + || $this->testAccountsData[$testUserId][$property]['scope'] === IAccountManager::SCOPE_PRIVATE) { + return null; + } + return $this->testAccountsData[$testUserId][$property]['value']; + } + + /** + * @param string $userId + * @return IReference|null + */ + private function setupUserAccountReferenceExpectation(string $userId): ?IReference { + $user = $this->createMock(IUser::class); + + if (isset($this->testUsersData[$userId])) { + + // setup user expectations + $user->expects($this->any()) + ->method('getUID') + ->willReturn($this->testUsersData[$userId]['user_id']); + $user->expects($this->any()) + ->method('getDisplayName') + ->willReturn($this->testUsersData[$userId]['displayname']); + $user->expects($this->any()) + ->method('getEMailAddress') + ->willReturn($this->testUsersData[$userId]['email']); + + $this->userManager->expects($this->any()) + ->method('get') + ->willReturnCallback(function (string $uid) use ($user, $userId) { + if ($uid === $userId) { + return $user; + } elseif ($uid === 'admin') { + return $this->adminUser; + } + return null; + }); + + // setup account expectations + $account = $this->createMock(IAccount::class); + $account->expects($this->any()) + ->method('getProperty') + ->willReturnCallback(function ($property) use ($userId) { + $propertyMock = $this->createMock(IAccountProperty::class); + $propertyMock->expects($this->any()) + ->method('getValue') + ->willReturn($this->testAccountsData[$userId][$property]['value'] ?? ''); + $propertyMock->expects($this->any()) + ->method('getScope') + ->willReturn($this->testAccountsData[$userId][$property]['scope'] ?? ''); + return $propertyMock; + }); + + $this->accountManager->expects($this->any()) + ->method('getAccount') + ->with($user) + ->willReturn($account); + + // setup reference + if ($this->testUsersData[$userId] === null) { + $expectedReference = null; + } else { + $expectedReference = new Reference($this->testLinks[$userId]); + $expectedReference->setTitle($this->testUsersData[$userId]['displayname']); + $expectedReference->setDescription($this->testUsersData[$userId]['email']); + $expectedReference->setImageUrl($this->testUsersData[$userId]['avatarurl']); + $bio = $this->getTestAccountPropertyValue($userId, IAccountManager::PROPERTY_BIOGRAPHY); + $location = $this->getTestAccountPropertyValue($userId, IAccountManager::PROPERTY_ADDRESS); + + $expectedReference->setRichObject(ProfilePickerReferenceProvider::RICH_OBJECT_TYPE, [ + 'user_id' => $this->testUsersData[$userId]['user_id'], + 'title' => $this->testUsersData[$userId]['displayname'], + 'subline' => $this->testUsersData[$userId]['email'] ?? $this->testUsersData[$userId]['displayname'], + 'email' => $this->testUsersData[$userId]['email'], + 'bio' => isset($bio) && $bio !== '' + ? (mb_strlen($bio) > 80 + ? (mb_substr($bio, 0, 80) . '...') + : $bio) + : null, + 'full_bio' => $bio, + 'headline' => $this->getTestAccountPropertyValue($userId, IAccountManager::PROPERTY_HEADLINE), + 'location' => $location, + 'location_url' => $location !== null ? 'https://www.openstreetmap.org/search?query=' . urlencode($location) : null, + 'website' => $this->getTestAccountPropertyValue($userId, IAccountManager::PROPERTY_WEBSITE), + 'organisation' => $this->getTestAccountPropertyValue($userId, IAccountManager::PROPERTY_ORGANISATION), + 'role' => $this->getTestAccountPropertyValue($userId, IAccountManager::PROPERTY_ROLE), + 'url' => $this->testLinks[$userId], + ]); + } + + $this->urlGenerator->expects($this->any()) + ->method('linkToRouteAbsolute') + ->with('core.avatar.getAvatar', ['userId' => $userId, 'size' => 64]) + ->willReturn($this->testUsersData[$userId]['avatarurl']); + } + + return $expectedReference ?? null; + } + + /** + * Resolved reference should contain the expected reference fields according to account property scope + * + * @dataProvider resolveReferenceDataProvider + */ + public function testResolveReference($expected, $reference, $userId) { + if (isset($userId)) { + $expectedReference = $this->setupUserAccountReferenceExpectation($userId); + } + + $resultReference = $this->referenceProvider->resolveReference($reference); + $this->assertEquals($expected, isset($resultReference)); + $this->assertEquals($expectedReference ?? null, $resultReference); + } + + public function testGetId() { + $this->assertEquals('profile_picker', $this->referenceProvider->getId()); + } + + /** + * @dataProvider referenceDataProvider + */ + public function testMatchReference($expected, $reference) { + $this->assertEquals($expected, $this->referenceProvider->matchReference($reference)); + } + + /** + * @dataProvider cacheKeyDataProvider + */ + public function testGetCacheKey($expected, $reference) { + $this->assertEquals($expected, $this->referenceProvider->getCacheKey($reference)); + } + + public function testGetCachePrefix() { + $this->assertEquals($this->userId, $this->referenceProvider->getCachePrefix($this->testLink)); + } + + public function testGetTitle() { + $this->l10n->expects($this->once()) + ->method('t') + ->with('Profile picker') + ->willReturn('Profile picker'); + $this->assertEquals('Profile picker', $this->referenceProvider->getTitle()); + } + + /** + * Test getObjectId method. + * It should return the userid extracted from the link (http(s)://domain.com/(index.php)/u/{userid}). + * + * @dataProvider objectIdDataProvider + */ + public function testGetObjectId($expected, $reference) { + $this->assertEquals($expected, $this->referenceProvider->getObjectId($reference)); + } + + /** + * @dataProvider locationDataProvider + */ + public function testGetOpenStreetLocationUrl($expected, $location) { + $this->assertEquals($expected, $this->referenceProvider->getOpenStreetLocationUrl($location)); + } + + public function referenceDataProvider(): array { + return [ + 'not a link' => [false, 'profile_picker'], + 'valid link to test user' => [true, 'https://nextcloud.local/index.php/u/user1'], + 'pretty link to test user' => [true, 'https://nextcloud.local/u/user1'], + 'not valid link' => [false, 'https://nextcloud.local'], + ]; + } + + public function objectIdDataProvider(): array { + return [ + 'valid link to test user' => ['user1', 'https://nextcloud.local/index.php/u/user1'], + 'not valid link' => [null, 'https://nextcloud.local'], + ]; + } + + public function cacheKeyDataProvider(): array { + return [ + 'valid link to test user' => ['user1', 'https://nextcloud.local/index.php/u/user1'], + 'not valid link' => ['https://nextcloud.local', 'https://nextcloud.local'], + ]; + } + + public function locationDataProvider(): array { + return [ + 'link to location' => ['https://www.openstreetmap.org/search?query=location', 'location'], + 'link to Odessa' => ['https://www.openstreetmap.org/search?query=Odessa', 'Odessa'], + 'link to Frankfurt am Main' => ['https://www.openstreetmap.org/search?query=Frankfurt+am+Main', 'Frankfurt am Main'], + ]; + } + + public function resolveReferenceDataProvider(): array { + return [ + 'test reference for user1' => [true, 'https://nextcloud.local/index.php/u/user1', 'user1'], + 'test reference for user2' => [true, 'https://nextcloud.local/index.php/u/user2', 'user2'], + 'test reference for non-existing user' => [false, 'https://nextcloud.local/index.php/u/user4', 'user4'], + 'test reference for not valid link' => [null, 'https://nextcloud.local', null], + ]; + } +} diff --git a/apps/user_picker/tests/unit/Service/ApplicationTest.php b/apps/user_picker/tests/unit/Service/ApplicationTest.php new file mode 100644 index 0000000000000..0341d90c58bed --- /dev/null +++ b/apps/user_picker/tests/unit/Service/ApplicationTest.php @@ -0,0 +1,13 @@ +assertEquals('user_picker', $app::APP_ID); + } +} diff --git a/build/frontend/apps/user_picker b/build/frontend/apps/user_picker new file mode 120000 index 0000000000000..164c674a0b15a --- /dev/null +++ b/build/frontend/apps/user_picker @@ -0,0 +1 @@ +../../../apps/user_picker \ No newline at end of file diff --git a/build/frontend/vite.config.ts b/build/frontend/vite.config.ts index 4b1cfbdb113ce..2c7e93b3f9403 100644 --- a/build/frontend/vite.config.ts +++ b/build/frontend/vite.config.ts @@ -62,6 +62,9 @@ const modules = { renewPassword: resolve(import.meta.dirname, 'apps/user_ldap/src', 'renewPassword.ts'), 'settings-admin': resolve(import.meta.dirname, 'apps/user_ldap/src', 'settings-admin.ts'), }, + user_picker: { + reference: resolve(import.meta.dirname, 'apps/user_picker/src', 'reference.js'), + }, user_status: { menu: resolve(import.meta.dirname, 'apps/user_status/src', 'menu.js'), }, diff --git a/core/shipped.json b/core/shipped.json index 79a88cf22f09c..2f51791d647f8 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -48,6 +48,7 @@ "twofactor_totp", "updatenotification", "user_ldap", + "user_picker", "user_status", "viewer", "weather_status", From 1a9d4bd4e69c8fefdaa2575394b930be1bc32c77 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 14 Jan 2026 12:27:11 +0100 Subject: [PATCH 02/12] feat(user-picker): generate composer stuff Signed-off-by: Julien Veyssier --- apps/user_picker/composer/autoload.php | 22 + apps/user_picker/composer/composer.json | 13 + apps/user_picker/composer/composer.lock | 18 + .../composer/composer/ClassLoader.php | 579 ++++++++++++++++++ .../composer/composer/InstalledVersions.php | 396 ++++++++++++ apps/user_picker/composer/composer/LICENSE | 21 + .../composer/composer/autoload_classmap.php | 13 + .../composer/composer/autoload_namespaces.php | 9 + .../composer/composer/autoload_psr4.php | 10 + .../composer/composer/autoload_real.php | 37 ++ .../composer/composer/autoload_static.php | 39 ++ .../composer/composer/installed.json | 5 + .../composer/composer/installed.php | 23 + 13 files changed, 1185 insertions(+) create mode 100644 apps/user_picker/composer/autoload.php create mode 100644 apps/user_picker/composer/composer.json create mode 100644 apps/user_picker/composer/composer.lock create mode 100644 apps/user_picker/composer/composer/ClassLoader.php create mode 100644 apps/user_picker/composer/composer/InstalledVersions.php create mode 100644 apps/user_picker/composer/composer/LICENSE create mode 100644 apps/user_picker/composer/composer/autoload_classmap.php create mode 100644 apps/user_picker/composer/composer/autoload_namespaces.php create mode 100644 apps/user_picker/composer/composer/autoload_psr4.php create mode 100644 apps/user_picker/composer/composer/autoload_real.php create mode 100644 apps/user_picker/composer/composer/autoload_static.php create mode 100644 apps/user_picker/composer/composer/installed.json create mode 100644 apps/user_picker/composer/composer/installed.php diff --git a/apps/user_picker/composer/autoload.php b/apps/user_picker/composer/autoload.php new file mode 100644 index 0000000000000..834cda88e9dd4 --- /dev/null +++ b/apps/user_picker/composer/autoload.php @@ -0,0 +1,22 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer\Autoload; + +/** + * ClassLoader implements a PSR-0, PSR-4 and classmap class loader. + * + * $loader = new \Composer\Autoload\ClassLoader(); + * + * // register classes with namespaces + * $loader->add('Symfony\Component', __DIR__.'/component'); + * $loader->add('Symfony', __DIR__.'/framework'); + * + * // activate the autoloader + * $loader->register(); + * + * // to enable searching the include path (eg. for PEAR packages) + * $loader->setUseIncludePath(true); + * + * In this example, if you try to use a class in the Symfony\Component + * namespace or one of its children (Symfony\Component\Console for instance), + * the autoloader will first look for the class under the component/ + * directory, and it will then fallback to the framework/ directory if not + * found before giving up. + * + * This class is loosely based on the Symfony UniversalClassLoader. + * + * @author Fabien Potencier + * @author Jordi Boggiano + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ + */ +class ClassLoader +{ + /** @var \Closure(string):void */ + private static $includeFile; + + /** @var string|null */ + private $vendorDir; + + // PSR-4 + /** + * @var array> + */ + private $prefixLengthsPsr4 = array(); + /** + * @var array> + */ + private $prefixDirsPsr4 = array(); + /** + * @var list + */ + private $fallbackDirsPsr4 = array(); + + // PSR-0 + /** + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> + */ + private $prefixesPsr0 = array(); + /** + * @var list + */ + private $fallbackDirsPsr0 = array(); + + /** @var bool */ + private $useIncludePath = false; + + /** + * @var array + */ + private $classMap = array(); + + /** @var bool */ + private $classMapAuthoritative = false; + + /** + * @var array + */ + private $missingClasses = array(); + + /** @var string|null */ + private $apcuPrefix; + + /** + * @var array + */ + private static $registeredLoaders = array(); + + /** + * @param string|null $vendorDir + */ + public function __construct($vendorDir = null) + { + $this->vendorDir = $vendorDir; + self::initializeIncludeClosure(); + } + + /** + * @return array> + */ + public function getPrefixes() + { + if (!empty($this->prefixesPsr0)) { + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); + } + + return array(); + } + + /** + * @return array> + */ + public function getPrefixesPsr4() + { + return $this->prefixDirsPsr4; + } + + /** + * @return list + */ + public function getFallbackDirs() + { + return $this->fallbackDirsPsr0; + } + + /** + * @return list + */ + public function getFallbackDirsPsr4() + { + return $this->fallbackDirsPsr4; + } + + /** + * @return array Array of classname => path + */ + public function getClassMap() + { + return $this->classMap; + } + + /** + * @param array $classMap Class to filename map + * + * @return void + */ + public function addClassMap(array $classMap) + { + if ($this->classMap) { + $this->classMap = array_merge($this->classMap, $classMap); + } else { + $this->classMap = $classMap; + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, either + * appending or prepending to the ones previously set for this prefix. + * + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories + * + * @return void + */ + public function add($prefix, $paths, $prepend = false) + { + $paths = (array) $paths; + if (!$prefix) { + if ($prepend) { + $this->fallbackDirsPsr0 = array_merge( + $paths, + $this->fallbackDirsPsr0 + ); + } else { + $this->fallbackDirsPsr0 = array_merge( + $this->fallbackDirsPsr0, + $paths + ); + } + + return; + } + + $first = $prefix[0]; + if (!isset($this->prefixesPsr0[$first][$prefix])) { + $this->prefixesPsr0[$first][$prefix] = $paths; + + return; + } + if ($prepend) { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $paths, + $this->prefixesPsr0[$first][$prefix] + ); + } else { + $this->prefixesPsr0[$first][$prefix] = array_merge( + $this->prefixesPsr0[$first][$prefix], + $paths + ); + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, either + * appending or prepending to the ones previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function addPsr4($prefix, $paths, $prepend = false) + { + $paths = (array) $paths; + if (!$prefix) { + // Register directories for the root namespace. + if ($prepend) { + $this->fallbackDirsPsr4 = array_merge( + $paths, + $this->fallbackDirsPsr4 + ); + } else { + $this->fallbackDirsPsr4 = array_merge( + $this->fallbackDirsPsr4, + $paths + ); + } + } elseif (!isset($this->prefixDirsPsr4[$prefix])) { + // Register directories for a new namespace. + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = $paths; + } elseif ($prepend) { + // Prepend directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $paths, + $this->prefixDirsPsr4[$prefix] + ); + } else { + // Append directories for an already registered namespace. + $this->prefixDirsPsr4[$prefix] = array_merge( + $this->prefixDirsPsr4[$prefix], + $paths + ); + } + } + + /** + * Registers a set of PSR-0 directories for a given prefix, + * replacing any others previously set for this prefix. + * + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories + * + * @return void + */ + public function set($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr0 = (array) $paths; + } else { + $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths; + } + } + + /** + * Registers a set of PSR-4 directories for a given namespace, + * replacing any others previously set for this namespace. + * + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * + * @throws \InvalidArgumentException + * + * @return void + */ + public function setPsr4($prefix, $paths) + { + if (!$prefix) { + $this->fallbackDirsPsr4 = (array) $paths; + } else { + $length = strlen($prefix); + if ('\\' !== $prefix[$length - 1]) { + throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); + } + $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; + $this->prefixDirsPsr4[$prefix] = (array) $paths; + } + } + + /** + * Turns on searching the include path for class files. + * + * @param bool $useIncludePath + * + * @return void + */ + public function setUseIncludePath($useIncludePath) + { + $this->useIncludePath = $useIncludePath; + } + + /** + * Can be used to check if the autoloader uses the include path to check + * for classes. + * + * @return bool + */ + public function getUseIncludePath() + { + return $this->useIncludePath; + } + + /** + * Turns off searching the prefix and fallback directories for classes + * that have not been registered with the class map. + * + * @param bool $classMapAuthoritative + * + * @return void + */ + public function setClassMapAuthoritative($classMapAuthoritative) + { + $this->classMapAuthoritative = $classMapAuthoritative; + } + + /** + * Should class lookup fail if not found in the current class map? + * + * @return bool + */ + public function isClassMapAuthoritative() + { + return $this->classMapAuthoritative; + } + + /** + * APCu prefix to use to cache found/not-found classes, if the extension is enabled. + * + * @param string|null $apcuPrefix + * + * @return void + */ + public function setApcuPrefix($apcuPrefix) + { + $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null; + } + + /** + * The APCu prefix in use, or null if APCu caching is not enabled. + * + * @return string|null + */ + public function getApcuPrefix() + { + return $this->apcuPrefix; + } + + /** + * Registers this instance as an autoloader. + * + * @param bool $prepend Whether to prepend the autoloader or not + * + * @return void + */ + public function register($prepend = false) + { + spl_autoload_register(array($this, 'loadClass'), true, $prepend); + + if (null === $this->vendorDir) { + return; + } + + if ($prepend) { + self::$registeredLoaders = array($this->vendorDir => $this) + self::$registeredLoaders; + } else { + unset(self::$registeredLoaders[$this->vendorDir]); + self::$registeredLoaders[$this->vendorDir] = $this; + } + } + + /** + * Unregisters this instance as an autoloader. + * + * @return void + */ + public function unregister() + { + spl_autoload_unregister(array($this, 'loadClass')); + + if (null !== $this->vendorDir) { + unset(self::$registeredLoaders[$this->vendorDir]); + } + } + + /** + * Loads the given class or interface. + * + * @param string $class The name of the class + * @return true|null True if loaded, null otherwise + */ + public function loadClass($class) + { + if ($file = $this->findFile($class)) { + $includeFile = self::$includeFile; + $includeFile($file); + + return true; + } + + return null; + } + + /** + * Finds the path to the file where the class is defined. + * + * @param string $class The name of the class + * + * @return string|false The path if found, false otherwise + */ + public function findFile($class) + { + // class map lookup + if (isset($this->classMap[$class])) { + return $this->classMap[$class]; + } + if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) { + return false; + } + if (null !== $this->apcuPrefix) { + $file = apcu_fetch($this->apcuPrefix.$class, $hit); + if ($hit) { + return $file; + } + } + + $file = $this->findFileWithExtension($class, '.php'); + + // Search for Hack files if we are running on HHVM + if (false === $file && defined('HHVM_VERSION')) { + $file = $this->findFileWithExtension($class, '.hh'); + } + + if (null !== $this->apcuPrefix) { + apcu_add($this->apcuPrefix.$class, $file); + } + + if (false === $file) { + // Remember that this class does not exist. + $this->missingClasses[$class] = true; + } + + return $file; + } + + /** + * Returns the currently registered loaders keyed by their corresponding vendor directories. + * + * @return array + */ + public static function getRegisteredLoaders() + { + return self::$registeredLoaders; + } + + /** + * @param string $class + * @param string $ext + * @return string|false + */ + private function findFileWithExtension($class, $ext) + { + // PSR-4 lookup + $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext; + + $first = $class[0]; + if (isset($this->prefixLengthsPsr4[$first])) { + $subPath = $class; + while (false !== $lastPos = strrpos($subPath, '\\')) { + $subPath = substr($subPath, 0, $lastPos); + $search = $subPath . '\\'; + if (isset($this->prefixDirsPsr4[$search])) { + $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1); + foreach ($this->prefixDirsPsr4[$search] as $dir) { + if (file_exists($file = $dir . $pathEnd)) { + return $file; + } + } + } + } + } + + // PSR-4 fallback dirs + foreach ($this->fallbackDirsPsr4 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) { + return $file; + } + } + + // PSR-0 lookup + if (false !== $pos = strrpos($class, '\\')) { + // namespaced class name + $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1) + . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR); + } else { + // PEAR-like class name + $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext; + } + + if (isset($this->prefixesPsr0[$first])) { + foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + } + } + } + + // PSR-0 fallback dirs + foreach ($this->fallbackDirsPsr0 as $dir) { + if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) { + return $file; + } + } + + // PSR-0 include paths. + if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) { + return $file; + } + + return false; + } + + /** + * @return void + */ + private static function initializeIncludeClosure() + { + if (self::$includeFile !== null) { + return; + } + + /** + * Scope isolated include. + * + * Prevents access to $this/self from included files. + * + * @param string $file + * @return void + */ + self::$includeFile = \Closure::bind(static function($file) { + include $file; + }, null, null); + } +} diff --git a/apps/user_picker/composer/composer/InstalledVersions.php b/apps/user_picker/composer/composer/InstalledVersions.php new file mode 100644 index 0000000000000..2052022fd8e1e --- /dev/null +++ b/apps/user_picker/composer/composer/InstalledVersions.php @@ -0,0 +1,396 @@ + + * Jordi Boggiano + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Composer; + +use Composer\Autoload\ClassLoader; +use Composer\Semver\VersionParser; + +/** + * This class is copied in every Composer installed project and available to all + * + * See also https://getcomposer.org/doc/07-runtime.md#installed-versions + * + * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final + */ +class InstalledVersions +{ + /** + * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to + * @internal + */ + private static $selfDir = null; + + /** + * @var mixed[]|null + * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null + */ + private static $installed; + + /** + * @var bool + */ + private static $installedIsLocalDir; + + /** + * @var bool|null + */ + private static $canGetVendors; + + /** + * @var array[] + * @psalm-var array}> + */ + private static $installedByVendor = array(); + + /** + * Returns a list of all package names which are present, either by being installed, replaced or provided + * + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackages() + { + $packages = array(); + foreach (self::getInstalled() as $installed) { + $packages[] = array_keys($installed['versions']); + } + + if (1 === \count($packages)) { + return $packages[0]; + } + + return array_keys(array_flip(\call_user_func_array('array_merge', $packages))); + } + + /** + * Returns a list of all package names with a specific type e.g. 'library' + * + * @param string $type + * @return string[] + * @psalm-return list + */ + public static function getInstalledPackagesByType($type) + { + $packagesByType = array(); + + foreach (self::getInstalled() as $installed) { + foreach ($installed['versions'] as $name => $package) { + if (isset($package['type']) && $package['type'] === $type) { + $packagesByType[] = $name; + } + } + } + + return $packagesByType; + } + + /** + * Checks whether the given package is installed + * + * This also returns true if the package name is provided or replaced by another package + * + * @param string $packageName + * @param bool $includeDevRequirements + * @return bool + */ + public static function isInstalled($packageName, $includeDevRequirements = true) + { + foreach (self::getInstalled() as $installed) { + if (isset($installed['versions'][$packageName])) { + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; + } + } + + return false; + } + + /** + * Checks whether the given package satisfies a version constraint + * + * e.g. If you want to know whether version 2.3+ of package foo/bar is installed, you would call: + * + * Composer\InstalledVersions::satisfies(new VersionParser, 'foo/bar', '^2.3') + * + * @param VersionParser $parser Install composer/semver to have access to this class and functionality + * @param string $packageName + * @param string|null $constraint A version constraint to check for, if you pass one you have to make sure composer/semver is required by your package + * @return bool + */ + public static function satisfies(VersionParser $parser, $packageName, $constraint) + { + $constraint = $parser->parseConstraints((string) $constraint); + $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); + + return $provided->matches($constraint); + } + + /** + * Returns a version constraint representing all the range(s) which are installed for a given package + * + * It is easier to use this via isInstalled() with the $constraint argument if you need to check + * whether a given version of a package is installed, and not just whether it exists + * + * @param string $packageName + * @return string Version constraint usable with composer/semver + */ + public static function getVersionRanges($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + $ranges = array(); + if (isset($installed['versions'][$packageName]['pretty_version'])) { + $ranges[] = $installed['versions'][$packageName]['pretty_version']; + } + if (array_key_exists('aliases', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']); + } + if (array_key_exists('replaced', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']); + } + if (array_key_exists('provided', $installed['versions'][$packageName])) { + $ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']); + } + + return implode(' || ', $ranges); + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['version'])) { + return null; + } + + return $installed['versions'][$packageName]['version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as version, use satisfies or getVersionRanges if you need to know if a given version is present + */ + public static function getPrettyVersion($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['pretty_version'])) { + return null; + } + + return $installed['versions'][$packageName]['pretty_version']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as reference + */ + public static function getReference($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + if (!isset($installed['versions'][$packageName]['reference'])) { + return null; + } + + return $installed['versions'][$packageName]['reference']; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @param string $packageName + * @return string|null If the package is being replaced or provided but is not really installed, null will be returned as install path. Packages of type metapackages also have a null install path. + */ + public static function getInstallPath($packageName) + { + foreach (self::getInstalled() as $installed) { + if (!isset($installed['versions'][$packageName])) { + continue; + } + + return isset($installed['versions'][$packageName]['install_path']) ? $installed['versions'][$packageName]['install_path'] : null; + } + + throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed'); + } + + /** + * @return array + * @psalm-return array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool} + */ + public static function getRootPackage() + { + $installed = self::getInstalled(); + + return $installed[0]['root']; + } + + /** + * Returns the raw installed.php data for custom implementations + * + * @deprecated Use getAllRawData() instead which returns all datasets for all autoloaders present in the process. getRawData only returns the first dataset loaded, which may not be what you expect. + * @return array[] + * @psalm-return array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} + */ + public static function getRawData() + { + @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED); + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + self::$installed = include __DIR__ . '/installed.php'; + } else { + self::$installed = array(); + } + } + + return self::$installed; + } + + /** + * Returns the raw data of all installed.php which are currently loaded for custom implementations + * + * @return array[] + * @psalm-return list}> + */ + public static function getAllRawData() + { + return self::getInstalled(); + } + + /** + * Lets you reload the static array from another file + * + * This is only useful for complex integrations in which a project needs to use + * this class but then also needs to execute another project's autoloader in process, + * and wants to ensure both projects have access to their version of installed.php. + * + * A typical case would be PHPUnit, where it would need to make sure it reads all + * the data it needs from this class, then call reload() with + * `require $CWD/vendor/composer/installed.php` (or similar) as input to make sure + * the project in which it runs can then also use this class safely, without + * interference between PHPUnit's dependencies and the project's dependencies. + * + * @param array[] $data A vendor/composer/installed.php data set + * @return void + * + * @psalm-param array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $data + */ + public static function reload($data) + { + self::$installed = $data; + self::$installedByVendor = array(); + + // when using reload, we disable the duplicate protection to ensure that self::$installed data is + // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, + // so we have to assume it does not, and that may result in duplicate data being returned when listing + // all installed packages for example + self::$installedIsLocalDir = false; + } + + /** + * @return string + */ + private static function getSelfDir() + { + if (self::$selfDir === null) { + self::$selfDir = strtr(__DIR__, '\\', '/'); + } + + return self::$selfDir; + } + + /** + * @return array[] + * @psalm-return list}> + */ + private static function getInstalled() + { + if (null === self::$canGetVendors) { + self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders'); + } + + $installed = array(); + $copiedLocalDir = false; + + if (self::$canGetVendors) { + $selfDir = self::getSelfDir(); + foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + $vendorDir = strtr($vendorDir, '\\', '/'); + if (isset(self::$installedByVendor[$vendorDir])) { + $installed[] = self::$installedByVendor[$vendorDir]; + } elseif (is_file($vendorDir.'/composer/installed.php')) { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require $vendorDir.'/composer/installed.php'; + self::$installedByVendor[$vendorDir] = $required; + $installed[] = $required; + if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { + self::$installed = $required; + self::$installedIsLocalDir = true; + } + } + if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { + $copiedLocalDir = true; + } + } + } + + if (null === self::$installed) { + // only require the installed.php file if this file is loaded from its dumped location, + // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 + if (substr(__DIR__, -8, 1) !== 'C') { + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; + } else { + self::$installed = array(); + } + } + + if (self::$installed !== array() && !$copiedLocalDir) { + $installed[] = self::$installed; + } + + return $installed; + } +} diff --git a/apps/user_picker/composer/composer/LICENSE b/apps/user_picker/composer/composer/LICENSE new file mode 100644 index 0000000000000..f27399a042d95 --- /dev/null +++ b/apps/user_picker/composer/composer/LICENSE @@ -0,0 +1,21 @@ + +Copyright (c) Nils Adermann, Jordi Boggiano + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/apps/user_picker/composer/composer/autoload_classmap.php b/apps/user_picker/composer/composer/autoload_classmap.php new file mode 100644 index 0000000000000..c9737263aeb5b --- /dev/null +++ b/apps/user_picker/composer/composer/autoload_classmap.php @@ -0,0 +1,13 @@ + $vendorDir . '/composer/InstalledVersions.php', + 'OCA\\UserPicker\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', + 'OCA\\UserPicker\\Listener\\UserPickerReferenceListener' => $baseDir . '/../lib/Listener/UserPickerReferenceListener.php', + 'OCA\\UserPicker\\Reference\\ProfilePickerReferenceProvider' => $baseDir . '/../lib/Reference/ProfilePickerReferenceProvider.php', +); diff --git a/apps/user_picker/composer/composer/autoload_namespaces.php b/apps/user_picker/composer/composer/autoload_namespaces.php new file mode 100644 index 0000000000000..3f5c929625125 --- /dev/null +++ b/apps/user_picker/composer/composer/autoload_namespaces.php @@ -0,0 +1,9 @@ + array($baseDir . '/../lib'), +); diff --git a/apps/user_picker/composer/composer/autoload_real.php b/apps/user_picker/composer/composer/autoload_real.php new file mode 100644 index 0000000000000..c39c53c50810d --- /dev/null +++ b/apps/user_picker/composer/composer/autoload_real.php @@ -0,0 +1,37 @@ +setClassMapAuthoritative(true); + $loader->register(true); + + return $loader; + } +} diff --git a/apps/user_picker/composer/composer/autoload_static.php b/apps/user_picker/composer/composer/autoload_static.php new file mode 100644 index 0000000000000..02daae8b94ece --- /dev/null +++ b/apps/user_picker/composer/composer/autoload_static.php @@ -0,0 +1,39 @@ + + array ( + 'OCA\\UserPicker\\' => 15, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'OCA\\UserPicker\\' => + array ( + 0 => __DIR__ . '/..' . '/../lib', + ), + ); + + public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + 'OCA\\UserPicker\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', + 'OCA\\UserPicker\\Listener\\UserPickerReferenceListener' => __DIR__ . '/..' . '/../lib/Listener/UserPickerReferenceListener.php', + 'OCA\\UserPicker\\Reference\\ProfilePickerReferenceProvider' => __DIR__ . '/..' . '/../lib/Reference/ProfilePickerReferenceProvider.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInitUserPicker::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitUserPicker::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitUserPicker::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/apps/user_picker/composer/composer/installed.json b/apps/user_picker/composer/composer/installed.json new file mode 100644 index 0000000000000..f20a6c47c6d4f --- /dev/null +++ b/apps/user_picker/composer/composer/installed.json @@ -0,0 +1,5 @@ +{ + "packages": [], + "dev": false, + "dev-package-names": [] +} diff --git a/apps/user_picker/composer/composer/installed.php b/apps/user_picker/composer/composer/installed.php new file mode 100644 index 0000000000000..93f6366323458 --- /dev/null +++ b/apps/user_picker/composer/composer/installed.php @@ -0,0 +1,23 @@ + array( + 'name' => '__root__', + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => '4ee57514f882450097e09ce9a577c2dcdb0f002c', + 'type' => 'library', + 'install_path' => __DIR__ . '/../', + 'aliases' => array(), + 'dev' => false, + ), + 'versions' => array( + '__root__' => array( + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => '4ee57514f882450097e09ce9a577c2dcdb0f002c', + 'type' => 'library', + 'install_path' => __DIR__ . '/../', + 'aliases' => array(), + 'dev_requirement' => false, + ), + ), +); From 13eb587240b5a535e518bb92bbce3de062eaaa43 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 14 Jan 2026 12:31:32 +0100 Subject: [PATCH 03/12] feat(user-picker): adjust build files Signed-off-by: Julien Veyssier --- build/integration/features/provisioning-v1.feature | 1 + build/license.php | 1 + 2 files changed, 2 insertions(+) diff --git a/build/integration/features/provisioning-v1.feature b/build/integration/features/provisioning-v1.feature index 8fcfb076497a0..93cdb640d340f 100644 --- a/build/integration/features/provisioning-v1.feature +++ b/build/integration/features/provisioning-v1.feature @@ -637,6 +637,7 @@ Feature: provisioning | twofactor_backupcodes | | updatenotification | | user_ldap | + | user_picker | | user_status | | viewer | | workflowengine | diff --git a/build/license.php b/build/license.php index bb6351181c62f..1646f724836d5 100644 --- a/build/license.php +++ b/build/license.php @@ -459,6 +459,7 @@ private function fixInvalidEmail($author) { '../apps/twofactor_backupcodes', '../apps/updatenotification', '../apps/user_ldap', + '../apps/user_picker', '../apps/user_status', '../apps/weather_status', '../apps/workflowengine', From 495e63ca82982a90e6ce465fd9b23032965cf023 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 14 Jan 2026 12:48:20 +0100 Subject: [PATCH 04/12] feat(user-picker): fix style issue Signed-off-by: Julien Veyssier --- apps/user_picker/src/views/ProfilePickerReferenceWidget.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue b/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue index f082335bcf737..655cb8e798818 100644 --- a/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue +++ b/apps/user_picker/src/views/ProfilePickerReferenceWidget.vue @@ -7,7 +7,7 @@ - {{ richObject.email !== null ? richObject.title + ' - ' + richObject.email : richObject.title }} + AAA {{ richObject.email !== null ? richObject.title + ' - ' + richObject.email : richObject.title }} @@ -106,7 +106,7 @@ export default { &__header { width: 100%; min-height: 70px; - padding-left: 12px; + padding: 0 12px; background-color: var(--color-primary); background-image: var(--gradient-primary-background); position: relative; From 86fa6b5eb91ee560cba3ac1bcb4293893f2fb957 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 14 Jan 2026 13:04:14 +0100 Subject: [PATCH 05/12] feat(user-picker): add translation config Signed-off-by: Julien Veyssier --- .tx/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.tx/config b/.tx/config index fabfedd91a4df..5ff66fceb1a6e 100644 --- a/.tx/config +++ b/.tx/config @@ -170,6 +170,12 @@ source_file = translationfiles/templates/user_ldap.pot source_lang = en type = PO +[o:nextcloud:p:nextcloud:r:user_picker] +file_filter = translationfiles//user_picker.po +source_file = translationfiles/templates/user_picker.pot +source_lang = en +type = PO + [o:nextcloud:p:nextcloud:r:user_status] file_filter = translationfiles//user_status.po source_file = translationfiles/templates/user_status.pot From c9d1bc2e4252bc8ee05cc185a1d75486877b2c85 Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 14 Jan 2026 13:05:10 +0100 Subject: [PATCH 06/12] feat(user-picker): fix eslint errors Signed-off-by: Julien Veyssier --- .../src/components/ProfilesCustomPicker.vue | 17 +++++++++-------- apps/user_picker/src/reference.js | 2 +- .../src/views/ProfilePickerReferenceWidget.vue | 12 ++++++++---- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/apps/user_picker/src/components/ProfilesCustomPicker.vue b/apps/user_picker/src/components/ProfilesCustomPicker.vue index d1396bc8be5ad..b8821e2a6a99d 100644 --- a/apps/user_picker/src/components/ProfilesCustomPicker.vue +++ b/apps/user_picker/src/components/ProfilesCustomPicker.vue @@ -5,14 +5,14 @@ {{ t('user_picker', 'Profile picker') }}
-