summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel <mail@danielkesselberg.de>2021-10-13 22:14:43 +0200
committerGitHub <noreply@github.com>2021-10-13 22:14:43 +0200
commitefc3ed5bdbc374644e863f93a891090b7607d374 (patch)
treed82eab2da3a7c00c43b04b38be6ec181f94e6198
parentb7ee885f930c32ab5412208a0e6cc13650735663 (diff)
parent01b8291c76f103bf9c31b19e08b28dd482d28829 (diff)
downloadnextcloud-server-efc3ed5bdbc374644e863f93a891090b7607d374.tar.gz
nextcloud-server-efc3ed5bdbc374644e863f93a891090b7607d374.zip
Merge pull request #29200 from nextcloud/enhancement/auth-token-provider-create-passwort-type-hint
Type the autentication provider passwords as nullable strings
-rw-r--r--lib/private/Authentication/Token/DefaultTokenProvider.php13
-rw-r--r--lib/private/Authentication/Token/IProvider.php2
-rw-r--r--lib/private/Authentication/Token/PublicKeyTokenProvider.php2
3 files changed, 4 insertions, 13 deletions
diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php
index a60c8b85b08..c10d7f17bc2 100644
--- a/lib/private/Authentication/Token/DefaultTokenProvider.php
+++ b/lib/private/Authentication/Token/DefaultTokenProvider.php
@@ -71,21 +71,12 @@ class DefaultTokenProvider implements IProvider {
}
/**
- * Create and persist a new token
- *
- * @param string $token
- * @param string $uid
- * @param string $loginName
- * @param string|null $password
- * @param string $name
- * @param int $type token type
- * @param int $remember whether the session token should be used for remember-me
- * @return IToken
+ * {@inheritDoc}
*/
public function generateToken(string $token,
string $uid,
string $loginName,
- $password,
+ ?string $password,
string $name,
int $type = IToken::TEMPORARY_TOKEN,
int $remember = IToken::DO_NOT_REMEMBER): IToken {
diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php
index b37fc2c8cf4..e604ac715c2 100644
--- a/lib/private/Authentication/Token/IProvider.php
+++ b/lib/private/Authentication/Token/IProvider.php
@@ -53,7 +53,7 @@ interface IProvider {
public function generateToken(string $token,
string $uid,
string $loginName,
- $password,
+ ?string $password,
string $name,
int $type = IToken::TEMPORARY_TOKEN,
int $remember = IToken::DO_NOT_REMEMBER): IToken;
diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php
index e8149319904..22c62d82fac 100644
--- a/lib/private/Authentication/Token/PublicKeyTokenProvider.php
+++ b/lib/private/Authentication/Token/PublicKeyTokenProvider.php
@@ -80,7 +80,7 @@ class PublicKeyTokenProvider implements IProvider {
public function generateToken(string $token,
string $uid,
string $loginName,
- $password,
+ ?string $password,
string $name,
int $type = IToken::TEMPORARY_TOKEN,
int $remember = IToken::DO_NOT_REMEMBER): IToken {