Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FEATURE BRANCH - 407 Add SSO #498

Open
wants to merge 19 commits into
base: qa
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
21bac75
Add SSO with Shibboleth
Janell-Huyck Apr 30, 2024
b2ce1bd
LIBTREATDB-56 Replace Devise with Custom Session Management - FEATURE…
Janell-Huyck Sep 12, 2024
be6a84f
Fix tests after rebase from qa
Janell-Huyck Sep 12, 2024
92ad404
Gemfile.lock allows installation with different computer - no functio…
Janell-Huyck Sep 18, 2024
e8fc717
Fix broken tests after rebase
Janell-Huyck Oct 17, 2024
9baac67
Fix flaky test
Janell-Huyck Oct 17, 2024
c899cab
Pin Rails, actionmailer, actionpack, actiontext to version 6.1.7.9 an…
Janell-Huyck Oct 18, 2024
1858601
Add specific development environment login path (#554)
Janell-Huyck Nov 18, 2024
5ddf555
Merge branch 'qa' into 407-feature-branch-add-sso
Janell-Huyck Nov 18, 2024
d4196de
Fix broken test that resulted from merged changes
Janell-Huyck Nov 18, 2024
b4bcc4b
LIBTREATDB-84 connect qa shibboleth to app (#562)
Janell-Huyck Nov 20, 2024
ce58e5e
Update to Rails version 6.1.7.10 for security fix
Janell-Huyck Nov 21, 2024
2eadeea
Cosmetic changes found on code review
Janell-Huyck Nov 21, 2024
8831c5e
LIBTREATDB-100 Logging out of app should log out of shibboleth for ss…
Janell-Huyck Dec 2, 2024
8258560
Make user emails unable to be changed by admins (#565)
Janell-Huyck Dec 4, 2024
ac52b03
LIBTREATDB-101 Only require 6 2 for dev login (#567)
Janell-Huyck Jan 10, 2025
0864249
Merge branch 'qa' into 407-feature-branch-add-sso
Janell-Huyck Jan 21, 2025
05cd828
Add: bundle lock --add-platform x86_64-linux
Janell-Huyck Jan 21, 2025
342e778
Pin nokogiri to 1.16.7 for deployment
Janell-Huyck Jan 22, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ jobs:
key: v1-dependencies-{{ checksum "Gemfile.lock" }}

# Database setup
- run: bundle exec rake db:create
- run: bundle exec rake db:schema:load
- run: bundle exec rails db:create
- run: bundle exec rails db:schema:load
- run: bundle exec rails db:seed

# Run tests in parallel
- run:
Expand Down
25 changes: 0 additions & 25 deletions .dockerignore

This file was deleted.

11 changes: 0 additions & 11 deletions .env.development
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# Admin Variables
ADMIN_USERNAME=test
ADMIN_PASSWORD=password

# Mail Variables
[email protected]

# Database settings
TREATMENT_DATABASE_ADAPTER=sqlite3
TREATMENT_DATABASE_HOST=
Expand All @@ -15,7 +8,3 @@
TREATMENT_DATABASE_TIMEOUT=5000
TREATMENT_DATABASE_USERNAME=
SEEDABLE=true

Mailer settings
[email protected]
TREATMENT_PRODUCTION_MAILER_URL=localhost
16 changes: 0 additions & 16 deletions .env.development.docker

This file was deleted.

27 changes: 10 additions & 17 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
# Admin Variables
ADMIN_USERNAME=test
ADMIN_PASSWORD=password

# Mail Variables
[email protected]

# Database settings
TREATMENT_DATABASE_ADAPTER=sqlite3
TREATMENT_DATABASE_HOST=
TREATMENT_DATABASE_NAME=db/test.sqlite3
TREATMENT_DATABASE_PASSWORD=
TREATMENT_DATABASE_POOL=5
TREATMENT_DATABASE_PORT=
TREATMENT_DATABASE_TIMEOUT=5000
TREATMENT_DATABASE_USERNAME=
SEEDABLE=true
# Database settings
TREATMENT_DATABASE_ADAPTER=sqlite3
TREATMENT_DATABASE_HOST=
TREATMENT_DATABASE_NAME=db/test.sqlite3
TREATMENT_DATABASE_PASSWORD=
TREATMENT_DATABASE_POOL=5
TREATMENT_DATABASE_PORT=
TREATMENT_DATABASE_TIMEOUT=5000
TREATMENT_DATABASE_USERNAME=
SEEDABLE=true
2 changes: 1 addition & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--require spec_helper
--require rails_helper
4 changes: 0 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ Metrics/ClassLength:
Exclude:
- 'app/controllers/conservation_records_controller.rb'

Rails/LexicallyScopedActionFilter:
Exclude:
- 'app/controllers/users/registrations_controller.rb'

Metrics/AbcSize:
Exclude:
- 'app/helpers/in_house_repair_records_helper.rb'
Expand Down
14 changes: 8 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ ruby '3.3.6'
gem 'dotenv-rails' # Loads environment variables from .env

# Core Rails gems
gem 'actionmailer', '~>6.1.7.10' # Email composition, delivery, and receiving with Action Mailer
gem 'actionpack', '~>6.1.7.10' # Handles web requests and responses with Action Controller and Action Dispatch
gem 'actiontext', '~>6.1.7.10' # Rich text content and editing with Action Text
gem 'activestorage' # Handles file uploads in Rails applications
gem 'builder' # Provides a simple way to create XML markup and data structures
gem 'mutex_m' # Being removed from Ruby soon, required for activestorage
gem 'rails', '~> 6.1.7.10' # The Rails framework
gem 'sprockets-rails', '~> 3.4' # Sprockets adapter for Rails, needed for deploy:assets:precompile steps
Expand Down Expand Up @@ -42,11 +42,10 @@ gem 'turbolinks', '~> 5' # Makes navigating your site faster by using AJAX to lo

# Authentication and Authorization
gem 'cancancan' # Authorization library for Ruby on Rails which restricts what resources a given user is allowed to access
gem 'devise' # Flexible authentication solution for Rails with Warden

# Additional Functionality
gem 'nokogiri' # HTML, XML, SAX, and Reader parser
gem 'pagy' # Pagination library that is fast, lightweight, and flexible
gem 'nokogiri', '1.16.7' # HTML, XML, SAX, and Reader parser
gem 'pagy', '~> 9.0' # Pagination library that is fast, lightweight, and flexible
gem 'paper_trail' # Track changes to your models' data
gem 'pdfkit' # Uses wkhtmltopdf to generate PDFs from HTML
gem 'rexml', '>= 3.3.6' # XML processing library, now a direct dependency for security management
Expand All @@ -55,6 +54,8 @@ gem 'wkhtmltopdf-binary', '>= 0.12.6.7' # Enables PDF generation from HTML
# Windows specific timezone data
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] # Timezone data for Windows

gem 'show_me_the_cookies' # Cookie inspection for tests

group :development, :test do
# Debugging tools
gem 'byebug', platforms: %i[mri mingw x64_mingw] # Debugging tool for Ruby
Expand All @@ -63,7 +64,6 @@ group :development, :test do
gem 'factory_bot_rails' # A fixtures replacement with a straightforward definition syntax
gem 'rails-controller-testing' # Adds missing helper methods for controller tests in Rails 5
gem 'rspec_junit_formatter' # Outputs RSpec results in JUnit format
gem 'rspec-rails', '~> 6.0.0' # RSpec for Rails 6+
gem 'selenium-webdriver', '~> 4.18.1' # WebDriver for testing web applications

# Coverage and code analysis
Expand All @@ -75,7 +75,6 @@ group :development, :test do
gem 'simplecov-lcov', require: false # Formatter for SimpleCov that generates LCOV reports

# Security dependencies
gem 'bcrypt_pbkdf' # A key derivation function for safely storing passwords
gem 'ed25519' # Ed25519 elliptic curve public-key signature system
end

Expand All @@ -100,6 +99,9 @@ group :test do
gem 'capybara', '>= 2.15' # Integration testing tool for rack-based web applications
gem 'database_cleaner-active_record' # Strategies for cleaning databases in Ruby
gem 'launchy' # Opens a given URL in a browser
gem 'rack-test' # Small, simple testing API for Rack apps
gem 'rspec-rails', '~> 6.0.0' # RSpec for Rails 6+
gem 'shoulda-matchers', '~> 5.0' # Provides RSpec with additional matchers
end

group :production do
Expand Down
Loading
Loading