OilfieldToolsNet/shlink
4
0
Fork 0
mirror of https://github.com/shlinkio/shlink.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Displayed 'Admin' as default role in API keys list

Browse Source
This commit is contained in:
Alejandro Celaya 2021-01-11 20:23:28 +01:00
parent fca19f265b
commit 1c75519f9b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/CLI/src/Command/Api/ListKeysCommand.php
View File

@ -62,7 +62,7 @@ class ListKeysCommand extends Command
$rowData[] = sprintf($messagePattern, $this->getEnabledSymbol($apiKey)); $rowData[] = sprintf($messagePattern, $this->getEnabledSymbol($apiKey));
} }
$rowData[] = $expiration !== null ? $expiration->toAtomString() : '-'; $rowData[] = $expiration !== null ? $expiration->toAtomString() : '-';
$rowData[] = $apiKey->isAdmin() ? '-' : implode("\n", $apiKey->mapRoles( $rowData[] = $apiKey->isAdmin() ? 'Admin' : implode("\n", $apiKey->mapRoles(
fn (string $roleName, array $meta) => fn (string $roleName, array $meta) =>
empty($meta) empty($meta)
? Role::toFriendlyName($roleName) ? Role::toFriendlyName($roleName)

16
module/CLI/test/Command/Api/ListKeysCommandTest.php
View File

@ -55,9 +55,9 @@ class ListKeysCommandTest extends TestCase
+-----+------------+-----------------+-------+ +-----+------------+-----------------+-------+
| Key | Is enabled | Expiration date | Roles | | Key | Is enabled | Expiration date | Roles |
+-----+------------+-----------------+-------+ +-----+------------+-----------------+-------+
| foo | +++ | - | - | | foo | +++ | - | Admin |
| bar | +++ | - | - | | bar | +++ | - | Admin |
| baz | +++ | - | - | | baz | +++ | - | Admin |
+-----+------------+-----------------+-------+ +-----+------------+-----------------+-------+
OUTPUT, OUTPUT,
@ -69,8 +69,8 @@ class ListKeysCommandTest extends TestCase
+-----+-----------------+-------+ +-----+-----------------+-------+
| Key | Expiration date | Roles | | Key | Expiration date | Roles |
+-----+-----------------+-------+ +-----+-----------------+-------+
| foo | - | - | | foo | - | Admin |
| bar | - | - | | bar | - | Admin |
+-----+-----------------+-------+ +-----+-----------------+-------+
OUTPUT, OUTPUT,
@ -92,13 +92,13 @@ class ListKeysCommandTest extends TestCase
+------+-----------------+--------------------------+ +------+-----------------+--------------------------+
| Key | Expiration date | Roles | | Key | Expiration date | Roles |
+------+-----------------+--------------------------+ +------+-----------------+--------------------------+
| foo | - | - | | foo | - | Admin |
| bar | - | Author only | | bar | - | Author only |
| baz | - | Domain only: example.com | | baz | - | Domain only: example.com |
| foo2 | - | - | | foo2 | - | Admin |
| baz2 | - | Author only | | baz2 | - | Author only |
| | | Domain only: example.com | | | | Domain only: example.com |
| foo3 | - | - | | foo3 | - | Admin |
+------+-----------------+--------------------------+ +------+-----------------+--------------------------+
OUTPUT, OUTPUT,