Add user type resolution to GRAPPA

cs3org · Jun 4, 2021 · fcf25b0 · fcf25b0
1 parent c40fbae
commit fcf25b0
Show file tree

Hide file tree

Showing 19 changed files with 159 additions and 83 deletions.
diff --git a/examples/meshdirectory/users.demo.json b/examples/meshdirectory/users.demo.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-			"idp": "localhost:20080"
+			"idp": "localhost:20080",
+			"type": 1
 		},
 		"username": "einstein",
 		"secret": "relativity",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-			"idp": "localhost:20080"
+			"idp": "localhost:20080",
+			"type": 1
 		},
 		"username": "marie",
 		"secret": "radioactivity",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-			"idp": "localhost:20080"
+			"idp": "localhost:20080",
+			"type": 1
 		},
 		"username": "richard",
 		"secret": "superfluidity",

diff --git a/examples/oc-phoenix/users.demo.json b/examples/oc-phoenix/users.demo.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "4c510ada-c86b-4815-8820-42cdf82c3d51",
-			"idp": "localhost:20080"
+			"idp": "localhost:20080",
+			"type": 1
 		},
 		"username": "einstein",
 		"secret": "relativity",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c",
-			"idp": "localhost:20080"
+			"idp": "localhost:20080",
+			"type": 1
 		},
 		"username": "marie",
 		"secret": "radioactivity",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "932b4540-8d16-481e-8ef4-588e4b6b151c",
-			"idp": "localhost:20080"
+			"idp": "localhost:20080",
+			"type": 1
 		},
 		"username": "richard",
 		"secret": "superfluidity",

diff --git a/examples/ocm-partners/users-ailleron.json b/examples/ocm-partners/users-ailleron.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "jarek1234",
-			"idp": "softwaremind.com"
+			"idp": "softwaremind.com",
+			"type": 1
 		},
 		"username": "jarek",
 		"secret": "jarekpass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "mateusz5678",
-			"idp": "softwaremind.com"
+			"idp": "softwaremind.com",
+			"type": 1
 		},
 		"username": "mateusz",
 		"secret": "mateuszpass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "dawid9876",
-			"idp": "softwaremind.com"
+			"idp": "softwaremind.com",
+			"type": 1
 		},
 		"username": "dawid",
 		"secret": "dawidpass",
@@ -35,7 +38,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "softwaremind.com"
+			"idp": "softwaremind.com",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",

diff --git a/examples/ocm-partners/users-cern.json b/examples/ocm-partners/users-cern.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "ishank1234",
-			"idp": "cern.ch"
+			"idp": "cern.ch",
+			"type": 1
 		},
 		"username": "ishank",
 		"secret": "ishankpass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "hugo5678",
-			"idp": "cern.ch"
+			"idp": "cern.ch",
+			"type": 1
 		},
 		"username": "hugo",
 		"secret": "hugopass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "samuel9876",
-			"idp": "cern.ch"
+			"idp": "cern.ch",
+			"type": 1
 		},
 		"username": "samuel",
 		"secret": "samuelpass",
@@ -35,7 +38,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "cern.ch"
+			"idp": "cern.ch",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",

diff --git a/examples/ocm-partners/users-cesnet.json b/examples/ocm-partners/users-cesnet.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "miroslav1234",
-			"idp": "cesnet.cz"
+			"idp": "cesnet.cz",
+			"type": 1
 		},
 		"username": "miroslav",
 		"secret": "miroslavpass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "milan5678",
-			"idp": "cesnet.cz"
+			"idp": "cesnet.cz",
+			"type": 1
 		},
 		"username": "milan",
 		"secret": "milanpass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "cesnet.cz"
+			"idp": "cesnet.cz",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",

diff --git a/examples/ocm-partners/users-cubbit.json b/examples/ocm-partners/users-cubbit.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "alessandro1234",
-			"idp": "cubbit.io"
+			"idp": "cubbit.io",
+			"type": 1
 		},
 		"username": "alessandro",
 		"secret": "alessandropass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "lorenzo5678",
-			"idp": "cubbit.io"
+			"idp": "cubbit.io",
+			"type": 1
 		},
 		"username": "lorenzo",
 		"secret": "lorenzopass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "cubbit.io"
+			"idp": "cubbit.io",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",

diff --git a/examples/ocm-partners/users-dtu.json b/examples/ocm-partners/users-dtu.json
@@ -1,43 +1,38 @@
 [
-
-    {  
-
-
-	    "id": {
-	             "opaque_id": "marina1234",
-		     "idp": "dtu.dk" 
-
-	    }, 
-	    "username": "marina",
-	    "secret": "marinapass",
-	    "mail": "marpap@dtu.dk",
-	    "display_name": "Marina Papathanasiou",
-	    "groups": ["sailing-lovers", "violin-haters", "physics-lovers"]
+  {
+    "id": {
+      "opaque_id": "marina1234",
+      "idp": "dtu.dk",
+			"type": 1
     },
-    {
-            "id": {
-	              "opaque_id": "frederik7899",
-		      "idp": "dtu.dk"
-
-	    },
-	    "username": "frederik",
-	    "secret": "frederikpass",
-	    "mail": "frederik.orellana@deic.dk",
-	    "display_name": "Frederik Orellana",
-	    "groups": ["radium-lovers", "polonium-lovers", "physics-lovers"]
-
-
+    "username": "marina",
+    "secret": "marinapass",
+    "mail": "marpap@dtu.dk",
+    "display_name": "Marina Papathanasiou",
+    "groups": ["sailing-lovers", "violin-haters", "physics-lovers"]
+  },
+  {
+    "id": {
+      "opaque_id": "frederik7899",
+      "idp": "dtu.dk",
+			"type": 1
     },
-    {       
-            "id": {
-	              "opaque_id": "test3456",
-		      "idp": "dtu.dk"
-	    },
-	    "username": "test",
-	    "secret":  "testpass",
-	    "mail": "test7@dtu.dk",
-	    "display_name": "User_test",
-	    "groups": ["test-lovers", "bug-haters", "ai-lovers"]
-     }
-
+    "username": "frederik",
+    "secret": "frederikpass",
+    "mail": "frederik.orellana@deic.dk",
+    "display_name": "Frederik Orellana",
+    "groups": ["radium-lovers", "polonium-lovers", "physics-lovers"]
+  },
+  {
+    "id": {
+      "opaque_id": "test3456",
+      "idp": "dtu.dk",
+			"type": 1
+    },
+    "username": "test",
+    "secret": "testpass",
+    "mail": "test7@dtu.dk",
+    "display_name": "User_test",
+    "groups": ["test-lovers", "bug-haters", "ai-lovers"]
+  }
 ]
diff --git a/examples/ocm-partners/users-surfsara.json b/examples/ocm-partners/users-surfsara.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "ron1234",
-			"idp": "surfsara.nl"
+			"idp": "surfsara.nl",
+			"type": 1
 		},
 		"username": "ron",
 		"secret": "ronpass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "antoon5678",
-			"idp": "surfsara.nl"
+			"idp": "surfsara.nl",
+			"type": 1
 		},
 		"username": "antoon",
 		"secret": "antoonpass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "surfsara.nl"
+			"idp": "surfsara.nl",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",

diff --git a/examples/ocm-partners/users-switch.json b/examples/ocm-partners/users-switch.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "kerins1234",
-			"idp": "switch.ch"
+			"idp": "switch.ch",
+			"type": 1
 		},
 		"username": "kerins",
 		"secret": "kerinspass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "furter5678",
-			"idp": "switch.ch"
+			"idp": "switch.ch",
+			"type": 1
 		},
 		"username": "furter",
 		"secret": "furterpass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "schmid9876",
-			"idp": "switch.ch"
+			"idp": "switch.ch",
+			"type": 1
 		},
 		"username": "schmid",
 		"secret": "schmidpass",
@@ -35,7 +38,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "switch.ch"
+			"idp": "switch.ch",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",

diff --git a/examples/ocm-partners/users-wwu.json b/examples/ocm-partners/users-wwu.json
@@ -2,7 +2,8 @@
 	{
 		"id": {
 			"opaque_id": "holger1234",
-			"idp": "uni-muenster.de"
+			"idp": "uni-muenster.de",
+			"type": 1
 		},
 		"username": "holger",
 		"secret": "holgerpass",
@@ -13,7 +14,8 @@
 	{
 		"id": {
 			"opaque_id": "daniel5678",
-			"idp": "uni-muenster.de"
+			"idp": "uni-muenster.de",
+			"type": 1
 		},
 		"username": "daniel",
 		"secret": "danielpass",
@@ -24,7 +26,8 @@
 	{
 		"id": {
 			"opaque_id": "test4242",
-			"idp": "uni-muenster.de"
+			"idp": "uni-muenster.de",
+			"type": 1
 		},
 		"username": "test",
 		"secret": "testpass",