Skip to content
This repository has been archived by the owner on Dec 30, 2020. It is now read-only.

Updated using jose-interface 1.0.0 #19

Merged
merged 3 commits into from
Feb 9, 2015
Merged

Updated using jose-interface 1.0.0 #19

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1871659
Update using jose-interface 1.0.0.
Feb 9, 2015
472170a
Bugs fixed
Feb 9, 2015
b074bd2
Bugs fixed
Feb 9, 2015
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
Bugs fixed
  • Loading branch information
Spomky committed Feb 9, 2015
commit 472170a38a2553c91b421d0d33618e2415c7a859
3 changes: 1 addition & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
"spomky-labs/jose-interface": "~1.0.0",
"lib-openssl": "*",
"spomky-labs/pbkdf2": "~0.1",
"spomky-labs/aes-key-wrap": "~1.0",
"pimple/pimple": "~3.0.0"
"spomky-labs/aes-key-wrap": "~1.0"
},
"require-dev": {
"phpseclib/phpseclib": ">=0.3.5",
Expand Down
48 changes: 1 addition & 47 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions lib/Jose.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion lib/Loader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ abstract protected function getJWKManager();
/**
* @return \Jose\JWKSetManagerInterface
*/
//abstract protected function getJWKSetManager();
abstract protected function getJWKSetManager();

/**
* @return \Jose\Compression\CompressionManagerInterface
Expand Down
7 changes: 6 additions & 1 deletion lib/PayloadConverter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ trait PayloadConverter
*/
abstract protected function getJWKManager();

/**
* @return \Jose\JWKSetManagerInterface
*/
abstract protected function getJWKSetManager();

/**
* @return \Jose\JWTManagerInterface
*/
Expand All @@ -40,7 +45,7 @@ protected function convertJWTContent(array $header, &$payload)
if (!array_key_exists("keys", $values)) {
throw new \Exception("Not a valid key set");
}
$payload = $this->getJWKManager()->createJWKSet($values['keys']);
$payload = $this->getJWKSetManager()->createJWKSet($values['keys']);

return;
default:
Expand Down