From 3a3cc6ea2a38118c58caeefbd5566339129b40a7 Mon Sep 17 00:00:00 2001
From: Justin Ball <justinball@gmail.com>
Date: Mon, 1 May 2017 15:50:59 -0600
Subject: [PATCH] Add code to capture token required error

---
 app/controllers/lti_launches_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/lti_launches_controller.rb b/app/controllers/lti_launches_controller.rb
index 726a0b11f..d0975622f 100644
--- a/app/controllers/lti_launches_controller.rb
+++ b/app/controllers/lti_launches_controller.rb
@@ -8,8 +8,12 @@ class LtiLaunchesController < ApplicationController
   before_action :do_lti
 
   def index
-    @canvas_api = canvas_api
-    @canvas_auth_required = @canvas_api.blank?
+    begin
+      @canvas_api = canvas_api
+      @canvas_auth_required = @canvas_api.blank?
+    rescue CanvasApiTokenRequired
+      @canvas_auth_required = true
+    end
     set_lti_launch_values
     @lti_launch = ClientSetting.find(params[:id]) if params[:id].present?
   end