-
-
Notifications
You must be signed in to change notification settings - Fork 527
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added API tokens, deprecate API passwords (#4637)
- Loading branch information
1 parent
dd51c8d
commit afe0656
Showing
60 changed files
with
886 additions
and
621 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Kimai time-tracking app. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace DoctrineMigrations; | ||
|
|
||
| use App\Doctrine\AbstractMigration; | ||
| use Doctrine\DBAL\Schema\Schema; | ||
|
|
||
| /** | ||
| * @version 2.14 | ||
| */ | ||
| final class Version20240214061246 extends AbstractMigration | ||
| { | ||
| public function getDescription(): string | ||
| { | ||
| return 'Adds the table for API access tokens'; | ||
| } | ||
|
|
||
| public function up(Schema $schema): void | ||
| { | ||
| $accessTokens = $schema->createTable('kimai2_access_token'); | ||
|
|
||
| $accessTokens->addColumn('id', 'integer', ['autoincrement' => true, 'notnull' => true]); | ||
| $accessTokens->addColumn('user_id', 'integer', ['notnull' => true]); | ||
| $accessTokens->addColumn('token', 'string', ['notnull' => true, 'length' => 100]); | ||
| $accessTokens->addColumn('name', 'string', ['notnull' => true, 'length' => 50]); | ||
| $accessTokens->addColumn('last_usage', 'datetime_immutable', ['notnull' => false, 'default' => null]); | ||
| $accessTokens->addColumn('expires_at', 'datetime_immutable', ['notnull' => false, 'default' => null]); | ||
|
|
||
| $accessTokens->setPrimaryKey(['id']); | ||
|
|
||
| $accessTokens->addIndex(['user_id'], 'IDX_6FB0DB1EA76ED395'); | ||
| $accessTokens->addUniqueIndex(['token'], 'UNIQ_6FB0DB1E5F37A13B'); | ||
|
|
||
| $accessTokens->addForeignKeyConstraint('kimai2_users', ['user_id'], ['id'], ['onDelete' => 'CASCADE'], 'FK_6FB0DB1EA76ED395'); | ||
| } | ||
|
|
||
| public function down(Schema $schema): void | ||
| { | ||
| $table = $schema->getTable('kimai2_access_token'); | ||
| $table->removeForeignKey('FK_6FB0DB1EA76ED395'); | ||
|
|
||
| $schema->dropTable('kimai2_access_token'); | ||
| } | ||
|
|
||
| public function isTransactional(): bool | ||
| { | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Kimai time-tracking app. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace App\API\Authentication; | ||
|
|
||
| use App\Repository\AccessTokenRepository; | ||
| use Symfony\Component\Security\Core\Exception\BadCredentialsException; | ||
| use Symfony\Component\Security\Http\AccessToken\AccessTokenHandlerInterface; | ||
| use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; | ||
|
|
||
| final class AccessTokenHandler implements AccessTokenHandlerInterface | ||
| { | ||
| public function __construct( | ||
| private readonly AccessTokenRepository $accessTokenRepository | ||
| ) | ||
| { | ||
| } | ||
|
|
||
| public function getUserBadgeFrom(string $accessToken): UserBadge | ||
| { | ||
| $accessToken = $this->accessTokenRepository->findByToken($accessToken); | ||
|
|
||
| if (null === $accessToken) { | ||
| throw new BadCredentialsException('Invalid credentials.'); | ||
| } | ||
|
|
||
| if (!$accessToken->isValid()) { | ||
| throw new BadCredentialsException('Invalid token.'); | ||
| } | ||
|
|
||
| $now = new \DateTimeImmutable(); | ||
| // record last usage only if this is the first time OR once every minute | ||
| if ($accessToken->getLastUsage() === null || $now->getTimestamp() > $accessToken->getLastUsage()->getTimestamp() + 60) { | ||
| $accessToken->setLastUsage($now); | ||
| $this->accessTokenRepository->saveAccessToken($accessToken); | ||
| } | ||
|
|
||
| return new UserBadge($accessToken->getUser()->getUserIdentifier(), fn (string $userIdentifier) => $accessToken->getUser()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.