Run rubocop --fix-layout and remove encoding comments

plugins/discourse/Rakefile

@@ -23,8 +23,6 @@ end
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -36,5 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-
 task :default => :test

plugins/discourse/app/controllers/discourse_controller.rb

@@ -1,11 +1,11 @@
 class DiscourseController < ApplicationController
-
   before_action -> { require_plugin_enabled FoodsoftDiscourse }
 
   protected
 
   def valid_signature?
     return false if params[:sso].blank? || params[:sig].blank?
+
     get_hmac_hex_string(params[:sso]) == params[:sig]
   end
 

plugins/discourse/app/controllers/discourse_login_controller.rb

@@ -1,5 +1,4 @@
 class DiscourseLoginController < DiscourseController
-
   before_action -> { require_config_disabled :discourse_sso }
   skip_before_action :authenticate
 
@@ -11,8 +10,8 @@ class DiscourseLoginController < DiscourseController
 
     session[:discourse_sso_nonce] = nonce
     redirect_to_with_payload "#{discourse_url}/session/sso_provider",
-      nonce: nonce,
-      return_sso_url: return_sso_url
+                             nonce: nonce,
+                             return_sso_url: return_sso_url
   end
 
   def callback
@@ -21,6 +20,7 @@ class DiscourseLoginController < DiscourseController
     payload = parse_payload
 
     raise I18n.t('discourse.callback.invalid_nonce') if payload[:nonce] != session[:discourse_sso_nonce]
+
     session[:discourse_sso_nonce] = nil
 
     id = payload[:external_id].to_i
@@ -39,5 +39,4 @@ class DiscourseLoginController < DiscourseController
   rescue => error
     redirect_to login_url, alert: error.to_s
   end
-
 end

plugins/discourse/app/controllers/discourse_sso_controller.rb

@@ -1,5 +1,4 @@
 class DiscourseSsoController < DiscourseController
-
   before_action -> { require_config_enabled :discourse_sso }
 
   def sso
@@ -12,14 +11,13 @@ class DiscourseSsoController < DiscourseController
     raise I18n.t('discourse.sso.nonce_missing') if nonce.blank?
 
     redirect_to_with_payload return_sso_url,
-      nonce: nonce,
-      email: current_user.email,
-      require_activation: true,
-      external_id: "#{FoodsoftConfig.scope}/#{current_user.id}",
-      username: current_user.nick,
-      name: current_user.name
+                             nonce: nonce,
+                             email: current_user.email,
+                             require_activation: true,
+                             external_id: "#{FoodsoftConfig.scope}/#{current_user.id}",
+                             username: current_user.nick,
+                             name: current_user.name
   rescue => error
     redirect_to root_url, alert: error.to_s
   end
-
 end

plugins/discourse/config/routes.rb

@@ -1,11 +1,7 @@
 Rails.application.routes.draw do
-
   scope '/:foodcoop' do
-
     get '/discourse/callback' => 'discourse_login#callback'
     get '/discourse/initiate' => 'discourse_login#initiate'
     get '/discourse/sso' => 'discourse_sso#sso'
-
   end
-
 end

plugins/discourse/lib/foodsoft_discourse/redirect_to_login.rb

@@ -1,23 +1,19 @@
 module FoodsoftDiscourse
-
   module RedirectToLogin
     def self.included(base) # :nodoc:
       base.class_eval do
-
         alias foodsoft_discourse_orig_redirect_to_login redirect_to_login
 
-        def redirect_to_login(options={})
+        def redirect_to_login(options = {})
           if FoodsoftDiscourse.enabled? && !FoodsoftConfig[:discourse_sso]
             redirect_to discourse_initiate_path
           else
             foodsoft_discourse_orig_redirect_to_login(options)
           end
         end
-
       end
     end
   end
-
 end
 
 # modify existing helper