osso 0.0.5.pre.zeta → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb48ae64d0aa5fb579751215755503e9140506ba9b75b87436fa824d7a2a18f6
-  data.tar.gz: e9a47f808971ce6e6e36d0f189643fb970e82656507a3de474968e3368e16c29
+  metadata.gz: e32f4645ca2763467c9558a6bf103cc5695de99b191e0e2a763e9d1be189e984
+  data.tar.gz: ca9c4d902553eee5132fc41c98a458441b20c6aa645bc8a33b48601c80e83392
 SHA512:
-  metadata.gz: 49c911667a8eacb8b90958988dd7a8c6625b8d219e6ed24612ac9a6aa5bfe6ee975f8bf0813588379a769d0314d69ee358d3d572a1f6b80ba823dd79b6505047
-  data.tar.gz: 03bb1c60447df03e088a40e6fbdcabeb14625ec3cd5c8944929cf0626b1e2000a057eb4daa7db77a1a0c4e79fb02c2f3efed61d4be64255a03e3d22b19dfebbe
+  metadata.gz: 1c58936f2fa400fb36955405512522bb1fb25ca3c6d8c3436b157d7d915e4db662070b93e1f6f6c7cb523d6f90043426b7bb8b6320967e09aac3be536587c840
+  data.tar.gz: '0359da56b5e70537d496a770d6f4e90a1ec248bc786e48b7a7f13dd3860729cb5d1a76de43a9666a486ad4727f3c032c22bdf0a4c0257ee3416d5d41164295c3'

data/.buildkite/pipeline.yml

@@ -2,8 +2,10 @@ steps:
   - name: ":rspec:"
     commands: 
       - bundle install
-      - bundle exec rake db:drop
-      - bundle exec rake db:create
+      - dropdb ossorb-development --if-exists
+      - dropdb ossorb-test --if-exists
+      - createdb ossorb-development
+      - createdb ossorb-test
       - RACK_ENV=test bundle exec rake db:migrate
       - bundle exec rspec
     artifact_paths:
@@ -17,8 +19,8 @@ steps:
           prefix: '/var/lib/buildkite-agent/builds/enterprise-oss-bk-1/enterpriseoss/osso-rb/'
   
   - block: ":rubygems: Publish :red_button:"
-    branches: "main"
+    if: build.tag != null
   
   - name: "Push :rubygems:"
     commands: "./bin/publish"
-    branches: "main"
+    if: build.tag != null

data/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  labels:
+    - "dependencies"

data/.github/workflows/automerge.yml

@@ -0,0 +1,19 @@
+name: auto-merge
+
+on:
+  pull_request:
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          target: minor
+          github-token: ${{ secrets.TOKEN }}
+      - uses: hmarr/auto-approve-action@v2.0.0
+        if: github.actor == 'dependabot[bot]'
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      

data/.rubocop.yml

@@ -79,4 +79,7 @@ Style/Documentation:
   Enabled: false
   Exclude:
     - 'spec/**/*'
-    - 'db/**.*'
+    - 'db/**.*'
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false

data/Gemfile

@@ -10,10 +10,10 @@ group :test do
   gem 'faker'
   gem 'pg'
   gem 'rack-test'
-  gem 'rspec', '~> 3.2'
+  gem 'rspec', '~> 3.10'
   gem 'rubocop'
   gem 'simplecov', '= 0.17', require: false
-  gem 'webmock', '~> 3.0'
+  gem 'webmock', '~> 3.10'
 end
 
 gemspec

data/Gemfile.lock

@@ -1,16 +1,21 @@
 PATH
   remote: .
   specs:
-    osso (0.0.5.pre.zeta)
+    osso (0.0.8)
       activesupport (>= 6.0.3.2)
+      bcrypt (~> 3.1.13)
       graphql
       jwt
+      mail (~> 2.7.1)
       omniauth-multi-provider
       omniauth-saml
       rack (>= 2.1.4)
       rack-contrib
       rack-oauth2
       rake
+      rodauth (~> 2.6.0)
+      sequel (>= 5.37, < 5.40)
+      sequel-activerecord_connection (>= 0.3, < 2.0)
       sinatra
       sinatra-activerecord
       sinatra-contrib
@@ -18,45 +23,47 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activerecord (6.0.3.2)
-      activemodel (= 6.0.3.2)
-      activesupport (= 6.0.3.2)
-    activesupport (6.0.3.2)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
+    after_commit_everywhere (0.1.5)
+      activerecord (>= 4.2)
     annotate (3.1.1)
       activerecord (>= 3.2, < 7.0)
       rake (>= 10.4, < 14.0)
     ast (2.4.1)
     attr_required (1.0.1)
+    bcrypt (3.1.16)
     bindata (2.4.8)
     coderay (1.1.3)
-    concurrent-ruby (1.1.6)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    concurrent-ruby (1.1.7)
+    crack (0.4.4)
     database_cleaner (1.8.5)
     database_cleaner-active_record (1.8.0)
       activerecord
       database_cleaner (~> 1.8.0)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    factory_bot (6.0.2)
+    factory_bot (6.1.0)
       activesupport (>= 5.0.0)
-    faker (2.13.0)
+    faker (2.15.1)
       i18n (>= 1.6, < 2)
-    graphql (1.11.4)
+    graphql (1.11.6)
     hashdiff (1.0.1)
     hashie (4.1.0)
     httpclient (2.8.3)
-    i18n (1.8.3)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
     json-jwt (1.13.0)
@@ -64,9 +71,12 @@ GEM
       aes_key_wrap
       bindata
     jwt (2.2.2)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
     method_source (1.0.0)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.1)
+    minitest (5.14.2)
     multi_json (1.15.0)
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
@@ -77,19 +87,19 @@ GEM
       rack (>= 1.6.2, < 3)
     omniauth-multi-provider (0.2.1)
       omniauth
-    omniauth-saml (1.10.2)
+    omniauth-saml (1.10.3)
       omniauth (~> 1.3, >= 1.3.2)
       ruby-saml (~> 1.9)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    parallel (1.20.1)
+    parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rack (2.2.3)
-    rack-contrib (2.2.0)
+    rack-contrib (2.3.0)
       rack (~> 2.0)
     rack-oauth2 (1.16.0)
       activesupport
@@ -103,37 +113,46 @@ GEM
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (13.0.1)
-    regexp_parser (1.7.1)
+    regexp_parser (2.0.0)
     rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    roda (3.38.0)
+      rack
+    rodauth (2.6.0)
+      roda (>= 2.6.0)
+      sequel (>= 4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.86.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.6.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
+    rubocop-ast (1.3.0)
+      parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
     ruby-saml (1.11.0)
       nokogiri (>= 1.5.10)
     ruby2_keywords (0.0.2)
-    safe_yaml (1.0.5)
+    sequel (5.39.0)
+    sequel-activerecord_connection (1.2.0)
+      activerecord (>= 4.2, < 7)
+      after_commit_everywhere (~> 0.1.5)
+      sequel (~> 5.16)
     simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -144,7 +163,7 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.1.0)
       tilt (~> 2.0)
-    sinatra-activerecord (2.0.18)
+    sinatra-activerecord (2.0.21)
       activerecord (>= 4.1)
       sinatra (>= 1.0)
     sinatra-contrib (2.1.0)
@@ -153,16 +172,15 @@ GEM
       rack-protection (= 2.1.0)
       sinatra (= 2.1.0)
       tilt (~> 2.0)
-    thread_safe (0.3.6)
     tilt (2.0.10)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
-    webmock (3.8.3)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.3.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -177,10 +195,10 @@ DEPENDENCIES
   pg
   pry
   rack-test
-  rspec (~> 3.2)
+  rspec (~> 3.10)
   rubocop
   simplecov (= 0.17)
-  webmock (~> 3.0)
+  webmock (~> 3.10)
 
 BUNDLED WITH
    2.1.4

data/LICENSE

@@ -2,33 +2,31 @@ Business Source License 1.1
 
 Parameters
 
-Licensor:             Samuel Bauch
+Licensor:             EnterpriseOSS, Inc.
 Licensed Work:        osso-rb
-                      The Licensed Work is (c) 2020 Samuel Bauch.
-Additional Use Grant: You may make use of the Licensed Work, provided that you do
-                      not use the Licensed Work in a Single Sign On Management
-                      Service.
-
-                      A "Single Sign On Management Service" is an offering
-                      (be it free or commercial) that uses the Licensed Work
-                      to allow third parties (other than your employees and 
-                      contractors) to access the functionality of the 
-                      Licensed Work such that any fourth parties directly 
-                      benefit from the authentication, configuration, or 
-                      documentation features of the Licensed Work.
-
-                      You thus may only use the Licensed Work in a manner 
-                      whereby parties who directly benefit from the 
-                      authentication, configuration, or documentation features 
-                      of the Licensed Work are yourself, your employees or 
-                      contractors, and your customers or partners.
-
-Change Date:          2023-05-01
+                      The Licensed Work is (c) 2020 EnterpriseOSS, Inc.
+
+Additional Use Grant: You and your Authorized Users may make use of the 
+                      Licensed Work for your internal business purposes, 
+                      provided that you do not (i) rent, lease, copy, transfer,
+                      resell, sublicense, lease, time-share, or otherwise provide 
+                      access to the Licensed Work to a third party (except 
+                      Authorized Users) or (ii) incorporate the Licensed Work 
+                      (or any portion of such) with, or use it with or to provide,
+                      any site, product, or service, other than on sites/applications 
+                      owned and operated by you.
+                      
+                      An “Authorized User” is defined as an individual person 
+                      (e.g. your employee, contractor, agent) who is registered and 
+                      permitted by you to use the Licensed Work subject to these 
+                      restrictions.
+
+Change Date:          2025-10-01
 
 Change License:       Apache License, Version 2.0
 
 For information about alternative licensing arrangements for the Software,
-contact: hello@enterprise-oss.dev
+contact: hello@enterpriseoss.dev
 
 Notice
 
@@ -108,4 +106,4 @@ other recipients of the licensed work to be provided by Licensor:
 
 3. To specify a Change Date.
 
-4. Not to modify this License in any other way.
+4. Not to modify this License in any other way.

data/Rakefile

@@ -4,6 +4,8 @@
 # to tell ActiveRecord where to find the database
 # schema and migrations
 
+ENV['SESSION_SECRET'] ||= 'rake-secret'
+
 require 'bundler/gem_tasks'
 require 'sinatra/activerecord/rake'
 require './lib/osso'

data/bin/annotate

@@ -1 +1,3 @@
-annotate --require osso.rb  --models --model-dir ./lib/osso/models/ --position bottom -k -i
+#!/bin/sh
+
+annotate --require osso.rb  --models --model-dir=./lib/osso/models/ --position bottom -k -i

data/db/schema.rb

@@ -10,9 +10,10 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_09_13_154919) do
+ActiveRecord::Schema.define(version: 2020_11_25_143501) do
 
   # These are extensions that must be enabled in order to support this database
+  enable_extension "citext"
   enable_extension "pgcrypto"
   enable_extension "plpgsql"
 
@@ -23,10 +24,44 @@ ActiveRecord::Schema.define(version: 2020_09_13_154919) do
     t.datetime "updated_at", precision: 6, null: false
     t.uuid "user_id"
     t.uuid "oauth_client_id"
+    t.jsonb "requested", default: {}
     t.index ["oauth_client_id"], name: "index_access_tokens_on_oauth_client_id"
+    t.index ["token", "expires_at"], name: "index_access_tokens_on_token_and_expires_at", unique: true
     t.index ["user_id"], name: "index_access_tokens_on_user_id"
   end
 
+  create_table "account_password_hashes", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "password_hash", null: false
+  end
+
+  create_table "account_password_reset_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "deadline", null: false
+    t.datetime "email_last_sent", default: -> { "CURRENT_TIMESTAMP" }, null: false
+  end
+
+  create_table "account_remember_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "deadline", null: false
+  end
+
+  create_table "account_verification_keys", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.string "key", null: false
+    t.datetime "requested_at", default: -> { "CURRENT_TIMESTAMP" }, null: false
+    t.datetime "email_last_sent", default: -> { "CURRENT_TIMESTAMP" }, null: false
+    t.uuid "account_id"
+    t.index ["account_id"], name: "index_account_verification_keys_on_account_id"
+  end
+
+  create_table "accounts", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
+    t.citext "email", null: false
+    t.integer "status_id", default: 1, null: false
+    t.string "role", default: "admin", null: false
+    t.string "oauth_client_id"
+    t.index ["email"], name: "index_accounts_on_email", unique: true, where: "(status_id = ANY (ARRAY[1, 2]))"
+    t.index ["oauth_client_id"], name: "index_accounts_on_oauth_client_id"
+  end
+
   create_table "app_configs", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
     t.string "contact_email"
     t.string "logo_url"
@@ -43,6 +78,7 @@ ActiveRecord::Schema.define(version: 2020_09_13_154919) do
     t.datetime "updated_at", precision: 6, null: false
     t.uuid "user_id"
     t.uuid "oauth_client_id"
+    t.jsonb "requested", default: {}
     t.index ["oauth_client_id"], name: "index_authorization_codes_on_oauth_client_id"
     t.index ["token"], name: "index_authorization_codes_on_token", unique: true
     t.index ["user_id"], name: "index_authorization_codes_on_user_id"
@@ -53,12 +89,11 @@ ActiveRecord::Schema.define(version: 2020_09_13_154919) do
     t.uuid "external_uuid"
     t.integer "external_int_id"
     t.string "external_id"
-    t.uuid "oauth_client_id"
     t.string "name", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.integer "users_count", default: 0
     t.index ["domain"], name: "index_enterprise_accounts_on_domain", unique: true
-    t.index ["oauth_client_id"], name: "index_enterprise_accounts_on_oauth_client_id"
   end
 
 # Could not dump table "identity_providers" because of following StandardError
@@ -94,5 +129,8 @@ ActiveRecord::Schema.define(version: 2020_09_13_154919) do
     t.index ["enterprise_account_id"], name: "index_users_on_enterprise_account_id"
   end
 
+  add_foreign_key "account_password_hashes", "accounts", column: "id"
+  add_foreign_key "account_password_reset_keys", "accounts", column: "id"
+  add_foreign_key "account_remember_keys", "accounts", column: "id"
   add_foreign_key "users", "identity_providers"
 end