From b2883eed693183f8b7d55c29a097dde9aecbad2e Mon Sep 17 00:00:00 2001
From: Safin Wasi <6601566+SafinWasi@users.noreply.github.com>
Date: Wed, 13 Nov 2024 11:26:14 -0600
Subject: [PATCH] chore(jans-cedarling): remove ipaddr (#10140)

---
 .../schema/cedarling_core.cedarschema         |   2 +-
 jans-cedarling/schema/cedarling_core.json     | 179 +++++++++---------
 2 files changed, 90 insertions(+), 91 deletions(-)

diff --git a/jans-cedarling/schema/cedarling_core.cedarschema b/jans-cedarling/schema/cedarling_core.cedarschema
index 29f3598bfb4..d68c9db59ce 100644
--- a/jans-cedarling/schema/cedarling_core.cedarschema
+++ b/jans-cedarling/schema/cedarling_core.cedarschema
@@ -10,7 +10,7 @@ namespace Jans {
         domain: String,
     };
     type Context = {
-            network: ipaddr,
+            network: String,
             network_type: String,
             user_agent: String, 
             operating_system: String,
diff --git a/jans-cedarling/schema/cedarling_core.json b/jans-cedarling/schema/cedarling_core.json
index 3e26b28e80b..216a7cd0c06 100644
--- a/jans-cedarling/schema/cedarling_core.json
+++ b/jans-cedarling/schema/cedarling_core.json
@@ -15,17 +15,6 @@
                     }
                 }
             },
-            "email_address": {
-                "type": "Record",
-                "attributes": {
-                    "domain": {
-                        "type": "String"
-                    },
-                    "id": {
-                        "type": "String"
-                    }
-                }
-            },
             "Context": {
                 "type": "Record",
                 "attributes": {
@@ -51,8 +40,7 @@
                         }
                     },
                     "network": {
-                        "type": "Extension",
-                        "name": "ipaddr"
+                        "type": "String"
                     },
                     "network_type": {
                         "type": "String"
@@ -64,47 +52,20 @@
                         "type": "String"
                     }
                 }
-            }
-        },
-        "entityTypes": {
-            "User": {
-                "memberOfTypes": [
-                    "Role"
-                ],
-                "shape": {
-                    "type": "Record",
-                    "attributes": {
-                        "email": {
-                            "type": "email_address"
-                        },
-                        "phone_number": {
-                            "type": "String"
-                        },
-                        "role": {
-                            "type": "Set",
-                            "element": {
-                                "type": "String"
-                            }
-                        },
-                        "sub": {
-                            "type": "String"
-                        },
-                        "username": {
-                            "type": "String"
-                        }
-                    }
-                }
             },
-            "TrustedIssuer": {
-                "shape": {
-                    "type": "Record",
-                    "attributes": {
-                        "issuer_entity_id": {
-                            "type": "Url"
-                        }
+            "email_address": {
+                "type": "Record",
+                "attributes": {
+                    "domain": {
+                        "type": "String"
+                    },
+                    "id": {
+                        "type": "String"
                     }
                 }
-            },
+            }
+        },
+        "entityTypes": {
             "Workload": {
                 "shape": {
                     "type": "Record",
@@ -128,13 +89,25 @@
                     }
                 }
             },
-            "Userinfo_token": {
+            "id_token": {
                 "shape": {
                     "type": "Record",
                     "attributes": {
+                        "acr": {
+                            "type": "Set",
+                            "element": {
+                                "type": "String"
+                            }
+                        },
+                        "amr": {
+                            "type": "String"
+                        },
                         "aud": {
                             "type": "String"
                         },
+                        "azp": {
+                            "type": "String"
+                        },
                         "birthdate": {
                             "type": "String"
                         },
@@ -172,6 +145,7 @@
                     }
                 }
             },
+            "Role": {},
             "Access_token": {
                 "shape": {
                     "type": "Record",
@@ -201,26 +175,13 @@
                     }
                 }
             },
-            "Role": {},
-            "id_token": {
+            "Userinfo_token": {
                 "shape": {
                     "type": "Record",
                     "attributes": {
-                        "acr": {
-                            "type": "Set",
-                            "element": {
-                                "type": "String"
-                            }
-                        },
-                        "amr": {
-                            "type": "String"
-                        },
                         "aud": {
                             "type": "String"
                         },
-                        "azp": {
-                            "type": "String"
-                        },
                         "birthdate": {
                             "type": "String"
                         },
@@ -280,6 +241,34 @@
                     }
                 }
             },
+            "User": {
+                "memberOfTypes": [
+                    "Role"
+                ],
+                "shape": {
+                    "type": "Record",
+                    "attributes": {
+                        "email": {
+                            "type": "email_address"
+                        },
+                        "phone_number": {
+                            "type": "String"
+                        },
+                        "role": {
+                            "type": "Set",
+                            "element": {
+                                "type": "String"
+                            }
+                        },
+                        "sub": {
+                            "type": "String"
+                        },
+                        "username": {
+                            "type": "String"
+                        }
+                    }
+                }
+            },
             "Application": {
                 "shape": {
                     "type": "Record",
@@ -295,17 +284,25 @@
                         }
                     }
                 }
+            },
+            "TrustedIssuer": {
+                "shape": {
+                    "type": "Record",
+                    "attributes": {
+                        "issuer_entity_id": {
+                            "type": "Url"
+                        }
+                    }
+                }
             }
         },
         "actions": {
-            "Share": {
+            "HEAD": {
                 "appliesTo": {
                     "resourceTypes": [
-                        "Application"
+                        "HTTP_Request"
                     ],
                     "principalTypes": [
-                        "User",
-                        "Role",
                         "Workload"
                     ],
                     "context": {
@@ -313,7 +310,7 @@
                     }
                 }
             },
-            "HEAD": {
+            "PATCH": {
                 "appliesTo": {
                     "resourceTypes": [
                         "HTTP_Request"
@@ -326,7 +323,7 @@
                     }
                 }
             },
-            "Compare": {
+            "Read": {
                 "appliesTo": {
                     "resourceTypes": [
                         "Application"
@@ -341,12 +338,14 @@
                     }
                 }
             },
-            "PATCH": {
+            "Search": {
                 "appliesTo": {
                     "resourceTypes": [
-                        "HTTP_Request"
+                        "Application"
                     ],
                     "principalTypes": [
+                        "User",
+                        "Role",
                         "Workload"
                     ],
                     "context": {
@@ -354,12 +353,14 @@
                     }
                 }
             },
-            "PUT": {
+            "Tag": {
                 "appliesTo": {
                     "resourceTypes": [
-                        "HTTP_Request"
+                        "Application"
                     ],
                     "principalTypes": [
+                        "User",
+                        "Role",
                         "Workload"
                     ],
                     "context": {
@@ -367,7 +368,7 @@
                     }
                 }
             },
-            "Execute": {
+            "Write": {
                 "appliesTo": {
                     "resourceTypes": [
                         "Application"
@@ -382,14 +383,12 @@
                     }
                 }
             },
-            "Read": {
+            "GET": {
                 "appliesTo": {
                     "resourceTypes": [
-                        "Application"
+                        "HTTP_Request"
                     ],
                     "principalTypes": [
-                        "User",
-                        "Role",
                         "Workload"
                     ],
                     "context": {
@@ -410,7 +409,7 @@
                     }
                 }
             },
-            "Search": {
+            "Monitor": {
                 "appliesTo": {
                     "resourceTypes": [
                         "Application"
@@ -425,7 +424,7 @@
                     }
                 }
             },
-            "Tag": {
+            "Execute": {
                 "appliesTo": {
                     "resourceTypes": [
                         "Application"
@@ -440,14 +439,12 @@
                     }
                 }
             },
-            "Write": {
+            "PUT": {
                 "appliesTo": {
                     "resourceTypes": [
-                        "Application"
+                        "HTTP_Request"
                     ],
                     "principalTypes": [
-                        "User",
-                        "Role",
                         "Workload"
                     ],
                     "context": {
@@ -455,12 +452,14 @@
                     }
                 }
             },
-            "GET": {
+            "Compare": {
                 "appliesTo": {
                     "resourceTypes": [
-                        "HTTP_Request"
+                        "Application"
                     ],
                     "principalTypes": [
+                        "User",
+                        "Role",
                         "Workload"
                     ],
                     "context": {
@@ -468,7 +467,7 @@
                     }
                 }
             },
-            "Monitor": {
+            "Share": {
                 "appliesTo": {
                     "resourceTypes": [
                         "Application"