Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.3.8
ruby 3.3
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ gem 'strong_migrations'
# Logging Customization
gem 'lograge'

# Environment variable management
gem 'dotenv-rails', require: 'dotenv/load'

# Use Active Storage for file uploads [https://guides.rubyonrails.org/active_storage_overview.html]
# gem "activestorage", "~> 7.0.0"

Expand Down
5 changes: 5 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ GEM
diff-lcs (1.6.2)
docile (1.4.1)
domain_name (0.6.20240107)
dotenv (3.2.0)
dotenv-rails (3.2.0)
dotenv (= 3.2.0)
railties (>= 6.1)
drb (2.2.3)
dumb_delegator (1.1.0)
erb (6.0.2)
Expand Down Expand Up @@ -632,6 +636,7 @@ DEPENDENCIES
cucumber-rails
database_cleaner-active_record
debug
dotenv-rails
factory_bot_rails
faraday
faraday-cookie_jar
Expand Down
127 changes: 121 additions & 6 deletions app/controllers/requests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class RequestsController < ApplicationController
before_action :check_extensions_enabled_for_students, except: [ :export ]
before_action :ensure_request_is_pending, only: %i[update approve reject]
before_action :set_request, only: %i[show edit cancel]
before_action :check_instructor_permission, only: %i[approve reject]
before_action :check_instructor_permission, only: %i[approve reject mass_approve mass_reject]

def index
@side_nav = 'requests'
Expand Down Expand Up @@ -137,21 +137,44 @@ def approve
@assignment = Assignment.find_by(id: @request.assignment_id)
lms_facade = @assignment.lms_facade
if @request.approve(lms_facade.from_user(@user), @user)
redirect_to course_requests_path(@course), notice: 'Request approved and extension created successfully in Canvas.'
notice = 'Request approved and extension created successfully in Canvas.'
respond_to do |format|
format.html { redirect_to course_requests_path(@course), notice: notice }
format.json { render json: { success: true, message: notice, new_status: 'approved', pending_count: @course.requests.where(status: 'pending').count } }
end
else
flash[:alert] = "Failed to approve the request. #{@request.errors.full_messages.join(', ')}"
redirect_to course_requests_path(@course)
alert = "Failed to approve the request. #{@request.errors.full_messages.join(', ')}"
respond_to do |format|
format.html { flash[:alert] = alert; redirect_to course_requests_path(@course) }
format.json { render json: { success: false, message: alert }, status: :unprocessable_content }
end
end
end

def reject
if @request.reject(@user)
redirect_to course_requests_path(@course), notice: 'Request denied successfully.'
notice = 'Request denied successfully.'
respond_to do |format|
format.html { redirect_to course_requests_path(@course), notice: notice }
format.json { render json: { success: true, message: notice, new_status: 'denied', pending_count: @course.requests.where(status: 'pending').count } }
end
else
redirect_to course_requests_path(@course), alert: 'Failed to deny the request.'
alert = 'Failed to deny the request.'
respond_to do |format|
format.html { redirect_to course_requests_path(@course), alert: alert }
format.json { render json: { success: false, message: alert }, status: :unprocessable_content }
end
end
end

def mass_approve
process_mass_action(:approve)
end

def mass_reject
process_mass_action(:reject)
end

def export
course = Course.find_by(id: params[:course_id])
token = params[:readonly_api_token]
Expand Down Expand Up @@ -258,5 +281,97 @@ def handle_successful_student_request(student)
result = @request.process_created_request(@user)
redirect_to result[:redirect_to], notice: "Request created for #{student.name}. #{result[:notice]}"
end

def process_mass_action(action)
request_ids = mass_request_ids
if request_ids.empty?
return render_mass_action_response(
success: false,
message: 'Please select at least one request.',
processed_ids: [],
failed_ids: [],
new_status: action == :approve ? 'approved' : 'denied',
status: :unprocessable_content
)
end

requests = @course.requests.where(id: request_ids, status: 'pending').includes(:assignment)

if requests.empty?
return render_mass_action_response(
success: false,
message: 'No pending requests were found for the selected rows.',
processed_ids: [],
failed_ids: request_ids,
new_status: action == :approve ? 'approved' : 'denied',
status: :unprocessable_content
)
end

processed_ids = []
failed_ids = request_ids - requests.map(&:id)

requests.each do |request|
result = action == :approve ? approve_request_for_mass_action(request) : request.reject(@user)
result ? processed_ids << request.id : failed_ids << request.id
end

processed_count = processed_ids.size
failed_count = failed_ids.size
action_label = action == :approve ? 'approved' : 'denied'
message =
if failed_count.zero?
"#{processed_count} request#{'s' unless processed_count == 1} #{action_label} successfully."
else
"#{processed_count} request#{'s' unless processed_count == 1} #{action_label}. "\
"#{failed_count} failed."
end

render_mass_action_response(
success: processed_count.positive?,
message: message,
processed_ids: processed_ids,
failed_ids: failed_ids,
new_status: action_label,
status: processed_count.positive? ? :ok : :unprocessable_content
)
end

def render_mass_action_response(success:, message:, processed_ids:, failed_ids:, new_status:, status:)
pending_count = @course.requests.where(status: 'pending').count
respond_to do |format|
format.html do
if success
redirect_to course_requests_path(@course), notice: message
else
redirect_to course_requests_path(@course), alert: message
end
end
format.json do
render json: {
success: success,
message: message,
processed_ids: processed_ids,
failed_ids: failed_ids,
new_status: new_status,
pending_count: pending_count
}, status: status
end
end
end

def approve_request_for_mass_action(request)
lms_facade = request.assignment&.lms_facade
return false unless lms_facade

request.approve(lms_facade.from_user(@user), @user)
rescue StandardError => e
Rails.logger.error("Mass approve failed for request #{request.id}: #{e.message}")
false
end

def mass_request_ids
Array(params[:request_ids]).map(&:to_i).uniq.select(&:positive?)
end
end
# rubocop:enable Metrics/ClassLength
30 changes: 27 additions & 3 deletions app/controllers/session_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,25 @@ def omniauth_callback
'email' => auth.info.email
}
creds = auth.credentials # an OmniAuth::AuthHash

# dev provider doesnt have real credentials so its stubbed
expires_at = creds.expires_at || 30.days.from_now.to_i
refresh_token = creds.refresh_token || 'none'

access_token = OAuth2::AccessToken.new(
OAuth2::Client.new('', ''), # client never used – stub
creds.token,
refresh_token: creds.refresh_token,
expires_at: creds.expires_at
refresh_token: refresh_token,
expires_at: expires_at
)

# Persist / update the user just like `create`
find_or_create_user(user_data, access_token)
user = find_or_create_user(user_data, access_token)

# Auto-enroll developer login users in test courses
if auth.provider == 'developer'
ensure_developer_test_enrollments(user)
end

redirect_to courses_path, notice: "Logged in! Welcome, #{user_data['name']}!"
rescue StandardError => e
Expand All @@ -79,6 +89,18 @@ def destroy

private

def ensure_developer_test_enrollments(user)
# Find the test course
test_course = Course.find_by(course_code: 'DEV101')

# Ensure enrollment in the test course (as student so they can request extensions)
if test_course
UserToCourse.find_or_create_by!(user_id: user.id, course_id: test_course.id) do |utc|
utc.role = 'student'
end
end
end

# TODO: Refactor.
def find_or_create_user(user_data, auth_token)
auth_token.token
Expand All @@ -102,6 +124,8 @@ def find_or_create_user(user_data, auth_token)
# Store user ID in session for authentication
session[:username] = user.name
session[:user_id] = user.canvas_uid

user
end

# TODO: Move this to a Canvas API libarary or user service
Expand Down
Loading