Skip to content

Commit

Permalink
Merge small libs to jwt-library
Browse files Browse the repository at this point in the history
  • Loading branch information
Spomky committed Feb 1, 2024
1 parent 4eb3429 commit a6bb861
Show file tree
Hide file tree
Showing 76 changed files with 249 additions and 257 deletions.
26 changes: 14 additions & 12 deletions .gitsplit.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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"
Expand Down
29 changes: 5 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
},
Expand Down Expand Up @@ -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",
Expand Down
55 changes: 0 additions & 55 deletions src/Component/Encryption/composer.json

This file was deleted.

52 changes: 0 additions & 52 deletions src/Component/KeyManagement/composer.json

This file was deleted.

File renamed without changes.
File renamed without changes.
52 changes: 0 additions & 52 deletions src/Component/Signature/composer.json

This file was deleted.

18 changes: 13 additions & 5 deletions src/Component/Core/composer.json → src/Component/composer.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -34,7 +34,7 @@
],
"autoload": {
"psr-4": {
"Jose\\Component\\Core\\": ""
"Jose\\Component\\": ""
}
},
"require": {
Expand All @@ -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."
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
16 changes: 16 additions & 0 deletions src/Deprecated/Checker/README.md
Original file line number Diff line number Diff line change
@@ -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).
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -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"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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": [
Expand Down Expand Up @@ -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"
}
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit a6bb861

Please sign in to comment.