osso 0.0.8 → 0.1.2

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

@@ -18,7 +18,10 @@ module Osso
         def resolve(**args)
           customer = enterprise_account(**args)
 
-          return response_data(enterprise_account: nil) if customer.destroy
+          if customer.destroy
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: args)
+            return response_data(enterprise_account: nil)
+          end
 
           response_error(customer.errors)
         end

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

@@ -14,7 +14,10 @@ module Osso
         def resolve(id:)
           identity_provider = Osso::Models::IdentityProvider.find(id)
 
-          return response_data(identity_provider: nil) if identity_provider.destroy
+          if identity_provider.destroy
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: { id: id })
+            return response_data(identity_provider: nil)
+          end
 
           response_error(identity_provider.errors)
         end

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

@@ -14,7 +14,10 @@ module Osso
         def resolve(id:)
           oauth_client = Osso::Models::OauthClient.find(id)
 
-          return response_data(oauth_client: nil) if oauth_client.destroy
+          if oauth_client.destroy
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: { id: id })
+            return response_data(oauth_client: nil)
+          end
 
           response_error(oauth_client.errors)
         end

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

@@ -23,6 +23,12 @@ module Osso
           if admin_user.save
             verify_user(email)
 
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: {
+              invited_email: email,
+              invited_role: role,
+              invited_oauth_client_id: oauth_client_id,
+            })
+
             return response_data(admin_user: admin_user)
           end
 

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

@@ -15,7 +15,16 @@ module Osso
           oauth_client = Osso::Models::OauthClient.find(id)
           oauth_client.regenerate_secrets!
 
-          return response_data(oauth_client: oauth_client) if oauth_client.save
+          if oauth_client.save
+            Osso::Analytics.capture(
+              email: context[:email],
+              event: self.class.name.demodulize,
+              properties: { 
+                oauth_client_id: id 
+              }
+            )
+            return response_data(oauth_client: oauth_client)
+          end
 
           response_error(oauth_client.errors)
         end

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

@@ -18,6 +18,8 @@ module Osso
           update_existing(oauth_client, redirect_uris)
           create_new(oauth_client, redirect_uris)
 
+          Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: redirect_uris)
+
           response_data(oauth_client: oauth_client.reload)
         rescue StandardError => e
           response_error(e)

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

@@ -15,7 +15,10 @@ module Osso
 
         def resolve(**args)
           app_config = Osso::Models::AppConfig.find
-          return response_data(app_config: app_config) if app_config.update(**args)
+          if app_config.update(**args)
+            Osso::Analytics.capture(email: context[:email], event: self.class.name.demodulize, properties: args)
+            return response_data(app_config: app_config)
+          end
 
           response_error(app_config.errors)
         end

data/lib/osso/graphql/query.rb

@@ -16,44 +16,39 @@ module Osso
 
         field :oauth_clients, null: true, resolver: Resolvers::OAuthClients
 
-        field(
-          :identity_provider,
-          Types::IdentityProvider,
-          null: true,
-          resolve: ->(_obj, args, _context) { Osso::Models::IdentityProvider.find(args[:id]) },
-        ) do
+        field :admin_users, [Types::AdminUser], null: false
+
+        field :app_config, Types::AppConfig, null: false
+
+        field :current_user, Types::AdminUser, null: false
+
+        field :identity_provider, Types::IdentityProvider, null: true do
           argument :id, ID, required: true
         end
 
-        field(
-          :app_config,
-          Types::AppConfig,
-          null: false,
-          resolve: ->(_obj, _args, _context) { Osso::Models::AppConfig.find },
-        )
-
-        field(
-          :oauth_client,
-          Types::OauthClient,
-          null: true,
-          resolve: ->(_obj, args, _context) { Osso::Models::OauthClient.find(args[:id]) },
-        ) do
+        field :oauth_client, Types::OauthClient, null: true do
           argument :id, ID, required: true
         end
 
-        field(
-          :admin_users,
-          [Types::AdminUser],
-          null: false,
-          resolve: ->(_obj, _args, _context) { Osso::Models::Account.all },
-        )
+        def admin_users
+          Osso::Models::Account.all
+        end
+
+        def app_config
+          Osso::Models::AppConfig.find
+        end
+
+        def current_user
+          context.to_h
+        end
 
-        field(
-          :current_user,
-          Types::AdminUser,
-          null: false,
-          resolve: ->(_obj, _args, context) { context.to_h },
-        )
+        def identity_provider(id:)
+          Osso::Models::IdentityProvider.find(id)
+        end
+
+        def oauth_client(id:)
+          Osso::Models::OauthClient.find(id)
+        end
       end
     end
   end

data/lib/osso/graphql/schema.rb

@@ -14,7 +14,6 @@ GraphQL::Relay::BaseConnection.register_connection_implementation(
 module Osso
   module GraphQL
     class Schema < ::GraphQL::Schema
-      use ::GraphQL::Pagination::Connections
       query Types::QueryType
       mutation Types::MutationType
 

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

@@ -8,6 +8,7 @@ module Osso
         value('GOOGLE', 'Google SAML Identity Provider', value: 'GOOGLE')
         value('OKTA', 'Okta Identity Provider', value: 'OKTA')
         value('ONELOGIN', 'OneLogin Identity Provider', value: 'ONELOGIN')
+        value('OTHER', 'Generic SAML Identity Provider', value: 'OTHER')
         value('PING', 'PingID Identity Provider', value: 'PING')
         value('SALESFORCE', 'Salesforce Identity Provider', value: 'SALESFORCE')
       end

data/lib/osso/lib/analytics.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require 'posthog-ruby'
+
+module Osso
+  # Osso::Analytics provides an interface to track product analytics for any provider.
+  # Osso recommends PostHog as an open source solution for your product analytics needs.
+  # If you want to use another product analytics provider, you can patch the Osso::Analytics
+  # class yourself in your parent application. Be sure to implement the public
+  # .identify and .capture class methods with the required method signatures and require
+  # your class after requiring Osso.
+  class Analytics
+    class << self
+      def identify(email:, properties: {})
+        return unless configured?
+
+        client.identify({
+          distinct_id: email,
+          properties: properties.merge(instance_properties),
+        })
+      end
+
+      def capture(email:, event:, properties: {})
+        return unless configured?
+
+        client.capture(
+          distinct_id: email,
+          event: event,
+          properties: properties.merge(instance_properties),
+        )
+      end
+
+      private
+
+      def configured?
+        ENV['POSTHOG_API_KEY'].present?
+      end
+
+      def client
+        @client ||= PostHog::Client.new({
+          api_key: ENV['POSTHOG_API_KEY'],
+          api_host: ENV['POSTHOG_HOST'],
+          on_error: proc { |_status, msg| print msg },
+        })
+      end
+
+      def instance_properties
+        {
+          instance_url: ENV['BASE_URL'],
+          osso_plan: ENV['OSSO_PLAN'],
+        }
+      end
+    end
+  end
+end

data/lib/osso/lib/route_map.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'rack/protection'
+
 module Osso
   module RouteMap
     def self.included(klass)

data/lib/osso/models/account.rb

@@ -3,7 +3,7 @@
 module Osso
   module Models
     class Account < ::ActiveRecord::Base
-      enum status_id: { 1 => :Unverified, 2 => :Verified, 3 => :Closed }
+      enum status_id: { Unverified: 1, Verified: 2, Closed: 3 }
 
       def context
         {

data/lib/osso/models/identity_provider.rb

@@ -18,7 +18,7 @@ module Osso
 
       ENTITY_ID_URI_REQUIRED = [
         'PING',
-      ]
+      ].freeze
 
       def name
         service.titlecase
@@ -30,7 +30,7 @@ module Osso
           idp_sso_target_url: sso_url,
           idp_cert: sso_cert,
           issuer: sso_issuer,
-          name_identifier_format: "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress"
+          name_identifier_format: 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
         }
       end
 
@@ -56,7 +56,7 @@ module Osso
 
       def set_sso_issuer
         parts = [domain, oauth_client_id]
-        
+
         parts.unshift('https:/') if ENTITY_ID_URI_REQUIRED.any?(service)
 
         self.sso_issuer = parts.join('/')

data/lib/osso/routes/admin.rb

@@ -10,16 +10,46 @@ module Osso
     DB = Sequel.postgres(extensions: :activerecord_connection)
     use Rack::Session::Cookie, secret: ENV.fetch('SESSION_SECRET')
 
+    plugin :json
+    plugin :json_parser
     plugin :middleware
     plugin :render, engine: 'erb', views: ENV['RODAUTH_VIEWS'] || DEFAULT_VIEWS_DIR
     plugin :route_csrf
 
     plugin :rodauth do
-      enable :login, :verify_account
+      enable :login, :verify_account, :jwt
+
+      base_uri = URI.parse(ENV.fetch('BASE_URL'))
+      base_url base_uri
+      domain base_uri.host
+
+      jwt_secret ENV.fetch('SESSION_SECRET')
+      only_json? false
+
+      email_from { "Osso <no-reply@#{domain}>" }
       verify_account_set_password? true
-      already_logged_in { redirect login_redirect }
       use_database_authentication_functions? false
 
+      after_login do
+        Osso::Analytics.identify(email: account[:email], properties: account)
+      end
+
+      verify_account_view do
+        render :admin
+      end
+
+      login_view do
+        render :admin
+      end
+
+      verify_account_email_subject do
+        DB[:accounts].one? ? 'Your Osso instance is ready' : 'You\'ve been invited to start using Osso'
+      end
+
+      verify_account_email_body do
+        DB[:accounts].one? ? render('verify-first-account-email') : render('verify-account-email')
+      end
+
       before_create_account_route do
         request.halt unless DB[:accounts].empty?
       end
@@ -31,16 +61,28 @@ module Osso
       r.rodauth
 
       def current_account
-        Osso::Models::Account.find(rodauth.session['account_id']).
-          context.
+        Osso::Models::Account.find(
+          rodauth.
+          session.
+          to_hash.
+          stringify_keys['account_id'],
+        ).context.
           merge({ rodauth: rodauth })
       end
 
       r.on 'admin' do
-        rodauth.require_authentication
         erb :admin, layout: false
       end
 
+      r.post 'idp' do
+        onboarded = Osso::Models::IdentityProvider.
+          not_pending.
+          where(domain: r.params['domain']).
+          exists?
+
+        { onboarded: onboarded }.to_json
+      end
+
       r.post 'graphql' do
         rodauth.require_authentication
 

data/lib/osso/routes/auth.rb

@@ -14,6 +14,8 @@ module Osso
       /[0-9a-f]{8}-[0-9a-f]{3,4}-[0-9a-f]{4}-[0-9a-f]{3,4}-[0-9a-f]{12}/.
         freeze
 
+    use Rack::Protection, allow_if: ->(env) { Rack::Request.new(env)&.path&.end_with?('callback') }
+
     use OmniAuth::Builder do
       OmniAuth::MultiProvider.register(
         self,

data/lib/osso/routes/oauth.rb

@@ -22,7 +22,7 @@ module Osso
 
         @providers = find_providers
 
-        redirect "/auth/saml/#{@providers.first.id}" if @providers.one?
+        return erb :saml_login_form if @providers.one?
 
         return erb :multiple_providers if @providers.count > 1
 

data/lib/osso/version.rb

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

data/lib/tasks/bootstrap.rake

@@ -8,9 +8,11 @@ namespace :osso do
   desc 'Bootstrap Osso data for a deployment'
   task :bootstrap do
     %w[Production Staging Development].each do |environment|
+      next if Osso::Models::OauthClient.find_by_name(environment)
+
       Osso::Models::OauthClient.create!(
         name: environment,
-      ) unless Osso::Models::OauthClient.find_by_name(environment)
+      )
     end
 
     Osso::Models::AppConfig.create
@@ -18,7 +20,7 @@ namespace :osso do
     admin_email = ENV['ADMIN_EMAIL']
 
     if admin_email
-      admin = Osso::Models::Account.create(
+      Osso::Models::Account.create(
         email: admin_email,
         status_id: 1,
         role: 'admin',
@@ -29,10 +31,10 @@ namespace :osso do
       rodauth = Osso::Admin.rodauth.new(Osso::Admin.new({
         'HTTP_HOST' => base_uri.host,
         'SERVER_NAME' => base_uri.to_s,
-        'rack.url_scheme' => base_uri.scheme
+        'rack.url_scheme' => base_uri.scheme,
       }))
 
-      account = rodauth.account_from_login(admin_email)
+      rodauth.account_from_login(admin_email)
       rodauth.setup_account_verification
     end
   end

data/osso-rb.gemspec

@@ -22,15 +22,17 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'mail', '~> 2.7.1'
   spec.add_runtime_dependency 'omniauth-multi-provider'
   spec.add_runtime_dependency 'omniauth-saml'
+  spec.add_runtime_dependency 'posthog-ruby'
   spec.add_runtime_dependency 'rack', '>= 2.1.4'
   spec.add_runtime_dependency 'rack-contrib'
   spec.add_runtime_dependency 'rack-oauth2'
+  spec.add_runtime_dependency 'rack-protection', '~> 2.1.0'
   spec.add_runtime_dependency 'rake'
-  spec.add_runtime_dependency 'rodauth', '~> 2.6.0'
-  spec.add_runtime_dependency 'sequel', '>= 5.37', '< 5.40'
+  spec.add_runtime_dependency 'rodauth', '~> 2.9'
+  spec.add_runtime_dependency 'sequel', '~> 5.40'
   spec.add_runtime_dependency 'sequel-activerecord_connection', '>= 0.3', '< 2.0'
   spec.add_runtime_dependency 'sinatra'
-  spec.add_runtime_dependency 'sinatra-activerecord'
+  spec.add_runtime_dependency 'sinatra-activerecord', '>= 2.0.22'
   spec.add_runtime_dependency 'sinatra-contrib'
 
   spec.add_development_dependency 'annotate', '~> 3.1'