chore: rubocop

chore: fix api test conventions

chore: rubocop -A spec/

chore: more rubocop -A

fix failing test

rubocop fixes

removes helper methods that are in my opinion dead code

more rubocop fixes

rubocop -a --auto-gen-config

plugins/discourse/Rakefile

@@ -20,7 +20,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
@@ -34,4 +34,4 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
-task :default => :test
+task default: :test

plugins/discourse/app/controllers/discourse_controller.rb

@@ -11,7 +11,7 @@ class DiscourseController < ApplicationController
 
   def redirect_to_with_payload(url, payload)
     base64_payload = Base64.strict_encode64 payload.to_query
-    sso = CGI::escape base64_payload
+    sso = CGI.escape base64_payload
     sig = get_hmac_hex_string base64_payload
     redirect_to "#{url}#{url.include?('?') ? '&' : '?'}sso=#{sso}&sig=#{sig}"
   end
@@ -21,7 +21,7 @@ class DiscourseController < ApplicationController
     payload.symbolize_keys!
   end
 
-  def get_hmac_hex_string payload
+  def get_hmac_hex_string(payload)
     discourse_sso_secret = FoodsoftConfig[:discourse_sso_secret]
     OpenSSL::HMAC.hexdigest 'sha256', discourse_sso_secret, payload
   end

plugins/discourse/app/controllers/discourse_login_controller.rb

@@ -5,7 +5,7 @@ class DiscourseLoginController < DiscourseController
   def initiate
     discourse_url = FoodsoftConfig[:discourse_url]
 
-    nonce = SecureRandom.hex()
+    nonce = SecureRandom.hex
     return_sso_url = url_for(action: :callback, only_path: false)
 
     session[:discourse_sso_nonce] = nonce
@@ -36,7 +36,7 @@ class DiscourseLoginController < DiscourseController
     user.save!
 
     login_and_redirect_to_return_to user, notice: I18n.t('discourse.callback.logged_in')
-  rescue => error
-    redirect_to login_url, alert: error.to_s
+  rescue StandardError => e
+    redirect_to login_url, alert: e.to_s
   end
 end

plugins/discourse/app/controllers/discourse_sso_controller.rb

@@ -17,7 +17,7 @@ class DiscourseSsoController < DiscourseController
                              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
+  rescue StandardError => e
+    redirect_to root_url, alert: e.to_s
   end
 end

plugins/discourse/foodsoft_discourse.gemspec

@@ -1,20 +1,21 @@
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path('lib', __dir__)
 
 # Maintain your gem's version:
-require "foodsoft_discourse/version"
+require 'foodsoft_discourse/version'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "foodsoft_discourse"
+  s.name        = 'foodsoft_discourse'
   s.version     = FoodsoftDiscourse::VERSION
-  s.authors     = ["paroga"]
-  s.email       = ["paroga@paroga.com"]
-  s.homepage    = "https://github.com/foodcoops/foodsoft"
-  s.summary     = "Discourse plugin for foodsoft."
-  s.description = "Allow SSO login via Discourse"
+  s.authors     = ['paroga']
+  s.email       = ['paroga@paroga.com']
+  s.homepage    = 'https://github.com/foodcoops/foodsoft'
+  s.summary     = 'Discourse plugin for foodsoft.'
+  s.description = 'Allow SSO login via Discourse'
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["Rakefile", "README.md"]
+  s.files = Dir['{app,config,db,lib}/**/*'] + ['Rakefile', 'README.md']
 
-  s.add_dependency "rails"
-  s.add_dependency "deface", "~> 1.0"
+  s.add_dependency 'rails'
+  s.add_dependency 'deface', '~> 1.0'
+  s.metadata['rubygems_mfa_required'] = 'true'
 end

plugins/discourse/lib/foodsoft_discourse/redirect_to_login.rb

@@ -2,7 +2,7 @@ module FoodsoftDiscourse
   module RedirectToLogin
     def self.included(base) # :nodoc:
       base.class_eval do
-        alias foodsoft_discourse_orig_redirect_to_login redirect_to_login
+        alias_method :foodsoft_discourse_orig_redirect_to_login, :redirect_to_login
 
         def redirect_to_login(options = {})
           if FoodsoftDiscourse.enabled? && !FoodsoftConfig[:discourse_sso]
@@ -18,5 +18,5 @@ end
 
 # modify existing helper
 ActiveSupport.on_load(:after_initialize) do
-  Concerns::Auth.send :include, FoodsoftDiscourse::RedirectToLogin
+  Concerns::Auth.include FoodsoftDiscourse::RedirectToLogin
 end

plugins/discourse/lib/foodsoft_discourse/version.rb

@@ -1,3 +1,3 @@
 module FoodsoftDiscourse
-  VERSION = "0.0.1"
+  VERSION = '0.0.1'
 end