[stable35] feat: implement team upgrade banner and remove legacy folder share (#…

css/teams-main.css

@@ -1,5 +1,5 @@
 /* extracted by css-entry-points-plugin */
-@import './main-BQ6Uu2t4.chunk.css';
+@import './main-lHJF5RoJ.chunk.css';
 @import './_plugin-vue_export-helper-Ks0gkIDB.chunk.css';
 @import './logger-B4NWMygB.chunk.css';
 @import './NcActionRouter-vYFtIOzD-BuuqIKuh.chunk.css';

lib/Controller/OidcController.php

@@ -25,6 +25,7 @@
 use OCP\Security\ICredentialsManager;
 use OCP\Security\ISecureRandom;
 use Psr\Log\LoggerInterface;
+use Random\Randomizer;
 
 class OidcController extends Controller {
 	private const SESSION_STATE = 'circles.oidc.state';
@@ -35,7 +36,6 @@ public function __construct(
 		private readonly IAppConfig $appConfig,
 		private readonly IUserSession $userSession,
 		private readonly ISession $session,
-		private readonly ISecureRandom $random,
 		private readonly IURLGenerator $urlGenerator,
 		private readonly IClientService $clientService,
 		private readonly ICredentialsManager $credentialsManager,
@@ -52,7 +52,7 @@ public function connect(): RedirectResponse {
 			return $this->redirectToPersonalSettings('disabled');
 		}
 
-		$state = $this->random->generate(32, ISecureRandom::CHAR_ALPHANUMERIC);
+		$state = (new Randomizer())->getBytesFromString(ISecureRandom::CHAR_ALPHANUMERIC, 32);
 		$userId = $this->userSession->getUser()?->getUID();
 		if ($userId === null) {
 			return $this->redirectToPersonalSettings('error');

lib/Controller/PageController.php

@@ -17,7 +17,9 @@
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\NotFoundResponse;
 use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IRequest;
+use OCP\Teams\ITeamManager;
 use OCP\Util;
 
 /**
@@ -27,6 +29,8 @@ class PageController extends Controller {
 	public function __construct(
 		IRequest $request,
 		private ConfigService $configService,
+		private IInitialState $initialState,
+		private ITeamManager $teamManager,
 	) {
 		parent::__construct(Application::APP_ID, $request);
 	}
@@ -41,6 +45,9 @@ public function index(): TemplateResponse|NotFoundResponse {
 			return new NotFoundResponse();
 		}
 
+		$providerAvailable = $this->teamManager->getTeamFolderProvider() !== null;
+		$this->initialState->provideInitialState('teamFolderProviderAvailable', $providerAvailable);
+
 		Util::addScript(Application::APP_ID, 'teams-main');
 		Util::addStyle(Application::APP_ID, 'teams-main');
 

lib/Db/MemberRequest.php

@@ -498,6 +498,9 @@ public function getAlternateSingleId(IFederatedUser $federatedUser): array {
 		//
 		//		$qb->andWhere($orX);
 
-		return $this->getItemsFromRequest($qb);
+		/** @var Member[] $members */
+		$members = $this->getItemsFromRequest($qb);
+
+		return $members;
 	}
 }

lib/FederatedItems/CircleCreateInvitation.php

@@ -17,14 +17,14 @@
 use OCA\Circles\Service\EventService;
 use OCA\Circles\Tools\Traits\TDeserialize;
 use OCP\Security\ISecureRandom;
+use Random\Randomizer;
 
 class CircleCreateInvitation implements IFederatedItem {
 	use TDeserialize;
 
 	public function __construct(
 		private CircleInvitationRequest $circleInvitationRequest,
 		private EventService $eventService,
-		private ISecureRandom $random,
 	) {
 	}
 
@@ -36,7 +36,7 @@ public function verify(FederatedEvent $event): void {
 
 		$new = clone $circle;
 
-		$invitationCode = $this->random->generate(16, ISecureRandom::CHAR_HUMAN_READABLE);
+		$invitationCode = (new Randomizer())->getBytesFromString(ISecureRandom::CHAR_HUMAN_READABLE, 16);
 
 		$circleInvitation = new CircleInvitation();
 		$circleInvitation->setCircleId($circle->getSingleId());

src/teams/components/TeamCard.vue

@@ -42,7 +42,7 @@ const MAX_AVATARS = 5
 					:key="member.id"
 					:class="$style.teamCardMember">
 					<NcAvatar
-						:user="member.isUser ? member.userId : undefined"
+						:user="member.isUser ? member.userId ?? undefined : undefined"
 						:displayName="member.displayName"
 						:isNoUser="!member.isUser"
 						:size="28"