Skip to content

Move IToken and IProvider::getToken to OCP #41017

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
come-nc merged 9 commits into from
Oct 23, 2023
Merged

Move IToken and IProvider::getToken to OCP #41017

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f94fb33
Move IToken and IProvider::getToken to OCP
come-nc Oct 20, 2023
356f029
Align PublicKeyToken with interface changes
come-nc Oct 23, 2023
16b9373
Adapt baseline to filename change
come-nc Oct 23, 2023
b82e25e
Move Exceptions used in OCP to OCP
come-nc Oct 23, 2023
1bdf952
Make sure that OC interfaces returns OC interfaces for backward compa…
come-nc Oct 23, 2023
7a6c4ec
Update autoloaders
come-nc Oct 23, 2023
58a57a7
Use more precise typing for setScope method parameter
come-nc Oct 23, 2023
33a2413
Improve docblock annotations for tokens and their exceptions
come-nc Oct 23, 2023
d8b42c6
Allow passing null to PublicKeyToken::setScope, fixes tests
come-nc Oct 23, 2023
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
Prev Previous commit
Next Next commit
Improve docblock annotations for tokens and their exceptions 
Signed-off-by: Côme Chilliet <[email protected]>
  • Loading branch information
@come-nc
come-nc committed Oct 23, 2023
commit 33a24134a7cb6b7af08a097a5807c58888cba8c6
2 changes: 1 addition & 1 deletion lib/private/Authentication/Exceptions/ExpiredTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use OC\Authentication\Token\IToken;

/**
* @deprecated 28.0.0 use OCP version instead
* @deprecated 28.0.0 use {@see \OCP\Authentication\Exceptions\ExpiredTokenException} instead
*/
class ExpiredTokenException extends \OCP\Authentication\Exceptions\ExpiredTokenException {
public function __construct(
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Authentication/Exceptions/WipeTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
use OC\Authentication\Token\IToken;

/**
* @deprecated 28.0.0 use OCP version instead
* @deprecated 28.0.0 use {@see \OCP\Authentication\Exceptions\WipeTokenException} instead
*/
class WipeTokenException extends \OCP\Authentication\Exceptions\WipeTokenException {
public function __construct(
Expand Down
3 changes: 3 additions & 0 deletions lib/private/Authentication/Token/IToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@

use OCP\Authentication\Token\IToken as OCPIToken;

/**
* @deprecated 28.0.0 use {@see \OCP\Authentication\Token\IToken} instead
*/
interface IToken extends OCPIToken {
}
6 changes: 3 additions & 3 deletions lib/public/Authentication/Exceptions/ExpiredTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
use OCP\Authentication\Token\IToken;

/**
* @since 28.0
* @since 28.0.0
*/
class ExpiredTokenException extends InvalidTokenException {
/**
* @since 28.0
* @since 28.0.0
*/
public function __construct(
private IToken $token,
Expand All @@ -41,7 +41,7 @@ public function __construct(
}

/**
* @since 28.0
* @since 28.0.0
*/
public function getToken(): IToken {
return $this->token;
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Authentication/Exceptions/InvalidTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
use Exception;

/**
* @since 28.0
* @since 28.0.0
*/
class InvalidTokenException extends Exception {
}
6 changes: 3 additions & 3 deletions lib/public/Authentication/Exceptions/WipeTokenException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
use OCP\Authentication\Token\IToken;

/**
* @since 28.0
* @since 28.0.0
*/
class WipeTokenException extends InvalidTokenException {
/**
* @since 28.0
* @since 28.0.0
*/
public function __construct(
private IToken $token,
Expand All @@ -41,7 +41,7 @@ public function __construct(
}

/**
* @since 28.0
* @since 28.0.0
*/
public function getToken(): IToken {
return $this->token;
Expand Down
15 changes: 15 additions & 0 deletions lib/public/Authentication/Token/IToken.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,25 @@
* @since 28.0.0
*/
interface IToken extends JsonSerializable {
/**
* @since 28.0.0
*/
public const TEMPORARY_TOKEN = 0;
/**
* @since 28.0.0
*/
public const PERMANENT_TOKEN = 1;
/**
* @since 28.0.0
*/
public const WIPE_TOKEN = 2;
/**
* @since 28.0.0
*/
public const DO_NOT_REMEMBER = 0;
/**
* @since 28.0.0
*/
public const REMEMBER = 1;

/**
Expand Down