etherpad_canvas 1.1.2 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6b8579211d4567d2ba0ede2106b969bd658074
-  data.tar.gz: 00642bfd1d107ef14d44a6d4df0427b3f6de50d8
+  metadata.gz: 298399568fd3c13b2e7ac6a9732ef6c6acbd354a
+  data.tar.gz: 2d125e17633e977b17040940b9aac22fdff97de7
 SHA512:
-  metadata.gz: 2e88dee7f7b095e6a6b6230ad5ec4f1fc4cacc356f9c89d8875895cb94eac9551281f43bd5656ddfa099ddba4b734c77f6cdf37079fb85d328d575bc95e16639
-  data.tar.gz: 4ef4199e8452bde7f7cbec6c962567ffd06f0c62fc4cdbdbac04c8453390a355297a95f15ecfb1e106573516144903b8df5774d254af0dc8afd3dd964d729fc3
+  metadata.gz: 0e17d81b0065b9cf832a8b76477b795fc36beac0d8c8c4cf733dc43da1719bd19ee90192e0b30966f2ab07ee27f4de604ae84773ce329586c9005282c73b24b3
+  data.tar.gz: 9fca27a1c9a3aeea18fdec3b76c1e60e081ac26a8f2e7e9833ecf232d1327ffcfa5931012c721e8d4e4e96266bda72e6027c657ea1e15cca8d612ba527a06e4d

data/README.rdoc

@@ -14,12 +14,23 @@ Description
 Installation
 ===================================================
 
+  First, set up Etherpad in your Canvas instance by:
+
+    Going to 'Plugins' under the settings for your account
+       and enable the Etherpad plugin
+       >> Make sure to have the domain for your Etherpad instance
+
+  Then change into the plugins folder and clone the etherpad_canvas:
+
     sysadmin@appserver:~$ cd /path/to/canvas/gems/plugins
     sysadmin@appserver:/path/to/canvas/gems/plugins$ git clone https://github.com/atomicjolt/etherpad_canvas.git
 
-  Run rake:secret and add the generated secret through 
-  Canvas settings and save that secret for utilization 
-  with the Etherpad Plugin for verification.
+  Run 'bundle'
+
+  Run 'rake secret' and add the generated secret through 
+  Canvas plugin settings for 'Etherpad Security' and save
+  that secret for utilization with the Etherpad Plugin
+  for verification.
 
 ===================================================
 Usage

data/app/views/etherpad_canvas/_plugin_settings.erb

@@ -18,5 +18,17 @@ TEXT
       <td><%= f.blabel :key, en: "Key" %></td>
       <td><%= f.text_area :key %></td>
     </tr>
+    <tr>
+      <td colspan="2">
+        <p><%= t(:insecure_desc, <<-TEXT)
+        Select this box if your instance of Etherpad requires http instead of https
+        TEXT
+        %></p>
+      </td>
+    </tr>
+    <tr>
+      <td><%= f.blabel :insecure, en: "Insecure" %></td>
+      <td><%= f.check_box :insecure %></td>
+    </tr>
   </table>
 <% end %>

data/lib/etherpad_canvas/collaborations_controller.rb

@@ -21,22 +21,56 @@ class CollaborationsController
   alias create_without_etherpad create
 
   def show
-    show_without_etherpad
+    @collaboration = @context.collaborations.find(params[:id])
     if @collaboration.collaboration_type == "EtherPad"
-      self.response_body = nil
-      redirect_to EtherpadCollaboration.sign_url(@current_user, @collaboration)
+      return redirect_to EtherpadCollaboration.sign_url(@current_user, @collaboration)
+    else
+      show_without_etherpad
     end
   end
 
   def create
-    create_without_etherpad
+    # This code was taken fro the original canvas controller in an effort to get around
+    # the limitations of Rails' version 5.0 to escape a redirect. The only changes that have
+    # been made from the original code are on lines 46 where a .delete was removed from between the 
+    # params[:collaboration][:collaboration_type] and line 56
+    content_item = params["contentItems"] ? JSON.parse(params["contentItems"]).first : nil
+    if content_item
+      @collaboration = collaboration_from_content_item(content_item)
+      users, group_ids = content_item_visibility(content_item)
+    else
+      users = User.where(id: Array(params[:user])).to_a
+      group_ids = Array(params[:group])
+      collaboration_params = params.require(:collaboration).permit(:title, :description, :url)
+      collaboration_params[:user] = @current_user
+      @collaboration = Collaboration.typed_collaboration_instance(params[:collaboration][:collaboration_type])
+      collaboration_params.delete(:url) unless @collaboration.is_a?(ExternalToolCollaboration)
+      @collaboration.attributes = collaboration_params
+    end
+    @collaboration.context = @context
     if @collaboration.collaboration_type == "EtherPad"
       respond_to do |format|
-        format.html do
-          self.response_body = nil
-          redirect_to EtherpadCollaboration.sign_url(@current_user, @collaboration)
+        if @collaboration.save
+          Lti::ContentItemUtil.new(content_item).success_callback if content_item
+          @collaboration.update_members(users, group_ids)
+          format.html { redirect_to EtherpadCollaboration.sign_url(@current_user, @collaboration) }
+          format.json {
+            render json: @collaboration.as_json(
+              methods: [:collaborator_ids], permissions: {
+                user: @current_user,
+                session: session,
+              }
+            )
+          }
+        else
+          Lti::ContentItemUtil.new(content_item).failure_callback if content_item
+          flash[:error] = t "errors.create_failed", "Collaboration creation failed"
+          format.html { redirect_to named_context_url(@context, :context_collaborations_url) }
+          format.json { render json: @collaboration.errors, status: :bad_request }
         end
       end
+    else
+      create_without_etherpad
     end
   end
 end

data/lib/etherpad_canvas/etherpad_collaboration.rb

@@ -20,7 +20,11 @@ require "base64"
 class EtherpadCollaboration
 
   def initialize_document
-    self.url ||= "http://#{EtherpadCollaboration.config[:domain]}/p/i-#{uuid}"
+    scheme = "https"
+    if PluginSetting.find_by(name: "etherpad_canvas").settings[:insecure] == "1"
+      scheme = "http"
+    end
+    self.url ||= "#{scheme}://#{EtherpadCollaboration.config[:domain]}/p/i-#{uuid}"
   end
 
   def self.sign_url(user, collaboration)

data/lib/etherpad_canvas/version.rb

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: etherpad_canvas
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.2
 platform: ruby
 authors:
 - Eric Durr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-12-01 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.1
+        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.1
+        version: '5.1'
 description: Enable secure sign-in with Etherpad collaborations tool.
 email:
 - ericdurr@atomicjolt.com
@@ -62,7 +68,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: Override and add secure signin to Etherpad