Skip to content

Mk/fix/evaluate consent cookie #23

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 3 commits into from
Jan 6, 2025
Merged

Mk/fix/evaluate consent cookie #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb58037
fix(php): Property declared dynamically
printminion-co Jan 6, 2025
3483c53
fix(php): Argument matches the parameter's default value
printminion-co Jan 6, 2025
7763866
fix(php): Replace security annotations with respective attributes
printminion-co Jan 6, 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
9 changes: 5 additions & 4 deletions lib/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
use OCP\IConfig;

class Config {
public function __construct($appName, IConfig $config) {
$this->appName = $appName;
$this->config = $config;
public function __construct(
protected string $appName,
protected IConfig $config,
) {
}

public function getTrackingKey(): ?string {
$value = $this->config->getSystemValueString('googleanalytics_tracking_key', '');
$value = $this->config->getSystemValueString('googleanalytics_tracking_key');
return (empty($value)) ? null : $value;
}
}
10 changes: 6 additions & 4 deletions lib/Controller/JavaScriptController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
use OCA\NCGoogleAnalytics\Config;
use OCA\NCGoogleAnalytics\Service\Consent\IConsentService;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http\Attribute\NoAdminRequired;
use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
use OCP\AppFramework\Http\Attribute\PublicPage;
use OCP\AppFramework\Http\DataDownloadResponse;
use OCP\AppFramework\Http\TextPlainResponse;
use OCP\IRequest;
Expand All @@ -32,12 +35,11 @@ public function __construct(
}

/**
* @NoAdminRequired
* @NoCSRFRequired
* @PublicPage
*
* @return TextPlainResponse|DataDownloadResponse
*/
#[NoAdminRequired]
#[NoCSRFRequired]
#[PublicPage]
public function tracking(): TextPlainResponse|DataDownloadResponse {
$gtmId = $this->config->getTrackingKey();

Expand Down
Loading