quiz_proctor_engine 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653bb7ff658988d53fab1b23011f54ab55f99b37
-  data.tar.gz: 9c9dc7171138db52e9edd23af674627f027a47db
+  metadata.gz: 4e5df57adf4234792d236a87510ee85444fc55f8
+  data.tar.gz: 3a88e2002d1eaf1a8a7ff78de745bd50bce01a85
 SHA512:
-  metadata.gz: c9719c5ef7a2ec286ca99223103d77a4f6c2c05f2e57c679e8f812e133d4bc6169a4a6ebeb8fe2cc97d09e358c63b908155b82446691b5f753d9e358804d6118
-  data.tar.gz: 7308d47d012af9b7f36ffd7b259df63f779f07f5ec64c88b5c6fb4b3abd8e99a67673e0039a5ad05d0cf7f05b06d12227123b0f871ff3b5e2bb28a472e7cacb7
+  metadata.gz: 8ea44bebfd87bc789163e001fe530ff81a30887a93fae3a884d69b343f61b9822902755f5b2f4e8de01a5f65222b824011146dc7cb442c3e35918da967a9aee8
+  data.tar.gz: 06c20e9eed5c091faf8024a5e78c9aca27102f96859873b479f053ba40a4e3882abad082843f337ab36c1d05016efc74dcefcd65b01622a51a6f78297eb51813

data/app/controllers/proctor_conversations_controller.rb

@@ -12,14 +12,17 @@
 
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-require "httparty"
 
 class ProctorConversationsController < ApplicationController
-  skip_before_filter :verify_authenticity_token
-  before_action :verify_messageable
+  skip_before_action :verify_authenticity_token
 
   def initiate_conversation
     proctor = User.find(params[:proctor_id])
+    cd = CustomData.find_by(user: proctor, namespace: "edu.au.exam")
+    if cd.nil? || params[:proctor_code] != cd.data["d"]["exam"]["proctor_code"]
+      render json: { error: "Unauthorized" }
+      return
+    end
     student = User.find(params[:student_id])
     message = Conversation.build_message(proctor, params[:body])
     conversation = proctor.initiate_conversation([student], true, subject: params[:subject])
@@ -27,27 +30,4 @@ class ProctorConversationsController < ApplicationController
     render json: { status: :ok }
   end
 
-  private
-
-  def verify_messageable
-    headers = {
-      "Content-Type" => "application/json",
-    }
-    plugin = PluginSetting.find_by(name: "quiz_proctor")
-
-    query = {
-      student_id: params[:student_id],
-      proctor_code: params[:proctor_code],
-      unstarted: true,
-    }.to_query
-
-    quiz = HTTParty.get(
-      "#{plugin.settings[:adhesion_url]}/api/proctored_exams?#{query}",
-      headers: headers,
-      # verify: false,
-    )
-    if quiz.parsed_response["error"].present?
-      render json: { error: "Unauthorized" }
-    end
-  end
 end

data/app/controllers/proctored_exams_controller.rb

@@ -32,19 +32,77 @@ class ProctoredExamsController < ApplicationController
       proctor_code: params[:proctor_code],
     }.to_query
 
-    quiz = HTTParty.get(
-      "#{plugin.settings[:adhesion_url]}/api/proctored_exams?#{query}",
+    exam_request = HTTParty.get(
+      "#{plugin.settings[:adhesion_proctor_url]}/api/proctored_exams?#{query}",
       headers: headers,
       # verify: false,
-    )
-    if quiz.parsed_response["error"].present?
-      flash[:error] = quiz.parsed_response["error"]
+    ).parsed_response["exam_request"]
+
+    if exam_request.nil?
+      flash[:error] = "You do not have an exam that is ready to start."
+      redirect_to proctored_exams_path
+      return
+    end
+
+    matched_code = false
+    proctor_id = nil
+    proctor_name = nil
+    code = params[:proctor_code]
+    users = Account.find(exam_request["testing_center_id"]).users
+    CustomData.where(user: users, namespace: "edu.au.exam").find_each do |cd|
+      user = users.detect { |u| u.id == cd.user_id }
+      if cd.data["d"]["exam"]["proctor_code"] == code
+        matched_code = true
+        proctor_id = user.id
+        proctor_name = user.name
+        break
+      end
+    end
+
+    if !matched_code
+      flash[:error] = "Invalid proctor code."
       redirect_to proctored_exams_path
-    else
-      quiz = quiz.parsed_response
-      session[:is_proctored] = true
-      session[:proctor_access_code] = quiz["proctor_access_code"]
-      redirect_to course_quiz_take_path quiz["quiz"]["course_id"], quiz["quiz"]["exam_id"]
+      return
     end
+
+    query = {
+      proctor_id: proctor_id,
+      proctor_name: proctor_name,
+    }.to_query
+
+    # HTTParty is really bad and sends the put body wrong, so i send everything in the params
+    # RestClient does this better but I dont have RestClient so HTTParty it is.
+    HTTParty.put(
+      "#{plugin.settings[:adhesion_proctor_url]}/api/proctored_exams/#{exam_request['id']}?#{query}",
+      body: {},
+      headers: headers,
+    )
+    canvas_quiz = Quizzes::Quiz.find(exam_request["exam_id"])
+
+    session[:is_proctored] = true
+    session[:proctor_access_code] = canvas_quiz.access_code
+    redirect_to course_quiz_take_path exam_request["course_id"], exam_request["exam_id"]
+  end
+
+  def finish_quiz
+    headers = {
+      "Content-Type" => "application/json",
+    }
+    plugin = PluginSetting.find_by(name: "quiz_proctor")
+
+    query = {
+      student_id: @current_user.id,
+      update: true,
+    }.to_query
+
+    HTTParty.get(
+      "#{plugin.settings[:adhesion_proctor_url]}/api/proctored_exams?#{query}",
+      headers: headers,
+      # verify: false
+    )
+    # we wont need to handle the response for this anyway, hence the hardcoded ok value
+    # if it fails we will probably never know because the JavaScript
+    # that will handle the response will have been reloaded by the time this finishes.
+    render json: { status: "ok" }
   end
 end

data/app/views/layouts/quiz_proctor.erb

@@ -32,6 +32,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   removePreviousAndNext(0, false, false);
 })();
 
+(function(){
+  addCustomEventListenerToSubmit(0, false);
+})();
+
 function removePreviousAndNext(tries, nextAlreadyRemoved, previousAlreadyRemoved){
 
   if(tries > 100 || (nextAlreadyRemoved && previousAlreadyRemoved)) {
@@ -57,4 +61,25 @@ function removePreviousAndNext(tries, nextAlreadyRemoved, previousAlreadyRemoved
 
 }
 
+function addCustomEventListenerToSubmit(tries, finished) {
+
+  if (tries > 100 || finished) {
+    return;
+  }
+  var foundButton = false;
+  var button = document.getElementById("submit_quiz_button");
+  if(button) {
+    foundButton = true;
+    button.addEventListener('click', function(){
+      $.ajax({
+        type: 'PUT',
+        url: '/proctored_exams',
+      })
+    });
+  }
+  setTimeout(function(){
+    addCustomEventListenerToSubmit(tries + 1, foundButton);
+  }, 100)
+}
+
 </script>

data/app/views/quiz_proctor_engine/_plugin_settings.erb

@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <td><%= f.text_field :proctor_secret %></td>
     </tr>
     <tr>
-      <td><%= f.blabel :adhesion_url, en: "Adhesion Url" %></td>
-      <td><%= f.text_field :adhesion_url %></td>
+      <td><%= f.blabel :adhesion_proctor_url, en: "Adhesion Proctor Url" %></td>
+      <td><%= f.text_field :adhesion_proctor_url %></td>
     </tr>
   </table>
 <% end %>

data/config/routes.rb

@@ -17,5 +17,6 @@ Rails.application.routes.draw do
   get "proctor_login" => "proctor_login#login"
   get "proctored_exams" => "proctored_exams#show"
   post "proctored_exams" => "proctored_exams#start_quiz"
+  put "proctored_exams" => "proctored_exams#finish_quiz"
   post "proctor_conversations" => "proctor_conversations#initiate_conversation"
 end

data/lib/quiz_proctor_engine/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module QuizProctorEngine
-  VERSION = "1.2.0".freeze
+  VERSION = "1.3.1".freeze
 end

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: quiz_proctor_engine
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.1
 platform: ruby
 authors:
 - dittonjs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.7
+        version: '5.1'
 description: Allows students to take canvas quizzes in a chromeless view, as well
   as allow proctors to enter answers on behalf of a student
 email:
@@ -71,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Allows students to take canvas quizzes in a chromeless view, as well as allow