Merge pull request #203 from lalithkota/17.0-develop-disctrict-code

Fixed utc Datetimes and REST API modules dependency graphs

g2p_encryption_keymanager/models/encryption_provider.py

@@ -5,7 +5,7 @@
 import logging
 import os
 import secrets
-from datetime import datetime
+from datetime import datetime, timezone
 
 import requests
 from cryptography import x509
@@ -39,7 +39,7 @@ def _km_random_secret(self):
 
     @api.model
     def km_generate_current_time(self):
-        return f'{datetime.utcnow().isoformat(timespec = "milliseconds")}Z'
+        return f'{datetime.now(timezone.utc).isoformat(timespec = "milliseconds")}Z'
 
     keymanager_api_base_url = fields.Char("Keymanager API Base URL", default=KEYMANAGER_API_BASE_URL)
     keymanager_api_timeout = fields.Integer("Keymanager API Timeout", default=10)
@@ -261,7 +261,7 @@ def km_get_access_token(self):
         if (
             self.keymanager_access_token
             and self.keymanager_access_token_expiry
-            and self.keymanager_access_token_expiry > datetime.utcnow()
+            and self.keymanager_access_token_expiry > datetime.now(timezone.utc)
         ):
             return self.keymanager_access_token
         data = {

g2p_encryption_rest_api/__init__.py

@@ -1,2 +1 @@
 from . import models
-from . import routers

g2p_encryption_rest_api/models/fastapi_endpoint_security.py

@@ -2,8 +2,6 @@
 
 from odoo import api, fields, models
 
-from ..routers.well_known import well_known_router
-
 
 class SecurityFastApiEndpoint(models.Model):
     _inherit = "fastapi.endpoint"
@@ -15,6 +13,8 @@ class SecurityFastApiEndpoint(models.Model):
     def _get_fastapi_routers(self) -> list[APIRouter]:
         routers = super()._get_fastapi_routers()
         if self.app == "security":
+            from ..routers.well_known import well_known_router
+
             routers.append(well_known_router)
         return routers
 

g2p_encryption_rest_api/routers/__init__.py

@@ -1 +0,0 @@
-from . import well_known

g2p_openid_vci/models/vci_issuer.py

@@ -2,7 +2,7 @@
 import logging
 import os
 import uuid
-from datetime import datetime
+from datetime import datetime, timezone
 
 import jq
 import requests
@@ -136,7 +136,7 @@ def issue_vc_Registry(self, auth_claims, credential_request):
         partner_dict = partner.read()[0]
         reg_ids_dict = {reg_id.id_type.name: reg_id.read()[0] for reg_id in partner.reg_ids}
 
-        curr_datetime = f'{datetime.utcnow().isoformat(timespec = "milliseconds")}Z'
+        curr_datetime = f'{datetime.now(timezone.utc).isoformat(timespec = "milliseconds")}Z'
         credential = jq.first(
             self.credential_format,
             VCJSONEncoder.python_dict_to_json_dict(
@@ -183,7 +183,7 @@ def sign_and_issue_credential(self, credential: dict) -> dict:
 
     def build_empty_ld_proof(self):
         self.ensure_one()
-        curr_datetime = f'{datetime.utcnow().isoformat(timespec = "milliseconds")}Z'
+        curr_datetime = f'{datetime.now(timezone.utc).isoformat(timespec = "milliseconds")}Z'
         web_base_url = self.env["ir.config_parameter"].sudo().get_param("web.base.url").rstrip("/")
         # TODO: Remove this hardcoding
         return {

g2p_openid_vci/tests/test_openid_vc_issuer.py

@@ -1,6 +1,6 @@
 import base64
 import os
-from datetime import datetime
+from datetime import datetime, timezone
 from unittest.mock import MagicMock, patch
 
 import requests
@@ -67,7 +67,7 @@ def setUp(self):
                 "iss": "http://openg2p.local/auth",
                 "aud": "http://openg2p.local/api/v1/vci/credential",
                 "sub": self.registrant_national_id,
-                "exp": int(datetime.utcnow().timestamp()) + 5 * 60,
+                "exp": int(datetime.now(timezone.utc).timestamp()) + 5 * 60,
             },
             self.jwk,
             algorithm="RS256",
@@ -144,7 +144,7 @@ def test_issue_vc_no_scope(self):
                         "iss": "http://openg2p.local/auth",
                         "aud": "http://openg2p.local/api/v1/vci/credential",
                         "sub": self.registrant_national_id,
-                        "exp": int(datetime.utcnow().timestamp()) + 5 * 60,
+                        "exp": int(datetime.now(timezone.utc).timestamp()) + 5 * 60,
                     },
                     self.jwk,
                     algorithm="RS256",
@@ -164,7 +164,7 @@ def test_issue_vc_invalid_id(self, mock_request):
                         "iss": "http://openg2p.local/auth",
                         "aud": "http://openg2p.local/api/v1/vci/credential",
                         "sub": "random-value",
-                        "exp": int(datetime.utcnow().timestamp()) + 5 * 60,
+                        "exp": int(datetime.now(timezone.utc).timestamp()) + 5 * 60,
                     },
                     self.jwk,
                     algorithm="RS256",
@@ -187,7 +187,7 @@ def test_issue_vc_check_audience(self, mock_request):
                         "iss": "http://openg2p.local/auth",
                         "aud": ["http://random.url/credential"],
                         "sub": self.registrant_national_id,
-                        "exp": int(datetime.utcnow().timestamp()) + 5 * 60,
+                        "exp": int(datetime.now(timezone.utc).timestamp()) + 5 * 60,
                     },
                     self.jwk,
                     algorithm="RS256",
@@ -207,7 +207,7 @@ def test_issue_vc_auth_expired(self, mock_request):
                         "iss": "http://openg2p.local/auth",
                         "aud": "http://openg2p.local/api/v1/vci/credential",
                         "sub": self.registrant_national_id,
-                        "exp": int(datetime.utcnow().timestamp()) - 5 * 60,
+                        "exp": int(datetime.now(timezone.utc).timestamp()) - 5 * 60,
                     },
                     self.jwk,
                     algorithm="RS256",

g2p_openid_vci_rest_api/__init__.py

@@ -1,3 +1,2 @@
 from . import schemas
 from . import models
-from . import routers

g2p_openid_vci_rest_api/models/fastapi_endpoint_vci.py

@@ -2,8 +2,6 @@
 
 from odoo import api, fields, models
 
-from ..routers.openid_vci import openid_vci_router
-
 
 class VCIFastApiEndpoint(models.Model):
     _inherit = "fastapi.endpoint"
@@ -13,6 +11,8 @@ class VCIFastApiEndpoint(models.Model):
     def _get_fastapi_routers(self) -> list[APIRouter]:
         routers = super()._get_fastapi_routers()
         if self.app == "vci":
+            from ..routers.openid_vci import openid_vci_router
+
             routers.append(openid_vci_router)
         return routers
 

g2p_openid_vci_rest_api/routers/__init__.py

@@ -1 +0,0 @@
-from . import openid_vci

g2p_openid_vci_rest_api/tests/test_vci_api.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from unittest.mock import patch
 
 from odoo.tests import tagged
@@ -21,7 +21,7 @@ def mock_issue_vc(self):
                 "id": "1234",
                 "type": ["VerifiableCredential", "OpenG2PTestVerifiableCredential"],
                 "issuer": "did:example:test12345678abcdefgh",
-                "issuanceDate": f'{datetime.utcnow().isoformat(timespec = "milliseconds")}Z',
+                "issuanceDate": f'{datetime.now(timezone.utc).isoformat(timespec = "milliseconds")}Z',
                 "credentialSubject": {
                     "vcVer": "VC-V1",
                     "id": "http://openg2p.local/individual/1",

mts_connector/models/mts_connector.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 import jq
 import requests
@@ -161,7 +161,7 @@ def mts_onetime_action(self, _id: int):
         _logger.info("Being called everytime. Id: " + str(_id))
         current_conf: MTSConnector = self.env["mts.connector"].browse(_id)
         # execute here
-        dt_now = datetime.utcnow()
+        dt_now = datetime.now(timezone.utc)
         mts_request = {
             "id": "string",
             "version": "string",