Skip to content

feat(layout): add check for logged user email product availability #47

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

Merged
printminion-co merged 2 commits into from
Mar 10, 2025
Merged

feat(layout): add check for logged user email product availability #47

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b28e96c
refactor(layout): remove unused user avatar function
printminion-co Mar 6, 2025
4882d06
feat(layout): add check for logged user email product availability
printminion-co Mar 4, 2025
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
32 changes: 20 additions & 12 deletions core/templates/layout.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,29 @@
* SPDX-License-Identifier: AGPL-3.0-only
* SPDX-FileContributor: Kai Henseler <[email protected]>
*/
?>

<?php
/**
* @var \OC_Defaults $theme
* @var array $_
* Check if logged user has email product
* @return bool
*/
$hasEmailProduct = static function (): bool {
try {
$availableProductsClaim = \OC::$server->get(\OC\SystemConfig::class)->getValue("user_oidc.claims.available_products");
if ($availableProductsClaim === '') {
return false;
}

$userOIDCBackend = \OC::$server->get(\OCA\UserOIDC\User\Backend::class);
$userData = $userOIDCBackend->getUserData();

$availableProductsString = $userData["raw"][$availableProductsClaim] ?? "[]";

$getUserAvatar = static function (int $size) use ($_): string {
return \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
'userId' => $_['user_uid'],
'size' => $size,
'v' => $_['userAvatarVersion']
]);
}
$availableProducts = (array)json_decode($availableProductsString);
return in_array("email", $availableProducts);
} catch (\Error|\Exception) {
return false;
}
};

?><!DOCTYPE html>
<html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" data-locale="<?php p($_['locale']); ?>" translate="no" >
Expand Down Expand Up @@ -75,7 +83,7 @@
</div>

<?php $link = \OC::$server->get(\OC\SystemConfig::class)->getValue("ionos_peer_products", [])['ionos_webmail_target_link']; ?>
<?php if ($link !== null) { ?>
<?php if ($link !== null && $hasEmailProduct()) { ?>
<a href="<?php p($link) ?>"
target="_blank"
title="<?php p($l->t('IONOS WEBMAIL')) ?>" data-qa="IONOS-WEBMAIL-TARGET">
Expand Down