Skip to content

Fixed assignment of values to file contents. #816

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
GROwen merged 2 commits into from
Aug 25, 2026
Merged

Fixed assignment of values to file contents. #816

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2af0070
Fixed assignment of values to file contents.
GROwen Aug 24, 2026
41b9df5
Refactored sourcing of key values from files.
GROwen Aug 25, 2026
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
30 changes: 17 additions & 13 deletions modules/tide_oauth/src/EnvKeyGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
use Drupal\simple_oauth\Service\KeyGeneratorService;

/**
* Class EnvKeyGenerator generates the environment key.
* Generates OAuth key pairs from files referenced by environment variables.
*
* The environment variables TIDE_OAUTH_PRIVATE_KEY and TIDE_OAUTH_PUBLIC_KEY
* must contain the file system paths to the respective PEM key files.
*
* @package Drupal\tide_oauth
*/
Expand Down Expand Up @@ -48,18 +51,18 @@ class EnvKeyGenerator {
protected $keyGenerator;

/**
* Private key.
* Path to the private key file, sourced from the environment variable.
*
* @var string
*/
protected $privateKey;
protected $privateKeyPath;

/**
* Public key.
* Path to the public key file, sourced from the environment variable.
*
* @var string
*/
protected $publicKey;
protected $publicKeyPath;

/**
* EnvKeyGenerator constructor.
Expand All @@ -78,22 +81,23 @@ public function __construct(FileSystemInterface $file_system, FileSystemChecker
$this->fileSystemChecker = $fs_checker;
$this->configFactory = $config_factory;
$this->keyGenerator = $key_generator;
$this->privateKey = getenv(static::ENV_PRIVATE_KEY);
$this->publicKey = getenv(static::ENV_PUBLIC_KEY);
$this->privateKeyPath = getenv(static::ENV_PRIVATE_KEY) ?: NULL;
$this->publicKeyPath = getenv(static::ENV_PUBLIC_KEY) ?: NULL;
}

/**
* Check if the keys are set in environment variables.
* Check if the key file paths are set in environment variables and readable.
*
* @return bool
* TRUE if the Environment variables are set.
* TRUE if both environment variables point to readable key files.
*/
public function hasEnvKeys() : bool {
return !empty($this->privateKey) && !empty($this->publicKey);
return !empty($this->privateKeyPath) && is_readable($this->privateKeyPath)
&& !empty($this->publicKeyPath) && is_readable($this->publicKeyPath);
}

/**
* Generate the OAuth key pairs with Environment variables.
* Generate the OAuth key pairs from files referenced by environment variables.
*
* @return bool
* TRUE if the keys are generated.
Expand All @@ -107,8 +111,8 @@ public function generateEnvKeys() : bool {
$this->fileSystem->prepareDirectory($private, FileSystemInterface::CREATE_DIRECTORY);

$key_files = [
static::FILE_PRIVATE_KEY => $this->privateKey,
static::FILE_PUBLIC_KEY => $this->publicKey,
static::FILE_PRIVATE_KEY => file_get_contents($this->privateKeyPath),
static::FILE_PUBLIC_KEY => file_get_contents($this->publicKeyPath),
];
foreach ($key_files as $key_uri => $key_content) {
if (@file_exists($key_uri)) {
Expand Down
Loading