osso 0.0.3.8 → 0.0.3.13

data/lib/osso/graphql/resolvers/enterprise_accounts.rb

@@ -4,12 +4,20 @@ module Osso
   module GraphQL
     module Resolvers
       class EnterpriseAccounts < ::GraphQL::Schema::Resolver
-        type [Types::EnterpriseAccount], null: true
+        type Types::EnterpriseAccount.connection_type, null: true
 
-        def resolve
-          return Osso::Models::EnterpriseAccount.all if context[:scope] == :admin
+        def resolve(sort_column: nil, sort_order: nil)
+          return Array(Osso::Models::EnterpriseAccount.find_by(domain: context[:scope])) if context[:scope] != :admin
 
-          Array(Osso::Models::EnterpriseAccount.find_by(domain: context[:scope]))
+          accounts = Osso::Models::EnterpriseAccount
+
+          accounts = accounts.order(sort_column => sort_order_sym(sort_order)) if sort_column && sort_order
+
+          accounts.all
+        end
+
+        def sort_order_sym(order_string)
+          order_string == 'ascend' ? :asc : :desc
         end
       end
     end

data/lib/osso/graphql/resolvers/oauth_clients.rb

@@ -4,7 +4,7 @@ module Osso
   module GraphQL
     module Resolvers
       class OAuthClients < ::GraphQL::Schema::Resolver
-        type [Types::OAuthClient], null: true
+        type [Types::OauthClient], null: true
 
         def resolve
           return Osso::Models::OauthClient.all if context[:scope] == :admin

data/lib/osso/graphql/types.rb

@@ -5,6 +5,7 @@ module Osso
   end
 end
 
+require_relative 'types/base_connection'
 require_relative 'types/base_object'
 require_relative 'types/base_enum'
 require_relative 'types/base_input_object'
@@ -12,5 +13,7 @@ require_relative 'types/identity_provider_service'
 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/base_connection.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Osso
+  module GraphQL
+    module Types
+      class BaseConnection < ::GraphQL::Types::Relay::BaseConnection
+        field :total_count, Integer, null: false
+
+        def total_count
+          object.items&.count
+        end
+      end
+    end
+  end
+end

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

@@ -6,6 +6,10 @@ module Osso
   module GraphQL
     module Types
       class BaseObject < ::GraphQL::Schema::Object
+        connection_type_class GraphQL::Types::BaseConnection
+
+        field :created_at, ::GraphQL::Types::ISO8601DateTime, null: false
+        field :updated_at, ::GraphQL::Types::ISO8601DateTime, null: false
       end
     end
   end

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

@@ -5,7 +5,7 @@ require 'graphql'
 module Osso
   module GraphQL
     module Types
-      class OAuthClient < Types::BaseObject
+      class OauthClient < Types::BaseObject
         description 'An OAuth client used to consume Osso SAML users'
         implements ::GraphQL::Types::Relay::Node
 
@@ -14,6 +14,19 @@ module Osso
         field :name, String, null: false
         field :client_id, String, null: false
         field :client_secret, String, null: false
+        field :redirect_uris, [Types::RedirectUri], null: true
+
+        def client_id
+          object.identifier
+        end
+
+        def client_secret
+          object.secret
+        end
+
+        def self.authorized?(object, context)
+          super && context[:scope] == :admin
+        end
       end
     end
   end

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'graphql'
+
+module Osso
+  module GraphQL
+    module Types
+      class RedirectUri < Types::BaseObject
+        description 'An allowed redirect URI for an OauthClient'
+        implements ::GraphQL::Types::Relay::Node
+
+        global_id_field :gid
+        field :id, ID, null: false
+        field :uri, String, null: false
+        field :primary, Boolean, null: false
+
+        def self.authorized?(object, context)
+          super && context[:scope] == :admin
+        end
+      end
+    end
+  end
+end

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/helpers/auth.rb

@@ -14,13 +14,10 @@ module Osso
         redirect ENV['JWT_URL']
       end
 
+      # use client id in payload to restrict customer
+      # users from accessing dev?
       def enterprise_authorized?(_domain)
-        payload, _args = JWT.decode(
-          token,
-          ENV['JWT_HMAC_SECRET'],
-          true,
-          { algorithm: 'HS256' },
-        )
+        payload, _args = decode(token)
 
         @current_scope = payload['scope']
 
@@ -36,12 +33,7 @@ module Osso
       end
 
       def admin_authorized?
-        payload, _args = JWT.decode(
-          token,
-          ENV['JWT_HMAC_SECRET'],
-          true,
-          { algorithm: 'HS256' },
-        )
+        payload, _args = decode(token)
 
         if payload['scope'] == 'admin'
           @current_scope = :admin
@@ -66,6 +58,15 @@ module Osso
 
         redirect request.path
       end
+
+      def decode(token)
+        JWT.decode(
+          token,
+          ENV['JWT_HMAC_SECRET'],
+          true,
+          { algorithm: 'HS256' },
+        )
+      end
     end
   end
 end

data/lib/osso/models/access_token.rb

@@ -27,3 +27,21 @@ module Osso
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: access_tokens
+#
+#  id              :uuid             not null, primary key
+#  token           :string
+#  expires_at      :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  user_id         :uuid
+#  oauth_client_id :uuid
+#
+# Indexes
+#
+#  index_access_tokens_on_oauth_client_id  (oauth_client_id)
+#  index_access_tokens_on_user_id          (user_id)
+#

data/lib/osso/models/authorization_code.rb

@@ -12,3 +12,23 @@ module Osso
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: authorization_codes
+#
+#  id              :uuid             not null, primary key
+#  token           :string
+#  redirect_uri    :string
+#  expires_at      :datetime
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#  user_id         :uuid
+#  oauth_client_id :uuid
+#
+# Indexes
+#
+#  index_authorization_codes_on_oauth_client_id  (oauth_client_id)
+#  index_authorization_codes_on_token            (token) UNIQUE
+#  index_authorization_codes_on_user_id          (user_id)
+#

data/lib/osso/models/enterprise_account.rb

@@ -26,3 +26,23 @@ module Osso
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: enterprise_accounts
+#
+#  id              :uuid             not null, primary key
+#  domain          :string           not null
+#  external_uuid   :uuid
+#  external_int_id :integer
+#  external_id     :string
+#  oauth_client_id :uuid
+#  name            :string           not null
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+# Indexes
+#
+#  index_enterprise_accounts_on_domain           (domain) UNIQUE
+#  index_enterprise_accounts_on_oauth_client_id  (oauth_client_id)
+#

data/lib/osso/models/identity_provider.rb

@@ -10,7 +10,6 @@ module Osso
       has_many :users
       before_save :set_status
 
-
       def name
         service.titlecase
         # raise(
@@ -54,3 +53,25 @@ module Osso
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: identity_providers
+#
+#  id                    :uuid             not null, primary key
+#  service               :string
+#  domain                :string           not null
+#  sso_url               :string
+#  sso_cert              :text
+#  enterprise_account_id :uuid
+#  oauth_client_id       :uuid
+#  status                :enum             default("PENDING")
+#  created_at            :datetime
+#  updated_at            :datetime
+#
+# Indexes
+#
+#  index_identity_providers_on_domain                 (domain)
+#  index_identity_providers_on_enterprise_account_id  (enterprise_account_id)
+#  index_identity_providers_on_oauth_client_id        (oauth_client_id)
+#

data/lib/osso/models/models.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# -*- SkipSchemaAnnotations
+
 require 'sinatra/activerecord'
 
 module Osso

data/lib/osso/models/oauth_client.rb

@@ -9,11 +9,11 @@ module Osso
       has_many :identity_providers
       has_many :redirect_uris
 
-      before_validation :setup, on: :create
+      before_validation :generate_secrets, on: :create
       validates :name, :secret, presence: true
       validates :identifier, presence: true, uniqueness: true
 
-      def default_redirect_uri
+      def primary_redirect_uri
         redirect_uris.find(&:primary)
       end
 
@@ -21,12 +21,26 @@ module Osso
         redirect_uris.map(&:uri)
       end
 
-      private
-
-      def setup
+      def generate_secrets
         self.identifier = SecureRandom.hex(16)
-        self.secret = SecureRandom.hex(64)
+        self.secret = SecureRandom.hex(32)
       end
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: oauth_clients
+#
+#  id         :uuid             not null, primary key
+#  name       :string           not null
+#  secret     :string           not null
+#  identifier :string           not null
+#  created_at :datetime         not null
+#  updated_at :datetime         not null
+#
+# Indexes
+#
+#  index_oauth_clients_on_identifier  (identifier) UNIQUE
+#

data/lib/osso/models/redirect_uri.rb

@@ -18,3 +18,20 @@ module Osso
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: redirect_uris
+#
+#  id              :uuid             not null, primary key
+#  uri             :string           not null
+#  primary         :boolean          default(FALSE), not null
+#  oauth_client_id :uuid
+#  created_at      :datetime         not null
+#  updated_at      :datetime         not null
+#
+# Indexes
+#
+#  index_redirect_uris_on_oauth_client_id  (oauth_client_id)
+#  index_redirect_uris_on_uri_and_primary  (uri,primary) UNIQUE
+#

data/lib/osso/models/user.rb

@@ -22,3 +22,25 @@ module Osso
     end
   end
 end
+
+# == Schema Information
+#
+# Table name: users
+#
+#  id                    :uuid             not null, primary key
+#  email                 :string           not null
+#  idp_id                :string           not null
+#  identity_provider_id  :uuid
+#  enterprise_account_id :uuid
+#  created_at            :datetime         not null
+#  updated_at            :datetime         not null
+#
+# Indexes
+#
+#  index_users_on_email_and_idp_id       (email,idp_id) UNIQUE
+#  index_users_on_enterprise_account_id  (enterprise_account_id)
+#
+# Foreign Keys
+#
+#  fk_rails_...  (identity_provider_id => identity_providers.id)
+#

data/lib/osso/routes/admin.rb

@@ -36,6 +36,12 @@ module Osso
 
         erb :admin
       end
+
+      get '/config/:id' do
+        admin_protected!
+
+        erb :admin
+      end
     end
   end
 end

data/lib/osso/routes/auth.rb

@@ -23,7 +23,7 @@ module Osso
         self,
         provider_name: 'saml',
         identity_provider_id_regex: UUID_REGEXP,
-        path_prefix: '/saml',
+        path_prefix: '/auth/saml',
         callback_suffix: 'callback',
       ) do |identity_provider_id, _env|
         provider = Models::IdentityProvider.find(identity_provider_id)
@@ -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.8'
+  VERSION = '0.0.3.13'
 end