mks_auth 1.0.0 → 1.0.4

data/spec/factories/application_modules.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :application_module, class: 'Mks::Auth::ApplicationModule' do
     code { FFaker::Name.name }
     name { FFaker::Name.name }

data/spec/factories/menus.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :menu, class: 'Mks::Auth::Menu' do
     text { FFaker::Name.name }
     icon_cls { FFaker::Name.name }

data/spec/factories/user_roles.rb

@@ -1,6 +1,7 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user_role, class: 'Mks::Auth::UserRole' do
     name { FFaker::Name.name }
+    association :application_module
 
     trait :with_menu do
       after(:create) do |role|

data/spec/factories/users.rb

@@ -1,11 +1,10 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :user, class: 'Mks::Auth::User' do
     first_name { FFaker::Name.name }
     last_name { FFaker::Name.name }
     email { FFaker::Internet.email }
     active true
     password { FFaker::Internet.password(min_length=6) }
-    association :application_module
 
     trait :with_role do
       after(:create) do |user|

data/spec/models/mks/auth/application_module_spec.rb

@@ -22,7 +22,8 @@ module Mks
 
       it 'can access users' do
         am = create(:application_module)
-        2.times { create(:user, :application_module => am) }
+        2.times { create(:user) }
+        User.all.each { |u| u.application_modules = [am] }
         expect(am.users.count).to eq 2
       end
 

data/spec/models/mks/auth/user_spec.rb

@@ -40,6 +40,16 @@ module Mks
         u = create(:user, :with_roles)
         expect(u.roles.count).to eq 3
       end
+
+      it 'role_names returns role names' do
+        r1 = create(:user_role)
+        r2 = create(:user_role)
+        u = create(:user, roles: [r1, r2])
+
+        roles = u.role_names
+        expect(roles).to include r1.name
+        expect(roles).to include r2.name
+      end
     end
   end
 end

data/spec/rails_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path('../dummy/config/environment', __FILE__)
 abort('The Rails environment is running in production mode!') if Rails.env.production?
 require 'spec_helper'
 require 'rspec/rails'
+require 'mks/auth/token_auth'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 
 require 'ffaker'
 

data/spec/support/factory_girl.rb

@@ -1,5 +1,5 @@
-require 'factory_girl'
+require 'factory_bot'
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mks_auth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Henock L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,98 +16,112 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.1
+        version: 5.2.0
 - !ruby/object:Gem::Dependency
   name: mks_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.2
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.11
+        version: 3.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.11
+        version: 3.1.12
+- !ruby/object:Gem::Dependency
+  name: jwt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 description: Authentication module for MKS apps
 email:
 - henockl@live.com
@@ -121,13 +135,11 @@ files:
 - app/assets/config/mks_auth_manifest.js
 - app/assets/javascripts/mks_auth/application.js
 - app/assets/stylesheets/mks_auth/application.css
-- app/controllers/mks/auth/access_controller.rb
 - app/controllers/mks/auth/application_controller.rb
 - app/controllers/mks/auth/application_modules_controller.rb
+- app/controllers/mks/auth/menus_controller.rb
 - app/controllers/mks/auth/user_roles_controller.rb
 - app/controllers/mks/auth/users_controller.rb
-- app/helpers/mks/auth/access_helper.rb
-- app/helpers/mks/auth/application_helper.rb
 - app/jobs/mks_auth/application_job.rb
 - app/mailers/mks_auth/application_mailer.rb
 - app/models/mks/auth/application_module.rb
@@ -142,11 +154,15 @@ files:
 - db/migrate/20161029071047_create_mks_users_user_roles.rb
 - db/migrate/20161029072256_create_mks_auth_menus.rb
 - db/migrate/20161029074023_create_mks_menus_user_roles.rb
+- db/migrate/20180201104912_create_mks_users_application_modules.rb
 - lib/mks/auth.rb
 - lib/mks/auth/engine.rb
+- lib/mks/auth/token_auth.rb
 - lib/mks/auth/version.rb
 - lib/mks_auth.rb
 - lib/tasks/mks_auth_tasks.rake
+- spec/controllers/mks/auth/menus_controller_spec.rb
+- spec/controllers/mks/auth/user_roles_controller_spec.rb
 - spec/controllers/mks/auth/users_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -194,6 +210,7 @@ files:
 - spec/dummy/config/spring.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/log/development.log
+- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -231,72 +248,75 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Authentication module for MKS apps
 test_files:
-- spec/spec_helper.rb
+- spec/controllers/mks/auth/menus_controller_spec.rb
+- spec/controllers/mks/auth/user_roles_controller_spec.rb
+- spec/controllers/mks/auth/users_controller_spec.rb
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/app/assets/javascripts/application.js
+- spec/dummy/app/assets/javascripts/cable.js
+- spec/dummy/app/assets/stylesheets/application.css
+- spec/dummy/app/channels/application_cable/channel.rb
+- spec/dummy/app/channels/application_cable/connection.rb
+- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/jobs/application_job.rb
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/models/application_record.rb
-- spec/dummy/app/jobs/application_job.rb
-- spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/layouts/mailer.html.erb
 - spec/dummy/app/views/layouts/mailer.text.erb
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/app/assets/javascripts/cable.js
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/channels/application_cable/connection.rb
-- spec/dummy/app/channels/application_cable/channel.rb
-- spec/dummy/bin/update
-- spec/dummy/bin/rake
-- spec/dummy/bin/setup
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
+- spec/dummy/bin/update
+- spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
 - spec/dummy/config/cable.yml
-- spec/dummy/config/environments/production.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
 - spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
-- spec/dummy/config/spring.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/puma.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/boot.rb
 - spec/dummy/config/initializers/application_controller_renderer.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/new_framework_defaults.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/new_framework_defaults.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/puma.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/spring.rb
 - spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/public/favicon.ico
+- spec/dummy/db/schema.rb
+- spec/dummy/log/development.log
+- spec/dummy/log/test.log
+- spec/dummy/public/404.html
 - spec/dummy/public/422.html
-- spec/dummy/public/apple-touch-icon.png
 - spec/dummy/public/500.html
-- spec/dummy/public/404.html
 - spec/dummy/public/apple-touch-icon-precomposed.png
-- spec/dummy/db/schema.rb
-- spec/dummy/log/development.log
-- spec/models/mks/auth/menu_spec.rb
-- spec/models/mks/auth/application_module_spec.rb
-- spec/models/mks/auth/user_role_spec.rb
-- spec/models/mks/auth/user_spec.rb
-- spec/support/factory_girl.rb
+- spec/dummy/public/apple-touch-icon.png
+- spec/dummy/public/favicon.ico
+- spec/dummy/Rakefile
+- spec/factories/application_modules.rb
 - spec/factories/menus.rb
 - spec/factories/user_roles.rb
-- spec/factories/application_modules.rb
 - spec/factories/users.rb
-- spec/controllers/mks/auth/users_controller_spec.rb
+- spec/models/mks/auth/application_module_spec.rb
+- spec/models/mks/auth/menu_spec.rb
+- spec/models/mks/auth/user_role_spec.rb
+- spec/models/mks/auth/user_spec.rb
 - spec/rails_helper.rb
+- spec/spec_helper.rb
+- spec/support/factory_girl.rb

data/app/controllers/mks/auth/access_controller.rb

@@ -1,51 +0,0 @@
-require_dependency 'mks/auth/application_controller'
-
-module Mks
-  module Auth
-    class AccessController < ApplicationController
-      before_action :confirm_logged_in, :except => [:attempt_login, :logout, :menu, :csrf_token]
-
-      def csrf_token
-        cookies['XSRF-TOKEN'] = form_authenticity_token if protect_against_forgery?
-        render json: {success: true}
-      end
-
-      def attempt_login
-        code = Rails.configuration.app_code
-        app_module = ApplicationModule.find_by(code: code)
-        user = User.find_by(email: params[:email].downcase)
-
-        if user && user.application_module.id == app_module.id
-          if user.authenticate(params[:password])
-            login_user user
-            roles = user.roles.map(&:name)
-            response = { success: true, data: {user_id: user.id, user_full_name: user.full_name, roles: roles }}
-            render json: response
-          else
-            render json: {success: false, errors: "Invalid username or password"}
-          end
-        else
-          render json: {success: false, errors: "User doesn't exist or is not allowed!"}
-        end
-      end
-
-      def logout
-        logout_user if logged_in?
-        render json: { success: true }
-      end
-
-      def menu
-        render json: {success: true, data: fetch_menus}
-      end
-
-      def check_login
-        if session[:user_id]
-          user = User.find(session[:user_id])
-          render json: {success: true, data: user.full_name}
-        else
-          render json: {success: false}
-        end
-      end
-    end
-  end
-end

data/app/helpers/mks/auth/access_helper.rb

@@ -1,47 +0,0 @@
-module Mks
-  module Auth
-    module AccessHelper
-      def login_user(user)
-        session[:user_id] = user.id
-      end
-
-      def current_user
-        @current_user ||= User.find_by(id: session[:user_id])
-      end
-
-      def logged_in?
-        !current_user.nil?
-      end
-
-      def logout_user
-        session.delete(:user_id)
-        @current_user = nil
-        @menus = nil
-      end
-
-      def fetch_menus
-        if @menus.nil?
-          roles = current_user.roles
-          app_module = current_user.application_module
-
-          @menus = []
-          roles.each do |role|
-            if role
-              menu_list = role.menus.where(:parent => nil, :application_module => app_module)
-              menu_list.each do |menu|
-                children = []
-                menu.children.order(:text).each do |child|
-                  if child.roles.include? role
-                    children << {'text': child.text, 'className': child.class_name, 'iconCls': child.icon_cls}
-                  end
-                end
-                @menus << {'text': menu.text, 'children': children, 'iconCls': menu.icon_cls}
-              end
-            end
-          end
-        end
-        @menus
-      end
-    end
-  end
-end

data/app/helpers/mks/auth/application_helper.rb

@@ -1,10 +0,0 @@
-module Mks
-  module Auth
-    module ApplicationHelper
-      def app_module
-        code = Rails.configuration.app_code
-        ApplicationModule.find_by(code: code)
-      end
-    end
-  end
-end