Merge pull request #149 from GregThain/fix-jwt-warning-by-upgrading-to-jwt-0.7.1

Bump jwt-cpp to version 0.7.1,

Author: djw8605

src/scitokens.cpp

@@ -226,7 +226,7 @@ int scitoken_get_expiration(const SciToken token, long long *expiry,
 
     long long result;
     try {
-        result = real_token->get_claim("exp").as_int();
+        result = real_token->get_claim("exp").to_json().get<int64_t>();
     } catch (std::exception &exc) {
         if (err_msg) {
             *err_msg = strdup(exc.what());

src/scitokens_internal.cpp

@@ -576,6 +576,15 @@ std::string normalize_absolute_path(const std::string &path) {
 }
 
 } // namespace
+  //
+static std::unordered_map<std::string, jwt::claim>
+json_to_claim_map(const picojson::object &json) {
+    std::unordered_map<std::string, jwt::claim> m;
+    for (const auto &[name, value] : json) {
+        m.emplace(name, jwt::claim(value));
+    }
+    return m; // nvro
+}
 
 void SciToken::deserialize(const std::string &data,
                            const std::vector<std::string> allowed_issuers) {
@@ -588,7 +597,7 @@ void SciToken::deserialize(const std::string &data,
     val.verify(*m_decoded);
 
     // Set all the claims
-    m_claims = m_decoded->get_payload_claims();
+    m_claims = json_to_claim_map(m_decoded->get_payload_json());
 
     // Copy over the profile
     m_profile = val.get_profile();
@@ -616,7 +625,7 @@ SciToken::deserialize_continue(std::unique_ptr<SciTokenAsyncStatus> status) {
     // Check if the status is completed (verification is complete)
     if (status->m_status->m_done) {
         // Set all the claims
-        m_claims = m_decoded->get_payload_claims();
+        m_claims = json_to_claim_map(m_decoded->get_payload_json());
 
         // Copy over the profile
         m_profile = status->m_validator->get_profile();
@@ -625,7 +634,7 @@ SciToken::deserialize_continue(std::unique_ptr<SciTokenAsyncStatus> status) {
             std::move(status->m_status));
         if (status->m_status->m_done) {
             // Set all the claims
-            m_claims = m_decoded->get_payload_claims();
+            m_claims = json_to_claim_map(m_decoded->get_payload_json());
 
             // Copy over the profile
             m_profile = status->m_validator->get_profile();

src/scitokens_internal.h

@@ -156,7 +156,8 @@ class SciTokenKey {
         : m_kid(key_id), m_name(algorithm), m_public(public_contents),
           m_private(private_contents) {}
 
-    std::string serialize(jwt::builder<jwt::traits::kazuho_picojson> &builder) {
+    std::string serialize(jwt::builder<jwt::default_clock,
+                                       jwt::traits::kazuho_picojson> &builder) {
         if (m_kid != "none") {
             builder.set_key_id(m_kid);
         }
@@ -327,7 +328,7 @@ class SciToken {
     void set_lifetime(int lifetime) { m_lifetime = lifetime; }
 
     std::string serialize() {
-        jwt::builder<jwt::traits::kazuho_picojson> builder(jwt::create());
+        auto builder(jwt::create());
 
         if (!m_issuer_set) {
             throw MissingIssuerException();
@@ -614,7 +615,7 @@ class Validator {
             must_verify_everything = m_validate_all_claims;
         }
 
-        auto claims = jwt.get_payload_claims();
+        auto claims = jwt.get_payload_json();
         for (const auto &claim_pair : claims) {
             if (claim_pair.first == "iat" || claim_pair.first == "nbf" ||
                 claim_pair.first == "exp" || claim_pair.first == "ver") {

src/test.cpp

@@ -16,8 +16,8 @@ int main(int argc, const char **argv) {
 
     auto decoded = jwt::decode(token);
 
-    for (auto &e : decoded.get_payload_claims())
-        std::cout << e.first << " = " << e.second.to_json() << std::endl;
+    for (auto &e : decoded.get_payload_json())
+        std::cout << e.first << " = " << e.second << std::endl;
 
     std::ifstream priv_ifs("test.pem");
     std::string private_contents((std::istreambuf_iterator<char>(priv_ifs)),
@@ -57,8 +57,8 @@ int main(int argc, const char **argv) {
     std::cout << "SciToken: " << value << std::endl;
     auto decoded2 = jwt::decode(value);
 
-    for (auto &e : decoded2.get_payload_claims())
-        std::cout << e.first << " = " << e.second.to_json() << std::endl;
+    for (auto &e : decoded2.get_payload_json())
+        std::cout << e.first << " = " << e.second << std::endl;
 
     scitoken_destroy(scitoken);
     scitoken_key_destroy(key);

vendor/jwt-cpp/.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[!*.{h,cpp}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{h,cpp}]
+indent_style = tab
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

vendor/jwt-cpp/.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [Thalhammer,prince-chrismc]
+patreon: Thalhammer

vendor/jwt-cpp/.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,84 @@
+name: Bug Report 🐛
+description: File a bug report
+
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+    validations:
+      required: false
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen? Feel free to include some screenshots
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: How To Reproduce?
+      description: Please provide a small snippet to reproduce the issue
+      placeholder: Some C++ code or Shell code to recreate th problem
+      value: |
+        ```c++
+        #include "jwt-cpp/jwt.h"
+        int main() {
+           return 0;
+        }
+        ```
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version of our software are you running?
+      options:
+        - 0.7.1
+        - 0.7.0
+        - 0.6.0
+        - 0.5.2
+        - Older (please let us know if the "What happened" box)
+    validations:
+      required: true
+  - type: dropdown
+    id: operating-system
+    attributes:
+      label: What OS are you seeing the problem on?
+      multiple: true
+      options:
+        - Windows
+        - Linux
+        - MacOS
+        - Other (please let us know if the "What happened" box)
+    validations:
+      required: true
+  - type: dropdown
+    id: compiler
+    attributes:
+      label: What compiler are you seeing the problem on?
+      multiple: true
+      options:
+        - GCC
+        - Clang
+        - MSVC
+        - Other (please let us know if the "What happened" box)       
+    validations:
+      required: true 
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

vendor/jwt-cpp/.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,20 @@
+name: Feature Request 🧪
+description: Have a great idea? Find something is missing?
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        We'd love to hear your idea(s)!
+  - type: input
+    id: question
+    attributes:
+      label: "What would you like to see added?"
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+    validations:
+      required: true

vendor/jwt-cpp/.github/ISSUE_TEMPLATE/support-question.yml

@@ -0,0 +1,20 @@
+name: Support Question 🤹
+description: Have some questions? We can offer help.
+labels: ["question"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Don't hesitate to ask any question you might have!
+  - type: input
+    id: question
+    attributes:
+      label: "What's your question?"
+    validations:
+      required: true
+  - type: textarea
+    id: context
+    attributes:
+      label: Additional Context
+    validations:
+      required: true

vendor/jwt-cpp/.github/actions/badge/action.yml

@@ -0,0 +1,31 @@
+name: Regular badging sequence
+description: Publishes a badge based on the job status
+inputs:
+  category:
+    description: The subfolder where to group the badges
+    required: true
+  label:
+    description: The label to you in the badge (this should be unique for each badge in a category)
+    required: true
+  github_token:
+    description: The token to use to publish the changes
+    required: false
+    default: ${{ github.token }}
+runs:
+  using: composite
+  steps:
+    - if: job.status == 'success'
+      uses: ./.github/actions/badge/write
+      with:
+        category: ${{ inputs.category }}
+        label: ${{ inputs.label }}
+    - if: job.status == 'failure'
+      uses: ./.github/actions/badge/write
+      with:
+        category: ${{ inputs.category }}
+        label: ${{ inputs.label }}
+        message: Failing
+        color: red
+    - uses: ./.github/actions/badge/publish
+      with:
+        github_token: ${{ inputs.github_token }}