Merge pull request #85 from ankitmashu/main

updated postman collection and env and solved admin token issues
datakaveri · Nov 3, 2023 · ae31210 · ae31210
2 parents b6eb1fb + 2634459
commit ae31210
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 455 deletions.
diff --git a/src/main/java/iudx/data/ingestion/server/authenticator/JwtAuthenticationServiceImpl.java b/src/main/java/iudx/data/ingestion/server/authenticator/JwtAuthenticationServiceImpl.java
@@ -159,9 +159,7 @@ public boolean isValidAdminToken(JwtData jwtData) {
     }
 
     String jwtId = jwtData.getIid().split(":")[1];
-    String jwtIss = jwtData.getIss();
-    return audience != null && audience.equals(jwtId) && authServerHost.equalsIgnoreCase(jwtIss);
-
+    return audience != null && audience.equals(jwtId);
   }
 
   public Future<Boolean> isValidId(JwtData jwtData, String id) {
@@ -204,5 +202,4 @@ final class ResultContainer {
 
   }
 
-
 }
diff --git a/src/test/resources/DI Jenkins Pipeline.postman_environment-V5.0.0.json b/src/test/resources/DI Jenkins Pipeline.postman_environment-V5.0.0.json
@@ -0,0 +1,62 @@
+{
+	"id": "9a372725-a6c8-497c-a940-709e1170d00e",
+	"name": "DI Environment",
+	"values": [
+		{
+			"key": "clientID",
+			"value": "4b0d2450-13da-4846-b9da-de31c3fca256",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "clientSecret",
+			"value": "46a0af39eb5b347c9e73f6d707e533a5ebce5088",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "base_url",
+			"value": "di.iudx.io",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "basePath",
+			"value": "ngsi-ld/v1",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "dxAuthBasePath",
+			"value": "auth/v1",
+			"enabled": true
+		},
+		{
+			"key": "auth-url",
+			"value": "authvertx.iudx.io",
+			"type": "default",
+			"enabled": true
+		},
+		{
+			"key": "adminToken",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "delegateToken",
+			"value": "",
+			"type": "any",
+			"enabled": true
+		},
+		{
+			"key": "delegationId",
+			"value": "",
+			"type": "default",
+			"enabled": true
+		}
+	],
+	"_postman_variable_scope": "environment",
+	"_postman_exported_at": "2023-10-09T06:37:11.675Z",
+	"_postman_exported_using": "Postman/9.31.29"
+}