roles -> role

ChrisPenner · ChrisPenner · commit ff3dc095e511 · 2025-10-14T11:55:16.000-07:00
diff --git a/src/Share/Web/Authorization/Types.hs b/src/Share/Web/Authorization/Types.hs
@@ -353,27 +353,27 @@ deriving instance (Ord (f RoleRef), Ord subject) => Ord (RoleAssignment f subjec
 
 deriving instance (Show (f RoleRef), Show subject) => Show (RoleAssignment f subject)
 
-instance (ToJSON user) => ToJSON (RoleAssignment Identity user) where
+instance {-# OVERLAPPING #-} (ToJSON user) => ToJSON (RoleAssignment Identity user) where
   toJSON RoleAssignment {..} =
     object
       [ "subject" Aeson..= subject,
         "role" Aeson..= roles
       ]
 
-instance (ToJSON user) => ToJSON (RoleAssignment Set user) where
+instance {-# OVERLAPPABLE #-} (ToJSON user, ToJSON (f RoleRef)) => ToJSON (RoleAssignment f user) where
   toJSON RoleAssignment {..} =
     object
       [ "subject" Aeson..= subject,
         "roles" Aeson..= roles
       ]
 
-instance (FromJSON user) => FromJSON (RoleAssignment Identity user) where
+instance {-# OVERLAPPING #-}  (FromJSON user) => FromJSON (RoleAssignment Identity user) where
   parseJSON = Aeson.withObject "RoleAssignment" $ \o -> do
     subject <- o Aeson..: "subject"
     roles <- o Aeson..: "role"
     pure RoleAssignment {..}
 
-instance (FromJSON user) => FromJSON (RoleAssignment Set user) where
+instance {-# OVERLAPPABLE #-} (FromJSON user, FromJSON (f RoleRef)) => FromJSON (RoleAssignment f user) where
   parseJSON = Aeson.withObject "RoleAssignment" $ \o -> do
     subject <- o Aeson..: "subject"
     roles <- o Aeson..: "roles"
diff --git a/transcripts/share-apis/orgs/org-add-members-new-user.json b/transcripts/share-apis/orgs/org-add-members-new-user.json
@@ -2,7 +2,7 @@
   "body": {
     "members": [
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "newuser",
@@ -11,7 +11,7 @@
         }
       },
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "test",
@@ -20,7 +20,7 @@
         }
       },
       {
-        "roles": "org_owner",
+        "role": "org_owner",
         "subject": {
           "avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",
           "handle": "transcripts",
diff --git a/transcripts/share-apis/orgs/org-add-members.json b/transcripts/share-apis/orgs/org-add-members.json
@@ -2,7 +2,7 @@
   "body": {
     "members": [
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "test",
@@ -11,7 +11,7 @@
         }
       },
       {
-        "roles": "org_owner",
+        "role": "org_owner",
         "subject": {
           "avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",
           "handle": "transcripts",
diff --git a/transcripts/share-apis/orgs/org-get-members-after-adding.json b/transcripts/share-apis/orgs/org-get-members-after-adding.json
@@ -2,7 +2,7 @@
   "body": {
     "members": [
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "newuser",
@@ -11,7 +11,7 @@
         }
       },
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "test",
@@ -20,7 +20,7 @@
         }
       },
       {
-        "roles": "org_owner",
+        "role": "org_owner",
         "subject": {
           "avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",
           "handle": "transcripts",
diff --git a/transcripts/share-apis/orgs/org-get-members-after-removing.json b/transcripts/share-apis/orgs/org-get-members-after-removing.json
@@ -2,7 +2,7 @@
   "body": {
     "members": [
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "test",
@@ -11,7 +11,7 @@
         }
       },
       {
-        "roles": "org_owner",
+        "role": "org_owner",
         "subject": {
           "avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",
           "handle": "transcripts",
diff --git a/transcripts/share-apis/orgs/org-get-members-public.json b/transcripts/share-apis/orgs/org-get-members-public.json
@@ -2,7 +2,7 @@
   "body": {
     "members": [
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "test",
@@ -11,7 +11,7 @@
         }
       },
       {
-        "roles": "org_owner",
+        "role": "org_owner",
         "subject": {
           "avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",
           "handle": "transcripts",
diff --git a/transcripts/share-apis/orgs/org-remove-members.json b/transcripts/share-apis/orgs/org-remove-members.json
@@ -2,7 +2,7 @@
   "body": {
     "members": [
       {
-        "roles": "org_maintainer",
+        "role": "org_maintainer",
         "subject": {
           "avatarUrl": null,
           "handle": "test",
@@ -11,7 +11,7 @@
         }
       },
       {
-        "roles": "org_owner",
+        "role": "org_owner",
         "subject": {
           "avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",
           "handle": "transcripts",
diff --git a/transcripts/share-apis/orgs/run.zsh b/transcripts/share-apis/orgs/run.zsh
@@ -51,7 +51,7 @@ fetch "$admin_user" POST org-create-by-admin-commercial '/orgs' '{
 fetch "$transcripts_user" POST org-add-members '/orgs/acme/members' '{
   "members": [
     { "subject": "test", 
-      "roles": "org_maintainer"
+      "role": "org_maintainer"
     }
   ]
 }'
@@ -68,15 +68,15 @@ fetch "$unauthorized_user" GET org-get-members-public '/orgs/acme/members'
 fetch "$unauthorized_user" POST org-add-members-unauthorized '/orgs/acme/members' '{
   "members": [
     { "subject": "unauthorized", 
-      "roles": "org_maintainer"
+      "role": "org_maintainer"
     }
   ]
 }'
 
 fetch "$transcripts_user" POST org-add-members-new-user '/orgs/acme/members' '{
   "members": [
     { "subject": "newuser", 
-      "roles": "org_maintainer"
+      "role": "org_maintainer"
     }
   ]
 }'
@@ -85,7 +85,7 @@ fetch "$transcripts_user" POST org-add-members-new-user '/orgs/acme/members' '{
 fetch "$transcripts_user" POST org-cant-have-org-members '/orgs/acme/members' '{
   "members": [
     { "subject": "unison", 
-      "roles": "org_maintainer"
+      "role": "org_maintainer"
     }
   ]
 }'

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"body": {`
`3`	`3`	`"members": [`
`4`	`4`	`{`
`5`		`- "roles": "org_maintainer",`
	`5`	`+ "role": "org_maintainer",`
`6`	`6`	`"subject": {`
`7`	`7`	`"avatarUrl": null,`
`8`	`8`	`"handle": "newuser",`
`@@ -11,7 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`{`
`14`		`- "roles": "org_maintainer",`
	`14`	`+ "role": "org_maintainer",`
`15`	`15`	`"subject": {`
`16`	`16`	`"avatarUrl": null,`
`17`	`17`	`"handle": "test",`
`@@ -20,7 +20,7 @@`
`20`	`20`	`}`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- "roles": "org_owner",`
	`23`	`+ "role": "org_owner",`
`24`	`24`	`"subject": {`
`25`	`25`	`"avatarUrl": "https://www.gravatar.com/avatar/205e460b479e2e5b48aec07710c08d50?f=y&d=retro",`
`26`	`26`	`"handle": "transcripts",`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ fetch "$admin_user" POST org-create-by-admin-commercial '/orgs' '{`
`51`	`51`	`fetch "$transcripts_user" POST org-add-members '/orgs/acme/members' '{`
`52`	`52`	`"members": [`
`53`	`53`	`{ "subject": "test",`
`54`		`- "roles": "org_maintainer"`
	`54`	`+ "role": "org_maintainer"`
`55`	`55`	`}`
`56`	`56`	`]`
`57`	`57`	`}'`
`@@ -68,15 +68,15 @@ fetch "$unauthorized_user" GET org-get-members-public '/orgs/acme/members'`
`68`	`68`	`fetch "$unauthorized_user" POST org-add-members-unauthorized '/orgs/acme/members' '{`
`69`	`69`	`"members": [`
`70`	`70`	`{ "subject": "unauthorized",`
`71`		`- "roles": "org_maintainer"`
	`71`	`+ "role": "org_maintainer"`
`72`	`72`	`}`
`73`	`73`	`]`
`74`	`74`	`}'`
`75`	`75`
`76`	`76`	`fetch "$transcripts_user" POST org-add-members-new-user '/orgs/acme/members' '{`
`77`	`77`	`"members": [`
`78`	`78`	`{ "subject": "newuser",`
`79`		`- "roles": "org_maintainer"`
	`79`	`+ "role": "org_maintainer"`
`80`	`80`	`}`
`81`	`81`	`]`
`82`	`82`	`}'`
`@@ -85,7 +85,7 @@ fetch "$transcripts_user" POST org-add-members-new-user '/orgs/acme/members' '{`
`85`	`85`	`fetch "$transcripts_user" POST org-cant-have-org-members '/orgs/acme/members' '{`
`86`	`86`	`"members": [`
`87`	`87`	`{ "subject": "unison",`
`88`		`- "roles": "org_maintainer"`
	`88`	`+ "role": "org_maintainer"`
`89`	`89`	`}`
`90`	`90`	`]`
`91`	`91`	`}'`