diff --git a/.gitsplit.yml b/.gitsplit.yml index 8836288ed..092064044 100644 --- a/.gitsplit.yml +++ b/.gitsplit.yml @@ -1,20 +1,24 @@ splits: - - prefix: "src/Component/Core" - target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git" - - prefix: "src/Component/Checker" + - prefix: "src/Deprecated/Checker" target: "https://${GH_TOKEN}@github.com/web-token/jwt-checker.git" - - prefix: "src/Component/Signature" - target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git" - - prefix: "src/Component/Encryption" + - prefix: "src/Deprecated/Console" + target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git" + - prefix: "src/Deprecated/Core" + target: "https://${GH_TOKEN}@github.com/web-token/jwt-core.git" + - prefix: "src/Deprecated/Ecc" + target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git" + - prefix: "src/Deprecated/Encryption" target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption.git" - - prefix: "src/Component/KeyManagement" + - prefix: "src/Deprecated/KeyManagement" target: "https://${GH_TOKEN}@github.com/web-token/jwt-key-mgmt.git" - - prefix: "src/Component/Console" - target: "https://${GH_TOKEN}@github.com/web-token/jwt-console.git" - - prefix: "src/Component/NestedToken" + - prefix: "src/Deprecated/NestedToken" target: "https://${GH_TOKEN}@github.com/web-token/jwt-nested-token.git" + - prefix: "src/Deprecated/Signature" + target: "https://${GH_TOKEN}@github.com/web-token/jwt-signature.git" - prefix: "src/JoseFramework" target: "https://${GH_TOKEN}@github.com/web-token/jwt-bundle.git" + - prefix: "src/Component" + target: "https://${GH_TOKEN}@github.com/web-token/jwt-library.git" - prefix: "src/EncryptionAlgorithm/ContentEncryption/AESCBC" target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-aescbc.git" - prefix: "src/EncryptionAlgorithm/ContentEncryption/AESGCM" @@ -47,8 +51,6 @@ splits: target: "https://${GH_TOKEN}@github.com/web-token/jwt-encryption-algorithm-experimental.git" - prefix: "src/Experimental" target: "https://${GH_TOKEN}@github.com/web-token/jwt-experimental.git" - - prefix: "src/Ecc" - target: "https://${GH_TOKEN}@github.com/web-token/jwt-util-ecc.git" - prefix: "packs/encryption" target: "https://${GH_TOKEN}@github.com/web-token/encryption-pack.git" - prefix: "packs/signature" diff --git a/composer.json b/composer.json index c0f39262b..62b569e41 100644 --- a/composer.json +++ b/composer.json @@ -37,46 +37,26 @@ "Jose\\": "src/", "Jose\\Bundle\\JoseFramework\\": "src/JoseFramework/", "Jose\\Experimental\\": "src/Experimental/", - "Jose\\Component\\Checker\\": "src/Component/Checker/", - "Jose\\Component\\Console\\": "src/Component/Console/", - "Jose\\Component\\Core\\": "src/Component/Core/", - "Jose\\Component\\Encryption\\": "src/Component/Encryption/", + "Jose\\Component\\": "src/Component/", "Jose\\Component\\Encryption\\Algorithm\\ContentEncryption\\": [ "src/EncryptionAlgorithm/ContentEncryption/AESCBC", - "src/EncryptionAlgorithm/ContentEncryption/AESCBC/", - "src/EncryptionAlgorithm/ContentEncryption/AESGCM", - "src/EncryptionAlgorithm/ContentEncryption/AESGCM/" + "src/EncryptionAlgorithm/ContentEncryption/AESGCM" ], "Jose\\Component\\Encryption\\Algorithm\\KeyEncryption\\": [ "src/EncryptionAlgorithm/KeyEncryption/AESGCMKW", - "src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/", "src/EncryptionAlgorithm/KeyEncryption/AESKW", - "src/EncryptionAlgorithm/KeyEncryption/AESKW/", "src/EncryptionAlgorithm/KeyEncryption/Direct", - "src/EncryptionAlgorithm/KeyEncryption/Direct/", "src/EncryptionAlgorithm/KeyEncryption/ECDHES", - "src/EncryptionAlgorithm/KeyEncryption/ECDHES/", "src/EncryptionAlgorithm/KeyEncryption/PBES2", - "src/EncryptionAlgorithm/KeyEncryption/PBES2/", - "src/EncryptionAlgorithm/KeyEncryption/RSA", - "src/EncryptionAlgorithm/KeyEncryption/RSA/" + "src/EncryptionAlgorithm/KeyEncryption/RSA" ], - "Jose\\Component\\KeyManagement\\": "src/Component/KeyManagement/", - "Jose\\Component\\NestedToken\\": "src/Component/NestedToken/", - "Jose\\Component\\Signature\\": "src/Component/Signature/", "Jose\\Component\\Signature\\Algorithm\\": [ "src/SignatureAlgorithm/ECDSA", - "src/SignatureAlgorithm/ECDSA/", "src/SignatureAlgorithm/EdDSA", - "src/SignatureAlgorithm/EdDSA/", "src/SignatureAlgorithm/Experimental", - "src/SignatureAlgorithm/Experimental/", "src/SignatureAlgorithm/HMAC", - "src/SignatureAlgorithm/HMAC/", "src/SignatureAlgorithm/None", - "src/SignatureAlgorithm/None/", - "src/SignatureAlgorithm/RSA", - "src/SignatureAlgorithm/RSA/" + "src/SignatureAlgorithm/RSA" ] } }, @@ -140,6 +120,7 @@ "replace": { "web-token/encryption-pack": "self.version", "web-token/jwt-bundle": "self.version", + "web-token/jwt-library": "self.version", "web-token/jwt-checker": "self.version", "web-token/jwt-console": "self.version", "web-token/jwt-core": "self.version", diff --git a/src/Component/Encryption/composer.json b/src/Component/Encryption/composer.json deleted file mode 100644 index 8710f3570..000000000 --- a/src/Component/Encryption/composer.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "web-token/jwt-encryption", - "description": "Encryption component of the JWT Framework.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-encryption/contributors" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Encryption\\": "" - } - }, - "require": { - "php": ">=8.1", - "web-token/jwt-core": "^3.2" - }, - "suggest": { - "web-token/jwt-encryption-algorithm-aescbc": "AES CBC Based Content Encryption Algorithms", - "web-token/jwt-encryption-algorithm-aesgcm": "AES GCM Based Content Encryption Algorithms", - "web-token/jwt-encryption-algorithm-aesgcmkw": "AES GCM Key Wrapping Based Key Encryption Algorithms", - "web-token/jwt-encryption-algorithm-aeskw": "AES Key Wrapping Based Key Encryption Algorithms", - "web-token/jwt-encryption-algorithm-dir": "Direct Key Encryption Algorithms", - "web-token/jwt-encryption-algorithm-ecdh-es": "ECDH-ES Based Key Encryption Algorithms", - "web-token/jwt-encryption-algorithm-pbes2": "PBES2 Based Key Encryption Algorithms", - "web-token/jwt-encryption-algorithm-rsa": "RSA Based Key Encryption Algorithms", - "web-token/jwt-encryption-algorithm-experimental": "Experimental Key and Signature Algorithms" - } -} diff --git a/src/Component/KeyManagement/composer.json b/src/Component/KeyManagement/composer.json deleted file mode 100644 index 22c1128da..000000000 --- a/src/Component/KeyManagement/composer.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "web-token/jwt-key-mgmt", - "description": "Key Management component of the JWT Framework.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-key-mgmt/contributors" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\KeyManagement\\": "" - } - }, - "require": { - "php": ">=8.1", - "ext-openssl": "*", - "psr/http-factory": "^1.0", - "psr/http-client": "^1.0", - "web-token/jwt-core": "^3.2" - }, - "suggest": { - "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys", - "php-http/message-factory": "To enable JKU/X5U support.", - "php-http/httplug": "To enable JKU/X5U support." - } -} diff --git a/src/Component/Checker/LICENSE b/src/Component/LICENSE similarity index 100% rename from src/Component/Checker/LICENSE rename to src/Component/LICENSE diff --git a/src/Component/Checker/README.md b/src/Component/README.md similarity index 100% rename from src/Component/Checker/README.md rename to src/Component/README.md diff --git a/src/Component/Signature/composer.json b/src/Component/Signature/composer.json deleted file mode 100644 index 5e42529df..000000000 --- a/src/Component/Signature/composer.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "web-token/jwt-signature", - "description": "Signature component of the JWT Framework.", - "type": "library", - "license": "MIT", - "keywords": [ - "JWS", - "JWT", - "JWE", - "JWA", - "JWK", - "JWKSet", - "Jot", - "Jose", - "RFC7515", - "RFC7516", - "RFC7517", - "RFC7518", - "RFC7519", - "RFC7520", - "Bundle", - "Symfony" - ], - "homepage": "https://github.com/web-token", - "authors": [ - { - "name": "Florent Morselli", - "homepage": "https://github.com/Spomky" - }, - { - "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-signature/contributors" - } - ], - "autoload": { - "psr-4": { - "Jose\\Component\\Signature\\": "" - } - }, - "require": { - "php": ">=8.1", - "web-token/jwt-core": "^3.2" - }, - "suggest": { - "web-token/jwt-signature-algorithm-ecdsa": "ECDSA Based Signature Algorithms", - "web-token/jwt-signature-algorithm-eddsa": "EdDSA Based Signature Algorithms", - "web-token/jwt-signature-algorithm-hmac": "HMAC Based Signature Algorithms", - "web-token/jwt-signature-algorithm-none": "None Signature Algorithm", - "web-token/jwt-signature-algorithm-rsa": "RSA Based Signature Algorithms", - "web-token/jwt-signature-algorithm-experimental": "Experimental Signature Algorithms" - } -} diff --git a/src/Component/Core/composer.json b/src/Component/composer.json similarity index 63% rename from src/Component/Core/composer.json rename to src/Component/composer.json index dbbeb81ca..dab14d23e 100644 --- a/src/Component/Core/composer.json +++ b/src/Component/composer.json @@ -1,6 +1,6 @@ { - "name": "web-token/jwt-core", - "description": "Core component of the JWT Framework.", + "name": "web-token/jwt-library", + "description": "JWT library", "type": "library", "license": "MIT", "keywords": [ @@ -34,7 +34,7 @@ ], "autoload": { "psr-4": { - "Jose\\Component\\Core\\": "" + "Jose\\Component\\": "" } }, "require": { @@ -43,13 +43,21 @@ "ext-mbstring": "*", "brick/math": "^0.9|^0.10|^0.11|^0.12", "paragonie/constant_time_encoding": "^2.6", - "spomky-labs/pki-framework": "^1.0" + "psr/clock": "^1.0", + "psr/http-factory": "^1.0", + "psr/http-client": "^1.0", + "spomky-labs/pki-framework": "^1.0", + "symfony/console": "^5.4|^6.0|^7.0" }, "conflict": { "spomky-labs/jose": "*" }, "suggest": { + "ext-openssl": "For key management (creation, optimization, etc.)", "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance", - "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance" + "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance", + "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys", + "php-http/message-factory": "To enable JKU/X5U support.", + "php-http/httplug": "To enable JKU/X5U support." } } diff --git a/src/Component/Checker/.github/CONTRIBUTING.md b/src/Deprecated/Checker/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/Checker/.github/CONTRIBUTING.md rename to src/Deprecated/Checker/.github/CONTRIBUTING.md diff --git a/src/Component/Checker/.github/FUNDING.yml b/src/Deprecated/Checker/.github/FUNDING.yml similarity index 100% rename from src/Component/Checker/.github/FUNDING.yml rename to src/Deprecated/Checker/.github/FUNDING.yml diff --git a/src/Component/Checker/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Checker/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/Checker/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/Checker/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/Checker/.github/stale.yml b/src/Deprecated/Checker/.github/stale.yml similarity index 100% rename from src/Component/Checker/.github/stale.yml rename to src/Deprecated/Checker/.github/stale.yml diff --git a/src/Component/Console/LICENSE b/src/Deprecated/Checker/LICENSE similarity index 100% rename from src/Component/Console/LICENSE rename to src/Deprecated/Checker/LICENSE diff --git a/src/Deprecated/Checker/README.md b/src/Deprecated/Checker/README.md new file mode 100644 index 000000000..d5578e4ac --- /dev/null +++ b/src/Deprecated/Checker/README.md @@ -0,0 +1,16 @@ +PHP JWT Checker Component +========================= + +This repository is a sub repository of [the JWT Framework](https://github.com/web-token/jwt-framework) project and is +READ ONLY. + +**Please do not submit any Pull Request here.** +You should go to [the main repository](https://github.com/web-token/jwt-framework) instead. + +# Documentation + +The official documentation is available as https://web-token.spomky-labs.com/ + +# Licence + +This software is release under [MIT licence](LICENSE). diff --git a/src/Component/Checker/composer.json b/src/Deprecated/Checker/composer.json similarity index 66% rename from src/Component/Checker/composer.json rename to src/Deprecated/Checker/composer.json index 3c4440027..ac3676682 100644 --- a/src/Component/Checker/composer.json +++ b/src/Deprecated/Checker/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-checker", - "description": "Checker component of the JWT Framework.", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", "type": "library", "license": "MIT", "keywords": [ @@ -29,17 +29,10 @@ }, { "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-checker/contributors" + "homepage": "https://github.com/web-token/jwt-framework/contributors" } ], - "autoload": { - "psr-4": { - "Jose\\Component\\Checker\\": "" - } - }, "require": { - "php": ">=8.1", - "psr/clock": "^1.0", - "web-token/jwt-core": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/Component/Console/.github/CONTRIBUTING.md b/src/Deprecated/Console/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/Console/.github/CONTRIBUTING.md rename to src/Deprecated/Console/.github/CONTRIBUTING.md diff --git a/src/Component/Console/.github/FUNDING.yml b/src/Deprecated/Console/.github/FUNDING.yml similarity index 100% rename from src/Component/Console/.github/FUNDING.yml rename to src/Deprecated/Console/.github/FUNDING.yml diff --git a/src/Component/Console/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Console/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/Console/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/Console/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/Console/.github/stale.yml b/src/Deprecated/Console/.github/stale.yml similarity index 100% rename from src/Component/Console/.github/stale.yml rename to src/Deprecated/Console/.github/stale.yml diff --git a/src/Component/Core/LICENSE b/src/Deprecated/Console/LICENSE similarity index 100% rename from src/Component/Core/LICENSE rename to src/Deprecated/Console/LICENSE diff --git a/src/Component/Console/README.md b/src/Deprecated/Console/README.md similarity index 100% rename from src/Component/Console/README.md rename to src/Deprecated/Console/README.md diff --git a/src/Component/Console/composer.json b/src/Deprecated/Console/composer.json similarity index 65% rename from src/Component/Console/composer.json rename to src/Deprecated/Console/composer.json index b85aba0d7..4d559bab4 100644 --- a/src/Component/Console/composer.json +++ b/src/Deprecated/Console/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-console", - "description": "Console component of the JWT Framework.", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", "type": "library", "license": "MIT", "keywords": [ @@ -29,17 +29,10 @@ }, { "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-console/contributors" + "homepage": "https://github.com/web-token/jwt-framework/contributors" } ], - "autoload": { - "psr-4": { - "Jose\\Component\\Console\\": "" - } - }, "require": { - "php": ">=8.1", - "symfony/console": "^5.4|^6.0|^7.0", - "web-token/jwt-key-mgmt": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/Component/Core/.github/CONTRIBUTING.md b/src/Deprecated/Core/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/Core/.github/CONTRIBUTING.md rename to src/Deprecated/Core/.github/CONTRIBUTING.md diff --git a/src/Component/Core/.github/FUNDING.yml b/src/Deprecated/Core/.github/FUNDING.yml similarity index 100% rename from src/Component/Core/.github/FUNDING.yml rename to src/Deprecated/Core/.github/FUNDING.yml diff --git a/src/Component/Core/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Core/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/Core/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/Core/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/Core/.github/stale.yml b/src/Deprecated/Core/.github/stale.yml similarity index 100% rename from src/Component/Core/.github/stale.yml rename to src/Deprecated/Core/.github/stale.yml diff --git a/src/Component/Encryption/LICENSE b/src/Deprecated/Core/LICENSE similarity index 100% rename from src/Component/Encryption/LICENSE rename to src/Deprecated/Core/LICENSE diff --git a/src/Component/Core/README.md b/src/Deprecated/Core/README.md similarity index 100% rename from src/Component/Core/README.md rename to src/Deprecated/Core/README.md diff --git a/src/Deprecated/Core/composer.json b/src/Deprecated/Core/composer.json new file mode 100644 index 000000000..9f1ffeb2e --- /dev/null +++ b/src/Deprecated/Core/composer.json @@ -0,0 +1,38 @@ +{ + "name": "web-token/jwt-core", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "type": "library", + "license": "MIT", + "keywords": [ + "JWS", + "JWT", + "JWE", + "JWA", + "JWK", + "JWKSet", + "Jot", + "Jose", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "Bundle", + "Symfony" + ], + "homepage": "https://github.com/web-token", + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "require": { + "web-token/jwt-library": "^3.3" + } +} diff --git a/src/Ecc/README.md b/src/Deprecated/Ecc/README.md similarity index 100% rename from src/Ecc/README.md rename to src/Deprecated/Ecc/README.md diff --git a/src/Ecc/composer.json b/src/Deprecated/Ecc/composer.json similarity index 86% rename from src/Ecc/composer.json rename to src/Deprecated/Ecc/composer.json index 7588a3921..f73b3c18f 100644 --- a/src/Ecc/composer.json +++ b/src/Deprecated/Ecc/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-util-ecc", - "description": "[DEPRECATED] Please use web-token/jwt-core instead.", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", "type": "library", "license": "MIT", "keywords": [ @@ -33,6 +33,6 @@ } ], "require": { - "web-token/jwt-core": "^3.3" + "web-token/jwt-library": "^3.3" } } diff --git a/src/Component/KeyManagement/.github/CONTRIBUTING.md b/src/Deprecated/Encryption/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/KeyManagement/.github/CONTRIBUTING.md rename to src/Deprecated/Encryption/.github/CONTRIBUTING.md diff --git a/src/Component/KeyManagement/.github/FUNDING.yml b/src/Deprecated/Encryption/.github/FUNDING.yml similarity index 100% rename from src/Component/KeyManagement/.github/FUNDING.yml rename to src/Deprecated/Encryption/.github/FUNDING.yml diff --git a/src/Component/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Encryption/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/Encryption/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/KeyManagement/.github/stale.yml b/src/Deprecated/Encryption/.github/stale.yml similarity index 100% rename from src/Component/KeyManagement/.github/stale.yml rename to src/Deprecated/Encryption/.github/stale.yml diff --git a/src/Component/NestedToken/LICENSE b/src/Deprecated/Encryption/LICENSE similarity index 100% rename from src/Component/NestedToken/LICENSE rename to src/Deprecated/Encryption/LICENSE diff --git a/src/Component/Encryption/README.md b/src/Deprecated/Encryption/README.md similarity index 100% rename from src/Component/Encryption/README.md rename to src/Deprecated/Encryption/README.md diff --git a/src/Deprecated/Encryption/composer.json b/src/Deprecated/Encryption/composer.json new file mode 100644 index 000000000..acb166710 --- /dev/null +++ b/src/Deprecated/Encryption/composer.json @@ -0,0 +1,38 @@ +{ + "name": "web-token/jwt-encryption", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "type": "library", + "license": "MIT", + "keywords": [ + "JWS", + "JWT", + "JWE", + "JWA", + "JWK", + "JWKSet", + "Jot", + "Jose", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "Bundle", + "Symfony" + ], + "homepage": "https://github.com/web-token", + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "require": { + "web-token/jwt-library": "^3.3" + } +} diff --git a/src/Component/NestedToken/.github/CONTRIBUTING.md b/src/Deprecated/KeyManagement/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/NestedToken/.github/CONTRIBUTING.md rename to src/Deprecated/KeyManagement/.github/CONTRIBUTING.md diff --git a/src/Component/NestedToken/.github/FUNDING.yml b/src/Deprecated/KeyManagement/.github/FUNDING.yml similarity index 100% rename from src/Component/NestedToken/.github/FUNDING.yml rename to src/Deprecated/KeyManagement/.github/FUNDING.yml diff --git a/src/Component/NestedToken/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/NestedToken/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/KeyManagement/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/NestedToken/.github/stale.yml b/src/Deprecated/KeyManagement/.github/stale.yml similarity index 100% rename from src/Component/NestedToken/.github/stale.yml rename to src/Deprecated/KeyManagement/.github/stale.yml diff --git a/src/Component/Signature/LICENSE b/src/Deprecated/KeyManagement/LICENSE similarity index 100% rename from src/Component/Signature/LICENSE rename to src/Deprecated/KeyManagement/LICENSE diff --git a/src/Component/KeyManagement/README.md b/src/Deprecated/KeyManagement/README.md similarity index 100% rename from src/Component/KeyManagement/README.md rename to src/Deprecated/KeyManagement/README.md diff --git a/src/Deprecated/KeyManagement/composer.json b/src/Deprecated/KeyManagement/composer.json new file mode 100644 index 000000000..8bafa8c85 --- /dev/null +++ b/src/Deprecated/KeyManagement/composer.json @@ -0,0 +1,38 @@ +{ + "name": "web-token/jwt-key-mgmt", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "type": "library", + "license": "MIT", + "keywords": [ + "JWS", + "JWT", + "JWE", + "JWA", + "JWK", + "JWKSet", + "Jot", + "Jose", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "Bundle", + "Symfony" + ], + "homepage": "https://github.com/web-token", + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "require": { + "web-token/jwt-library": "^3.3" + } +} diff --git a/src/Component/Signature/.github/CONTRIBUTING.md b/src/Deprecated/NestedToken/.github/CONTRIBUTING.md similarity index 100% rename from src/Component/Signature/.github/CONTRIBUTING.md rename to src/Deprecated/NestedToken/.github/CONTRIBUTING.md diff --git a/src/Component/Signature/.github/FUNDING.yml b/src/Deprecated/NestedToken/.github/FUNDING.yml similarity index 100% rename from src/Component/Signature/.github/FUNDING.yml rename to src/Deprecated/NestedToken/.github/FUNDING.yml diff --git a/src/Component/Signature/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/NestedToken/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Component/Signature/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/NestedToken/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Component/Signature/.github/stale.yml b/src/Deprecated/NestedToken/.github/stale.yml similarity index 100% rename from src/Component/Signature/.github/stale.yml rename to src/Deprecated/NestedToken/.github/stale.yml diff --git a/src/Ecc/LICENSE b/src/Deprecated/NestedToken/LICENSE similarity index 100% rename from src/Ecc/LICENSE rename to src/Deprecated/NestedToken/LICENSE diff --git a/src/Component/NestedToken/README.md b/src/Deprecated/NestedToken/README.md similarity index 100% rename from src/Component/NestedToken/README.md rename to src/Deprecated/NestedToken/README.md diff --git a/src/Component/NestedToken/composer.json b/src/Deprecated/NestedToken/composer.json similarity index 64% rename from src/Component/NestedToken/composer.json rename to src/Deprecated/NestedToken/composer.json index d96bcdfde..941b34f70 100644 --- a/src/Component/NestedToken/composer.json +++ b/src/Deprecated/NestedToken/composer.json @@ -1,6 +1,6 @@ { "name": "web-token/jwt-nested-token", - "description": "Nested Token component of the JWT Framework.", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", "type": "library", "license": "MIT", "keywords": [ @@ -29,17 +29,10 @@ }, { "name": "All contributors", - "homepage": "https://github.com/web-token/jwt-nested-token/contributors" + "homepage": "https://github.com/web-token/jwt-framework/contributors" } ], - "autoload": { - "psr-4": { - "Jose\\Component\\NestedToken\\": "" - } - }, "require": { - "php": ">=8.1", - "web-token/jwt-encryption": "^3.2", - "web-token/jwt-signature": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/Ecc/.github/CONTRIBUTING.md b/src/Deprecated/Signature/.github/CONTRIBUTING.md similarity index 100% rename from src/Ecc/.github/CONTRIBUTING.md rename to src/Deprecated/Signature/.github/CONTRIBUTING.md diff --git a/src/Ecc/.github/FUNDING.yml b/src/Deprecated/Signature/.github/FUNDING.yml similarity index 100% rename from src/Ecc/.github/FUNDING.yml rename to src/Deprecated/Signature/.github/FUNDING.yml diff --git a/src/Ecc/.github/PULL_REQUEST_TEMPLATE.md b/src/Deprecated/Signature/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from src/Ecc/.github/PULL_REQUEST_TEMPLATE.md rename to src/Deprecated/Signature/.github/PULL_REQUEST_TEMPLATE.md diff --git a/src/Ecc/.github/stale.yml b/src/Deprecated/Signature/.github/stale.yml similarity index 100% rename from src/Ecc/.github/stale.yml rename to src/Deprecated/Signature/.github/stale.yml diff --git a/src/Deprecated/Signature/LICENSE b/src/Deprecated/Signature/LICENSE new file mode 100644 index 000000000..5ab750604 --- /dev/null +++ b/src/Deprecated/Signature/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014-2024 Spomky-Labs + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/src/Component/Signature/README.md b/src/Deprecated/Signature/README.md similarity index 100% rename from src/Component/Signature/README.md rename to src/Deprecated/Signature/README.md diff --git a/src/Deprecated/Signature/composer.json b/src/Deprecated/Signature/composer.json new file mode 100644 index 000000000..7f58c5b30 --- /dev/null +++ b/src/Deprecated/Signature/composer.json @@ -0,0 +1,38 @@ +{ + "name": "web-token/jwt-signature", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "type": "library", + "license": "MIT", + "keywords": [ + "JWS", + "JWT", + "JWE", + "JWA", + "JWK", + "JWKSet", + "Jot", + "Jose", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "Bundle", + "Symfony" + ], + "homepage": "https://github.com/web-token", + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "require": { + "web-token/jwt-library": "^3.3" + } +} diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json b/src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json index 450d996d1..a2778f45b 100644 --- a/src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json +++ b/src/EncryptionAlgorithm/ContentEncryption/AESCBC/composer.json @@ -40,6 +40,6 @@ "require": { "php": ">=8.1", "ext-openssl": "*", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json b/src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json index 5a7286ec9..8fbcc0ea9 100644 --- a/src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json +++ b/src/EncryptionAlgorithm/ContentEncryption/AESGCM/composer.json @@ -40,6 +40,6 @@ "require": { "php": ">=8.1", "ext-openssl": "*", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json b/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json index 4c65d9534..1aefb30da 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json +++ b/src/EncryptionAlgorithm/KeyEncryption/AESGCMKW/composer.json @@ -41,6 +41,6 @@ "php": ">=8.1", "ext-openssl": "*", "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json b/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json index bdf1a4c0a..3d6bae716 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json +++ b/src/EncryptionAlgorithm/KeyEncryption/AESKW/composer.json @@ -41,6 +41,6 @@ "php": ">=8.1", "ext-openssl": "*", "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json b/src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json index 644f2fe49..6b040ece0 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json +++ b/src/EncryptionAlgorithm/KeyEncryption/Direct/composer.json @@ -39,6 +39,6 @@ }, "require": { "php": ">=8.1", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json index cc627fc53..0fd80c99a 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json +++ b/src/EncryptionAlgorithm/KeyEncryption/ECDHES/composer.json @@ -44,7 +44,6 @@ "php": ">=8.1", "ext-openssl": "*", "spomky-labs/aes-key-wrap": "^7.0", - "web-token/jwt-encryption": "^3.2", - "web-token/jwt-core": "^3.3" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json b/src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json index eb722c215..0c358e585 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json +++ b/src/EncryptionAlgorithm/KeyEncryption/PBES2/composer.json @@ -39,6 +39,6 @@ }, "require": { "php": ">=8.1", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json b/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json index 15efb1fe4..7d5077915 100644 --- a/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json +++ b/src/EncryptionAlgorithm/KeyEncryption/RSA/composer.json @@ -42,7 +42,7 @@ "brick/math": "^0.9|^0.10|^0.11|^0.12", "ext-openssl": "*", "symfony/polyfill-mbstring": "^1.12", - "web-token/jwt-encryption": "^3.2" + "web-token/jwt-library": "^3.3" }, "suggest": { "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance", diff --git a/src/Experimental/composer.json b/src/Experimental/composer.json index 8d4a40fba..394f915ce 100644 --- a/src/Experimental/composer.json +++ b/src/Experimental/composer.json @@ -40,8 +40,6 @@ "require": { "php": ">=8.1", "ext-openssl": "*", - "web-token/jwt-encryption-algorithm-rsa": "^3.3", - "web-token/jwt-signature-algorithm-rsa": "^3.3", - "web-token/jwt-signature-algorithm-hmac": "^3.3" + "web-token/jwt-library": "^3.3" } } diff --git a/src/JoseFramework/Resources/views/data_collector/tab/jws/serialization_modes.html.twig b/src/JoseFramework/Resources/views/data_collector/tab/jws/serialization_modes.html.twig index 079e98f82..751d521d5 100644 --- a/src/JoseFramework/Resources/views/data_collector/tab/jws/serialization_modes.html.twig +++ b/src/JoseFramework/Resources/views/data_collector/tab/jws/serialization_modes.html.twig @@ -20,7 +20,7 @@ {% endfor %} {% else %} - There is no serialization modes. Did you install "web-token/jwt-signature"? + There is no serialization modes. Did you install web-token/jwt-library"? {% endif %} diff --git a/src/JoseFramework/composer.json b/src/JoseFramework/composer.json index 54077f1b5..2bd860aa9 100644 --- a/src/JoseFramework/composer.json +++ b/src/JoseFramework/composer.json @@ -44,14 +44,9 @@ "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/event-dispatcher": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4|^6.0|^7.0", - "web-token/jwt-core": "^3.2" + "web-token/jwt-library": "^3.3" }, "suggest": { - "web-token/jwt-checker": "Add header and claim checker managers as Symfony services.", - "web-token/jwt-console": "Add Keys (JWK) and Key sets (JWKSet) management commands for your Symfony console.", - "web-token/jwt-encryption": "Add Encrypted tokens (JWE) support and useful Symfony services.", - "web-token/jwt-key-mgmt": "Add Keys (JWK) and Key sets (JWKSet) management tools.", - "web-token/jwt-signature": "Add signed tokens (JWS) support and useful Symfony services.", "symfony/serializer": "Use the Symfony serializer to serialize/unserialize JWS and JWE tokens." } } diff --git a/src/SignatureAlgorithm/ECDSA/composer.json b/src/SignatureAlgorithm/ECDSA/composer.json index 9b629f444..8774244d6 100644 --- a/src/SignatureAlgorithm/ECDSA/composer.json +++ b/src/SignatureAlgorithm/ECDSA/composer.json @@ -40,6 +40,6 @@ "require": { "php": ">=8.1", "ext-openssl": "*", - "web-token/jwt-signature": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/EdDSA/composer.json b/src/SignatureAlgorithm/EdDSA/composer.json index a5595bc58..9854987a7 100644 --- a/src/SignatureAlgorithm/EdDSA/composer.json +++ b/src/SignatureAlgorithm/EdDSA/composer.json @@ -40,6 +40,6 @@ "require": { "php": ">=8.1", "ext-sodium": "*", - "web-token/jwt-signature": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/HMAC/composer.json b/src/SignatureAlgorithm/HMAC/composer.json index 8418443eb..ee4609f6d 100644 --- a/src/SignatureAlgorithm/HMAC/composer.json +++ b/src/SignatureAlgorithm/HMAC/composer.json @@ -39,6 +39,6 @@ }, "require": { "php": ">=8.1", - "web-token/jwt-signature": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/None/composer.json b/src/SignatureAlgorithm/None/composer.json index 31cc9777e..4ee78c492 100644 --- a/src/SignatureAlgorithm/None/composer.json +++ b/src/SignatureAlgorithm/None/composer.json @@ -39,6 +39,6 @@ }, "require": { "php": ">=8.1", - "web-token/jwt-signature": "^3.2" + "web-token/jwt-library": "^3.3" } } diff --git a/src/SignatureAlgorithm/RSA/composer.json b/src/SignatureAlgorithm/RSA/composer.json index 4f58c51c3..b6fa8c311 100644 --- a/src/SignatureAlgorithm/RSA/composer.json +++ b/src/SignatureAlgorithm/RSA/composer.json @@ -41,7 +41,7 @@ "php": ">=8.1", "brick/math": "^0.9|^0.10|^0.11|^0.12", "ext-openssl": "*", - "web-token/jwt-signature": "^3.2" + "web-token/jwt-library": "^3.3" }, "suggest": { "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance", diff --git a/tests/ComposerJsonTest.php b/tests/ComposerJsonTest.php index 87ba7dce3..124ccfdc0 100644 --- a/tests/ComposerJsonTest.php +++ b/tests/ComposerJsonTest.php @@ -77,7 +77,7 @@ private function listSubPackages(?string $path = self::SRC_DIR): Traversable { $packageFolders = [ 'Bundle', - 'Component', + 'Deprecated', 'EncryptionAlgorithm', 'ContentEncryption', 'KeyEncryption',