Sideload invites for service accounts/oidc providers (#1173)

pluralsh · Jul 21, 2023 · 9d7fee2 · 9d7fee2
1 parent 4f9d2d3
commit 9d7fee2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/apps/core/lib/core/schema/oidc_provider.ex b/apps/core/lib/core/schema/oidc_provider.ex
@@ -1,6 +1,6 @@
 defmodule Core.Schema.OIDCProvider do
   use Piazza.Ecto.Schema
-  alias Core.Schema.{Installation, OIDCProviderBinding}
+  alias Core.Schema.{Installation, OIDCProviderBinding, Invite}
 
   defenum AuthMethod, post: 0, basic: 1
 
@@ -15,6 +15,7 @@ defmodule Core.Schema.OIDCProvider do
 
     belongs_to :installation, Installation
 
+    has_many :invites, Invite, foreign_key: :oidc_provider_id
     has_many :bindings, OIDCProviderBinding,
       on_replace: :delete,
       foreign_key: :provider_id

diff --git a/apps/core/lib/core/schema/user.ex b/apps/core/lib/core/schema/user.ex
@@ -12,7 +12,8 @@ defmodule Core.Schema.User do
     ImpersonationPolicy,
     GroupMember,
     Role,
-    DemoProject
+    DemoProject,
+    Invite
   }
 
   @email_re ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9-\.]+\.[a-zA-Z]{2,}$/
@@ -78,6 +79,7 @@ defmodule Core.Schema.User do
     has_one :impersonation_policy, ImpersonationPolicy, on_replace: :delete
     has_one :demo_project, DemoProject
 
+    has_many :invites, Invite, foreign_key: :service_account_id
     has_many :webhooks,  Webhook
     has_many :role_bindings, RoleBinding
     many_to_many :groups, Group, join_through: "group_members"

diff --git a/apps/graphql/lib/graphql/resolvers/account.ex b/apps/graphql/lib/graphql/resolvers/account.ex
@@ -8,6 +8,7 @@ defmodule GraphQl.Resolvers.Account do
   def query(Role, _), do: Role
   def query(RoleBinding, _), do: RoleBinding
   def query(GroupMember, _), do: GroupMember
+  def query(Invite, _), do: Invite
   def query(IntegrationWebhook, _), do: IntegrationWebhook
   def query(WebhookLog, _), do: WebhookLog
   def query(DomainMapping, _), do: DomainMapping

diff --git a/apps/graphql/lib/graphql/schema/repository.ex b/apps/graphql/lib/graphql/schema/repository.ex
@@ -282,6 +282,7 @@ defmodule GraphQl.Schema.Repository do
 
     field :consent,  :consent_request
 
+    field :invites,  list_of(:invite), resolve: dataloader(Account)
     field :bindings, list_of(:oidc_provider_binding), resolve: dataloader(Repository)
 
     timestamps()

diff --git a/apps/graphql/lib/graphql/schema/user.ex b/apps/graphql/lib/graphql/schema/user.ex
@@ -113,6 +113,7 @@ defmodule GraphQl.Schema.User do
     field :publisher,            :publisher, resolve: dataloader(User)
     field :account,              non_null(:account), resolve: dataloader(Account)
     field :impersonation_policy, :impersonation_policy, resolve: dataloader(User)
+    field :invites, list_of(:invite), resolve: dataloader(Account)
 
     field :jwt, :string, resolve: fn
       %{jwt: jwt}, _, _ when is_binary(jwt) -> {:ok, jwt}