Skip to content

Allow generateURI to better handle creation with missing label or issuer #240

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

Open
wants to merge 1 commit into
base: 11.4.x
Choose a base branch
from
Open

Allow generateURI to better handle creation with missing label or issuer #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 23 additions & 3 deletions src/OTP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,37 @@ protected function filterOptions(array &$options): void
*/
protected function generateURI(string $type, array $options): string
{
$issuer = $this->getIssuer();
$label = $this->getLabel();
is_string($label) || throw new InvalidArgumentException('The label is not set.');
$this->hasColon($label) === false || throw new InvalidArgumentException('Label must not contain a colon.');

if (null !== $issuer && !$issuer) {
throw new InvalidArgumentException('Issuer must not be an empty string');
}

if (null !== $label && !$label) {
throw new InvalidArgumentException('Label must not be an empty string');
}

if (!$issuer && !$label) {
throw new InvalidArgumentException('The label is not set. Either label or issuer must be set.');
}

if ($label && $this->hasColon($label)) {
throw new InvalidArgumentException('Label must not contain a colon.');
}

$options = [...$options, ...$this->getParameters()];
$this->filterOptions($options);
$params = str_replace(['+', '%7E'], ['%20', '~'], http_build_query($options, '', '&'));

return sprintf(
'otpauth://%s/%s?%s',
$type,
rawurlencode(($this->getIssuer() !== null ? $this->getIssuer() . ':' : '') . $label),
rawurlencode(match (true) {
null !== $issuer && null !== $label => $issuer.':'.$label,
null !== $issuer => $issuer,
default => $label,
}),
$params
);
}
Expand Down