upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(oauth2): fix tests

Browse source 
Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
This commit is contained in:
Julien Veyssier 2024-08-30 15:10:03 +02:00
parent 9a2bc56e29
commit 23454575f8
No known key found for this signature in database
GPG key ID: 4141FEE162030638
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/oauth2/lib/Migration/Version011901Date20240829164356.php
View file

@ -23,7 +23,7 @@ class Version011901Date20240829164356 extends SimpleMigrationStep {
) {
}
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options) {
public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
$qbUpdate = $this->connection->getQueryBuilder();
$qbUpdate->update('oauth2_clients')
->set('secret', $qbUpdate->createParameter('updateSecret'))

8
apps/oauth2/src/components/OAuthItem.vue
View file

@ -37,7 +37,13 @@
</tr>
<tr>
<td>{{ t('oauth2', 'Secret') }}</td>
<td><code>{{ renderedSecret }}</code><a v-if="clientSecret !== ''" class="icon-toggle has-tooltip" :title="t('oauth2', 'Show client secret')" @click="toggleSecret" /></td>
<td>
<code>{{ renderedSecret }}</code>
<a v-if="clientSecret !== ''"
class="icon-toggle has-tooltip"
:title="t('oauth2', 'Show client secret')"
@click="toggleSecret" />
</td>
</tr>
</table>
</td>

10
apps/oauth2/tests/Controller/OauthApiControllerTest.php
View file

@ -278,7 +278,7 @@ class OauthApiControllerTest extends TestCase {
$client = new Client();
$client->setClientIdentifier('clientId');
$client->setSecret('hashedClientSecret');
$client->setSecret(bin2hex('hashedClientSecret'));
$this->clientMapper->method('getByUid')
->with(42)
->willReturn($client);
@ -303,7 +303,7 @@ class OauthApiControllerTest extends TestCase {
$client = new Client();
$client->setClientIdentifier('clientId');
$client->setSecret('hashedClientSecret');
$client->setSecret(bin2hex('hashedClientSecret'));
$this->clientMapper->method('getByUid')
->with(42)
->willReturn($client);
@ -341,7 +341,7 @@ class OauthApiControllerTest extends TestCase {
$client = new Client();
$client->setClientIdentifier('clientId');
$client->setSecret('hashedClientSecret');
$client->setSecret(bin2hex('hashedClientSecret'));
$this->clientMapper->method('getByUid')
->with(42)
->willReturn($client);
@ -437,7 +437,7 @@ class OauthApiControllerTest extends TestCase {
$client = new Client();
$client->setClientIdentifier('clientId');
$client->setSecret('hashedClientSecret');
$client->setSecret(bin2hex('hashedClientSecret'));
$this->clientMapper->method('getByUid')
->with(42)
->willReturn($client);
@ -536,7 +536,7 @@ class OauthApiControllerTest extends TestCase {
$client = new Client();
$client->setClientIdentifier('clientId');
$client->setSecret('hashedClientSecret');
$client->setSecret(bin2hex('hashedClientSecret'));
$this->clientMapper->method('getByUid')
->with(42)
->willReturn($client);

6
apps/oauth2/tests/Controller/SettingsControllerTest.php
View file

@ -109,7 +109,7 @@ class SettingsControllerTest extends TestCase {
$client = new Client();
$client->setName('My Client Name');
$client->setRedirectUri('https://example.com/');
$client->setSecret('MyHashedSecret');
$client->setSecret(bin2hex('MyHashedSecret'));
$client->setClientIdentifier('MyClientIdentifier');
$this->clientMapper
@ -118,7 +118,7 @@ class SettingsControllerTest extends TestCase {
->with($this->callback(function (Client $c) {
return $c->getName() === 'My Client Name' &&
$c->getRedirectUri() === 'https://example.com/' &&
$c->getSecret() === 'MyHashedSecret' &&
$c->getSecret() === bin2hex('MyHashedSecret') &&
$c->getClientIdentifier() === 'MyClientIdentifier';
}))->willReturnCallback(function (Client $c) {
$c->setId(42);
@ -161,7 +161,7 @@ class SettingsControllerTest extends TestCase {
$client->setId(123);
$client->setName('My Client Name');
$client->setRedirectUri('https://example.com/');
$client->setSecret('MyHashedSecret');
$client->setSecret(bin2hex('MyHashedSecret'));
$client->setClientIdentifier('MyClientIdentifier');
$this->clientMapper