Merge branch 'master' into add_roles_via_LTI

# Conflicts:
#	app/controllers/concerns/lti.rb

app/controllers/concerns/lti.rb

@@ -69,6 +69,11 @@ module Lti
     result
   end
 
+  def mooc_course
+    # All Xikolo platforms set the custom_course to the course code
+   params[:custom_course]
+  end
+
   def refuse_lti_launch(options = {})
     return_to_consumer(lti_errorlog: options[:message], lti_errormsg: t('sessions.oauth.failure'))
   end
@@ -154,6 +159,14 @@ module Lti
   end
   private :set_current_user
 
+
+  def set_study_group_membership
+    return if mooc_course
+    group = StudyGroup.find_or_create_by(external_id: @provider.resource_link_id, consumer: @consumer)
+    group.users |= [@current_user] # add current user if not already member of the group
+    group.save
+  end
+
   def set_embedding_options
     @embed_options = {}
     [:hide_navbar,