@@ -15,7 +15,7 @@ import {StringToArrayUtils} from "./StringToArrayUtils.sol";
1515contract JwtRegistry is IDKIMRegistry , Ownable {
1616 using StringToArrayUtils for string ;
1717
18- DKIMRegistry public dkimRegistry;
18+ DKIMRegistry public immutable dkimRegistry;
1919
2020 // Check if azp is registered
2121 mapping (string => bool ) public whitelistedClients;
@@ -48,7 +48,7 @@ contract JwtRegistry is IDKIMRegistry, Ownable {
4848 string memory domainName ,
4949 bytes32 publicKeyHash
5050 ) public view returns (bool ) {
51- return this . isDKIMPublicKeyHashValid (domainName, publicKeyHash);
51+ return isDKIMPublicKeyHashValid (domainName, publicKeyHash);
5252 }
5353
5454 /// @notice Sets a public key hash for a `kis|iss` string after validating the provided signature.
@@ -64,17 +64,17 @@ contract JwtRegistry is IDKIMRegistry, Ownable {
6464 string [] memory parts = domainName.stringToArray ();
6565 string memory kidAndIss = string (abi.encode (parts[0 ], "| " , parts[1 ]));
6666 require (
67- isDKIMPublicKeyHashValid (domainName, publicKeyHash) == false ,
67+ ! isDKIMPublicKeyHashValid (domainName, publicKeyHash),
6868 "publicKeyHash is already set "
6969 );
7070 require (
71- dkimRegistry.revokedDKIMPublicKeyHashes (publicKeyHash) == false ,
71+ ! dkimRegistry.revokedDKIMPublicKeyHashes (publicKeyHash),
7272 "publicKeyHash is revoked "
7373 );
7474
75- dkimRegistry.setDKIMPublicKeyHash (kidAndIss, publicKeyHash);
7675 // Register azp
7776 whitelistedClients[parts[2 ]] = true ;
77+ dkimRegistry.setDKIMPublicKeyHash (kidAndIss, publicKeyHash);
7878 }
7979
8080 /// @notice Revokes a public key hash for `kis|iss` string after validating the provided signature.
@@ -88,11 +88,11 @@ contract JwtRegistry is IDKIMRegistry, Ownable {
8888 require (bytes (domainName).length != 0 , "Invalid domain name " );
8989 require (publicKeyHash != bytes32 (0 ), "Invalid public key hash " );
9090 require (
91- isDKIMPublicKeyHashValid (domainName, publicKeyHash) == true ,
91+ isDKIMPublicKeyHashValid (domainName, publicKeyHash),
9292 "publicKeyHash is not set "
9393 );
9494 require (
95- dkimRegistry.revokedDKIMPublicKeyHashes (publicKeyHash) == false ,
95+ ! dkimRegistry.revokedDKIMPublicKeyHashes (publicKeyHash),
9696 "publicKeyHash is already revoked "
9797 );
9898
0 commit comments