Autolab config master cherrypick #2028

najclark · 2023-12-11T22:40:49Z

Description

Cherrypicks merge commits the following PRs from the develop/autolab-3.0 branch:
Create Autolab configure tabs: #1825
Autolab config UI smtp: #1839
Add GitHub Configuration Tab to Configure Autolab: #1843
Google OAuth Config UI: #1870
OAuth flow fix: #1892

Motivation and Context

To merge changes from the develop branch into master.

How Has This Been Tested?

Follow the testing plans outlined in the following PRs:
Autolab config UI smtp: #1839
Add GitHub Configuration Tab to Configure Autolab: #1843
Google OAuth Config UI: #1870
OAuth flow fix: #1892

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

I have run rubocop and erblint for style check. If you haven't, run overcommit --install && overcommit --sign to use pre-commit hook for linting
My change requires a change to the documentation, which is located at Autolab Docs
I have updated the documentation accordingly, included in this PR

* Create Autolab configure tabs * Delete lti_tool_jwk.json * Delete lti_platform_jwk.json * addressed autolab_config spec nit --------- Co-authored-by: Nicholas Clark <[email protected]> Co-authored-by: Victor Huang <[email protected]>

* Oauth config page UI * OAuth UI config complete * Addressed nit --------- Co-authored-by: Nicholas Clark <[email protected]>

* Oauth config page UI * OAuth UI config complete * Addressed nit * Overhauled oauth workflow * Fixed new user registration flow * Fixed issue with user confirmation not being overridden by OAuth * Fixed OAuth button on hover color --------- Co-authored-by: Nicholas Clark <[email protected]>

* Create Autolab configure tabs * SMTP config page * SMTP config page implementation complete * Delete lti_platform_jwk.json * Delete lti_tool_jwk.json * Added default_from field to smtp config settings page * Moved default from input to seperate section --------- Co-authored-by: Nicholas Clark <[email protected]>

* Adds github integration config form * Add GitHub Configuration Page * Update Github integration documentation * Display current github config

coderabbitai · 2023-12-11T22:41:03Z

Walkthrough

This update introduces significant enhancements and bug fixes across the application, focusing on improving OAuth flow, updating gem dependencies, and expanding configuration management for SMTP, GitHub, OAuth, and LTI settings. It also enhances user experience by refining UI elements and streamlining the authentication process for new and existing users, aligning with standard OAuth behaviors seen on other platforms.

Changes

File(s)	Change Summary
`.gitignore`	Added config files for SMTP, GitHub, and OAuth; updated LTI tool config location.
`Gemfile`	Updated gems; added OAuth2 and CSRF protection gems; reordered declarations.
`app/assets/javascripts/autolab_config.js`	Added event listeners for initializing tab and collapsible components using jQuery.
`app/assets/stylesheets/style.css.scss`	Added CSS rule for `.oauth-btn:hover` to change background color to `$autolab-subtle-gray`.
`app/controllers/...` (`admins_controller.rb`, new config controllers)	Added new controllers for config management; updated admin actions; added `rescue_from` block.
`app/controllers/users/omniauth_callbacks_controller.rb`	Refined OAuth flow control logic.
`app/mailers/course_mailer.rb`, `app/models/user.rb`	Enhanced email and user model functionalities for SMTP settings and OAuth support.
`app/views/admins/_github_integration.html.erb` through `app/views/layouts/_navbar.html.erb`	Updated views for config management and UI improvements.
`config/application.rb`, `config/environments/...`, `config/routes.rb`	Renamed config parameters; introduced conditional config loading; added routes for config updates.
`docs/installation/github_integration.md`, `spec/...`	Updated documentation and tests.

Assessment against linked issues

Objective	Addressed	Explanation
Fix OAuth flow to align with standard behaviors (Issues #1892, #1873)	✅
Redirect new users to a welcome page after OAuth sign-in	✅
Ensure existing users are redirected to their courses page after OAuth sign-in	✅
Allow users to log in with standard authentication after using OAuth	✅

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
The JSON schema for the configuration file is available here.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

app/mailers/course_mailer.rb

app/controllers/smtp_config_controller.rb

app/controllers/lti_launch_controller.rb

app/controllers/github_config_controller.rb

config/routes.rb

app/controllers/lti_launch_controller.rb

app/controllers/admins_controller.rb

app/views/admins/_oauth_integration.html.erb

app/views/admins/_github_integration.html.erb

app/controllers/smtp_config_controller.rb

app/controllers/lti_launch_controller.rb

config/environments/production.rb.template

damianhxy · 2024-03-30T23:34:32Z

@coderabbitai pause

spec/controllers/admins_controller_spec.rb

config/environments/production.rb.template

…erb` consistent

damianhxy · 2024-04-01T20:21:21Z

@coderabbitai review

* Create Autolab configure tabs (autolab#1825) * Create Autolab configure tabs * Delete lti_tool_jwk.json * Delete lti_platform_jwk.json * addressed autolab_config spec nit --------- Co-authored-by: Nicholas Clark <[email protected]> Co-authored-by: Victor Huang <[email protected]> * Google OAuth Config UI (autolab#1870) * Oauth config page UI * OAuth UI config complete * Addressed nit --------- Co-authored-by: Nicholas Clark <[email protected]> * OAuth flow fix (autolab#1892) * Oauth config page UI * OAuth UI config complete * Addressed nit * Overhauled oauth workflow * Fixed new user registration flow * Fixed issue with user confirmation not being overridden by OAuth * Fixed OAuth button on hover color --------- Co-authored-by: Nicholas Clark <[email protected]> * Autolab config UI smtp (autolab#1839) * Create Autolab configure tabs * SMTP config page * SMTP config page implementation complete * Delete lti_platform_jwk.json * Delete lti_tool_jwk.json * Added default_from field to smtp config settings page * Moved default from input to seperate section --------- Co-authored-by: Nicholas Clark <[email protected]> * Add GitHub Configuration Tab to Configure Autolab (autolab#1843) * Adds github integration config form * Add GitHub Configuration Page * Update Github integration documentation * Display current github config * Fixed cherrypick issues * Update Gemfile.lock * Run Rubocop * Undo changes, fix tests * fix admin controller tests * fix lti config controller tests * Remove redundant titles * Remove redundant tags, make file extension of `_lti_integration.html.erb` consistent * Add missing raises * Remove rescue_from * Remove extraneous tmpfile param --------- Co-authored-by: Nicholas Clark <[email protected]> Co-authored-by: Victor Huang <[email protected]> Co-authored-by: Damian Ho <[email protected]> Co-authored-by: Joey Wildman <[email protected]> (cherry picked from commit ce0533d)

najclark and others added 6 commits December 8, 2023 15:24

Create Autolab configure tabs (#1825)

641b9d3

* Create Autolab configure tabs * Delete lti_tool_jwk.json * Delete lti_platform_jwk.json * addressed autolab_config spec nit --------- Co-authored-by: Nicholas Clark <[email protected]> Co-authored-by: Victor Huang <[email protected]>

Google OAuth Config UI (#1870)

4efeef1

* Oauth config page UI * OAuth UI config complete * Addressed nit --------- Co-authored-by: Nicholas Clark <[email protected]>

Add GitHub Configuration Tab to Configure Autolab (#1843)

f819a73

* Adds github integration config form * Add GitHub Configuration Page * Update Github integration documentation * Display current github config

Fixed cherrypick issues

917e47f

reviewpad bot requested a review from damianhxy December 11, 2023 22:41

reviewpad bot added large Pull request is large waiting-for-review labels Dec 11, 2023

Merge branch 'master' into autolab-config-master

e2b9155

coderabbitai bot reviewed Dec 11, 2023

View reviewed changes

damianhxy requested changes Dec 31, 2023

View reviewed changes

damianhxy added 2 commits January 6, 2024 01:53

Merge branch 'master' into autolab-config-master

23a9544

Update Gemfile.lock

78fffd2

coderabbitai bot reviewed Jan 5, 2024

View reviewed changes

config/environments/production.rb.template Show resolved Hide resolved

Run Rubocop

094e1da

damianhxy self-assigned this Mar 25, 2024

Merge branch 'master' into autolab-config-master

df7b00c

damianhxy and others added 2 commits March 30, 2024 19:41

Undo changes, fix tests

4d60892

fix admin controller tests

e98e5a2

coderabbitai bot reviewed Mar 31, 2024

View reviewed changes

spec/controllers/admins_controller_spec.rb Show resolved Hide resolved

config/environments/production.rb.template Show resolved Hide resolved

20wildmanj and others added 7 commits March 31, 2024 19:46

fix lti config controller tests

1eeaa1e

Merge branch 'master' into autolab-config-master

a62b26c

Remove redundant titles

f9bea74

Remove redundant tags, make file extension of `_lti_integration.html.…

5d25eca

…erb` consistent

Add missing raises

249a00b

Remove rescue_from

58875dc

Remove extraneous tmpfile param

48e5de8

damianhxy approved these changes Apr 1, 2024

View reviewed changes

damianhxy mentioned this pull request Apr 1, 2024

Add mappings for lti_config.yml, lti_tool_jwk.json, lti_platform_jwk.json autolab/docker#65

Merged

damianhxy added this pull request to the merge queue Apr 2, 2024

Merged via the queue into master with commit ce0533d Apr 2, 2024
5 checks passed

damianhxy deleted the autolab-config-master branch April 2, 2024 03:30

damianhxy mentioned this pull request Jun 30, 2024

Internal error on sending email after a new autolab installation #2168

Open

20wildmanj mentioned this pull request Sep 22, 2024

Remove redundant and outdated shibboleth gem #2215

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Autolab config master cherrypick #2028

Autolab config master cherrypick #2028

najclark commented Dec 11, 2023

coderabbitai bot commented Dec 11, 2023 •

edited

Loading

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

CodeRabbit Discord Community

damianhxy commented Mar 30, 2024

damianhxy commented Apr 1, 2024

Autolab config master cherrypick #2028

Autolab config master cherrypick #2028

Conversation

najclark commented Dec 11, 2023

Description

Motivation and Context

How Has This Been Tested?

Types of changes

Checklist:

coderabbitai bot commented Dec 11, 2023 • edited Loading

Walkthrough

Changes

Assessment against linked issues

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

CodeRabbit Discord Community

damianhxy commented Mar 30, 2024

damianhxy commented Apr 1, 2024

coderabbitai bot commented Dec 11, 2023 •

edited

Loading

CodeRabbit Configration File (`.coderabbit.yaml`)