osso 0.0.3.12 → 0.0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ad3a661abfa7e2251cf7244221ad6e28899c490b732e6c9098f5bf91c903c4e
-  data.tar.gz: 3a691f8537a801d2b7302ac3f34e5ea5b74aae9a60fea18470ac50ec5569ec96
+  metadata.gz: 4f73668d92fba6a919487f77d474b948af28e79b33d60a1c1e2cec8104b0dcff
+  data.tar.gz: f736cdc806facf653635a037f8b9abb8202cda2e811b3b75a2dc52332b12ddab
 SHA512:
-  metadata.gz: 35d25337aff8ad4fd8b6d49d34e20226f61725c8a437da30f70cb393a9078b988a4d10847911d0da10ba34f4940488c059829448c006723a5bafc6187a8c5576
-  data.tar.gz: 8011819d4ac2c59f0b8fc37470cfd9b2357f9bfeda12e6e4ea1f07c691beba99c2d409b8a2356eb7917edd02c7ae7beaf72860fa70bd3bf31ea5fc4eb6aded79
+  metadata.gz: 3ea4d47b42b9d2e0ac48833e37ed3375d41d60eefac31166ba81dd86ae3b38f059518beeae625324af095f9c4da4433c83aefd92cb7038cc5e924293e26956e4
+  data.tar.gz: 36969b24b9047a0ab3920e206590697083a314618765dbe7352a5563b4bd93aaca7b50524f442eb994052db594393500a4a157a527d483049f49765367495b39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    osso (0.0.3.12)
+    osso (0.0.3.13)
       activesupport (>= 6.0.3.2)
       graphql
       jwt

data/lib/osso/graphql/mutation.rb

@@ -14,7 +14,7 @@ module Osso
         field :delete_enterprise_account, mutation: Mutations::DeleteEnterpriseAccount
         field :delete_oauth_client, mutation: Mutations::DeleteOauthClient
         field :delete_redirect_uri, mutation: Mutations::DeleteRedirectUri
-        field :mark_redirect_uri_primary, mutation: Mutations::MarkRedirectUriPrimary
+        field :set_redirect_uris, mutation: Mutations::SetRedirectUris
         field :regenerate_oauth_credentials, mutation: Mutations::RegenerateOauthCredentials
       end
     end

data/lib/osso/graphql/mutations.rb

@@ -6,13 +6,11 @@ module Osso
 end
 
 require_relative 'mutations/base_mutation'
-require_relative 'mutations/add_redirect_uris_to_oauth_client'
 require_relative 'mutations/configure_identity_provider'
 require_relative 'mutations/create_identity_provider'
 require_relative 'mutations/create_enterprise_account'
 require_relative 'mutations/create_oauth_client'
 require_relative 'mutations/delete_enterprise_account'
 require_relative 'mutations/delete_oauth_client'
-require_relative 'mutations/delete_redirect_uri'
-require_relative 'mutations/mark_redirect_uri_primary'
 require_relative 'mutations/regenerate_oauth_credentials'
+require_relative 'mutations/set_redirect_uris'

data/lib/osso/graphql/mutations/regenerate_oauth_credentials.rb

@@ -14,9 +14,9 @@ module Osso
         def resolve(id:)
           oauth_client = Osso::Models::OauthClient.find(id)
           oauth_client.generate_secrets
-          
+
           return response_data(oauth_client: oauth_client) if oauth_client.save
-        
+
           response_error(errors: oauth_client.errors.full_messages)
         end
 

data/lib/osso/graphql/mutations/set_redirect_uris.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Mutations
+      class SetRedirectUris < BaseMutation
+        null false
+
+        argument :id, ID, required: true
+        argument :redirect_uris, [Types::RedirectUrisInput], required: true
+
+        field :oauth_client, Types::OauthClient, null: true
+        field :errors, [String], null: false
+
+        def resolve(id:, redirect_uris:)
+          oauth_client = Osso::Models::OauthClient.find(id)
+
+          update_existing(oauth_client, redirect_uris)
+          create_new(oauth_client, redirect_uris)
+
+          response_data(oauth_client: oauth_client.reload)
+        rescue StandardError => e
+          response_error(errors: e)
+        end
+
+        def ready?(*)
+          return true if context[:scope] == :admin
+
+          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
+        end
+
+        def update_existing(oauth_client, redirect_uris)
+          oauth_client.redirect_uris.each do |redirect|
+            updating_index = redirect_uris.index{ |incoming| incoming[:id] == redirect.id }
+
+            if updating_index
+              updating = redirect_uris.delete_at(updating_index)
+              redirect.update(updating.to_h)
+              next
+            end
+
+            redirect.destroy
+          end
+        end
+
+        def create_new(oauth_client, redirect_uris)
+          redirect_uris.map do |uri|
+            oauth_client.redirect_uris.create(uri.to_h.without(:id))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/osso/graphql/types.rb

@@ -14,5 +14,6 @@ require_relative 'types/identity_provider_status'
 require_relative 'types/identity_provider'
 require_relative 'types/enterprise_account'
 require_relative 'types/redirect_uri'
+require_relative 'types/redirect_uri_input'
 require_relative 'types/oauth_client'
 require_relative 'types/user'

data/lib/osso/graphql/types/redirect_uri_input.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'graphql'
+
+module Osso
+  module GraphQL
+    module Types
+      class RedirectUrisInput < Types::BaseInputObject
+        description 'Attributes for creating or updating a collection of redirect URIs for an Oauth Client'
+        argument :id, ID, 'Database ID', required: false
+        argument :uri, String, 'URI value', required: true
+        argument :primary, Boolean, 'Whether the URI is the primary uri used in IDP initiated login', required: true
+      end
+    end
+  end
+end

data/lib/osso/models/oauth_client.rb

@@ -17,6 +17,10 @@ module Osso
         redirect_uris.find(&:primary)
       end
 
+      def redirect_uri_values
+        redirect_uris.map(&:uri)
+      end
+
       def generate_secrets
         self.identifier = SecureRandom.hex(16)
         self.secret = SecureRandom.hex(32)

data/lib/osso/routes/auth.rb

@@ -40,7 +40,7 @@ module Osso
       post '/saml/:id/callback' do
         provider = Models::IdentityProvider.find(params[:id])
         oauth_client = provider.oauth_client
-        redirect_uri = env['redirect_uri'] || oauth_client.default_redirect_uri.uri
+        redirect_uri = env['redirect_uri'] || oauth_client.primary_redirect_uri.uri
 
         attributes = env['omniauth.auth']&.
           extra&.

data/lib/osso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Osso
-  VERSION = '0.0.3.12'
+  VERSION = '0.0.3.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: osso
 version: !ruby/object:Gem::Version
-  version: 0.0.3.12
+  version: 0.0.3.13
 platform: ruby
 authors:
 - Sam Bauch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -271,7 +271,6 @@ files:
 - lib/osso/graphql/.DS_Store
 - lib/osso/graphql/mutation.rb
 - lib/osso/graphql/mutations.rb
-- lib/osso/graphql/mutations/add_redirect_uris_to_oauth_client.rb
 - lib/osso/graphql/mutations/base_mutation.rb
 - lib/osso/graphql/mutations/configure_identity_provider.rb
 - lib/osso/graphql/mutations/create_enterprise_account.rb
@@ -279,9 +278,8 @@ files:
 - lib/osso/graphql/mutations/create_oauth_client.rb
 - lib/osso/graphql/mutations/delete_enterprise_account.rb
 - lib/osso/graphql/mutations/delete_oauth_client.rb
-- lib/osso/graphql/mutations/delete_redirect_uri.rb
-- lib/osso/graphql/mutations/mark_redirect_uri_primary.rb
 - lib/osso/graphql/mutations/regenerate_oauth_credentials.rb
+- lib/osso/graphql/mutations/set_redirect_uris.rb
 - lib/osso/graphql/query.rb
 - lib/osso/graphql/resolvers.rb
 - lib/osso/graphql/resolvers/enterprise_account.rb
@@ -299,6 +297,7 @@ files:
 - lib/osso/graphql/types/identity_provider_status.rb
 - lib/osso/graphql/types/oauth_client.rb
 - lib/osso/graphql/types/redirect_uri.rb
+- lib/osso/graphql/types/redirect_uri_input.rb
 - lib/osso/graphql/types/user.rb
 - lib/osso/helpers/auth.rb
 - lib/osso/helpers/helpers.rb

data/lib/osso/graphql/mutations/add_redirect_uris_to_oauth_client.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Osso
-  module GraphQL
-    module Mutations
-      class AddRedirectUrisToOauthClient < BaseMutation
-        null false
-
-        argument :oauth_client_id, ID, required: true
-        argument :uris, [String], required: true
-
-        field :oauth_client, Types::OauthClient, null: true
-        field :errors, [String], null: false
-
-        def resolve(oauth_client_id:, uris:)
-          oauth_client = Osso::Models::OauthClient.find(oauth_client_id)
-
-          uris.each do |uri|
-            oauth_client.redirect_uris.create(uri: uri)
-          end
-
-          unless oauth_client.primary_redirect_uri
-            oauth_client.reload.redirect_uris.first.update(primary: true)
-          end
-
-          response_data(oauth_client: oauth_client.reload)
-        rescue StandardError => e
-          response_error(errors: e.message)
-        end
-
-        def ready?(*)
-          return true if context[:scope] == :admin
-
-          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
-        end
-      end
-    end
-  end
-end

data/lib/osso/graphql/mutations/delete_redirect_uri.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Osso
-  module GraphQL
-    module Mutations
-      class DeleteRedirectUri < BaseMutation
-        null false
-
-        argument :id, ID, required: true
-
-        field :oauth_client, Types::OauthClient, null: true
-        field :errors, [String], null: false
-
-        def resolve(id:)
-          redirect_uri = Osso::Models::RedirectUri.find(id)
-
-          oauth_client = redirect_uri.oauth_client
-
-          redirect_uri.destroy
-
-          if redirect_uri.primary
-            oauth_client.redirect_uris.first&.update(primary: true)
-          end
-
-          return response_data(oauth_client: oauth_client.reload) if redirect_uri.destroy
-
-          response_error(errors: redirect_uri.errors.full_messages)
-        end
-
-        def ready?(*)
-          return true if context[:scope] == :admin
-
-          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
-        end
-      end
-    end
-  end
-end

data/lib/osso/graphql/mutations/mark_redirect_uri_primary.rb

@@ -1,34 +0,0 @@
-# frozen_string_literal: true
-
-module Osso
-  module GraphQL
-    module Mutations
-      class MarkRedirectUriPrimary < BaseMutation
-        null false
-
-        argument :id, ID, required: true
-
-        field :oauth_client, Types::OauthClient, null: true
-        field :errors, [String], null: false
-
-        def resolve(id:)
-          redirect_uri = Osso::Models::RedirectUri.find(id)
-          oauth_client = redirect_uri.oauth_client
-
-          oauth_client.redirect_uris.update(primary: false)
-          redirect_uri.update(primary: true)
-
-          response_data(oauth_client: oauth_client.reload)
-        rescue StandardError => e
-          response_error(errors: e.message)
-        end
-
-        def ready?(*)
-          return true if context[:scope] == :admin
-
-          raise ::GraphQL::ExecutionError, 'Only admin users may mutate OauthClients'
-        end
-      end
-    end
-  end
-end