mks_auth 1.0.14 → 1.2.0

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

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

data/app/jobs/mks_auth/application_job.rb

@@ -0,0 +1,4 @@
+module MksAuth
+  class ApplicationJob < ActiveJob::Base
+  end
+end

data/app/mailers/mks_auth/application_mailer.rb

@@ -0,0 +1,6 @@
+module MksAuth
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
+end

data/app/models/mks/auth/application_module.rb

@@ -1,12 +1,12 @@
 module Mks
   module Auth
-    # A model class to represent applications / modules
     class ApplicationModule < ApplicationRecord
+      #self.table_name = 'mks_application_modules'
+
       validates :code, presence: true
       validates :code, presence: true, uniqueness: true
 
-      has_and_belongs_to_many :users, class_name: 'Mks::Auth::User',
-                                      join_table: 'mks_auth_users_application_modules'
+      has_many :users, class_name: 'Mks::Auth::User'
       has_many :menus, class_name: 'Mks::Auth::Menu'
     end
   end

data/app/models/mks/auth/menu.rb

@@ -1,12 +1,12 @@
 module Mks
   module Auth
-    # A model class to represent menu items of a module
     class Menu < ApplicationRecord
+      # self.table_name = 'mks_menus'
+
       belongs_to :application_module, class_name: 'Mks::Auth::ApplicationModule'
       belongs_to :parent, class_name: 'Mks::Auth::Menu', optional: true
-      has_many :children, class_name: 'Mks::Auth::Menu', foreign_key: 'parent_id'
-      has_and_belongs_to_many :roles, class_name: 'Mks::Auth::UserRole',
-                                      join_table: 'mks_auth_menus_user_roles'
+      has_many :children, class_name: 'Mks::Auth::Menu', :foreign_key => 'parent_id'
+      has_and_belongs_to_many :roles, class_name: 'Mks::Auth::UserRole', :join_table => :mks_auth_menus_user_roles
     end
   end
-end
+end

data/app/models/mks/auth/user.rb

@@ -1,50 +1,24 @@
-# frozen_string_literal: true
-
 module Mks
   module Auth
-    # A model class to represent users of the system
     class User < ApplicationRecord
-      has_and_belongs_to_many :application_modules,
-                              class_name: 'Mks::Auth::ApplicationModule',
-                              join_table: 'mks_auth_users_application_modules'
-      has_and_belongs_to_many :roles, class_name: 'Mks::Auth::UserRole',
-                                      join_table: 'mks_auth_users_user_roles'
+      # self.table_name = 'mks_users'
+
+      belongs_to :application_module, class_name: 'Mks::Auth::ApplicationModule'
+      has_and_belongs_to_many :roles, class_name: 'Mks::Auth::UserRole', join_table: :mks_auth_users_user_roles
       has_secure_password
 
       before_save { email.downcase! }
 
-        VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-      validates :first_name, presence: true, length: { maximum: 30 }
-      validates :last_name, presence: true, length: { maximum: 30 }
-      validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }, uniqueness: { case_sensitive: false }
+      VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
+      validates :first_name, presence: true, length: {maximum: 30}
+      validates :last_name, presence: true, length: {maximum: 30}
+      validates :email, presence: true, format: { with: VALID_EMAIL_REGEX }, uniqueness: {case_sensitive: false}
       validates :password, length: { minimum: 6 }
       validates :active, presence: true
 
       def full_name
         "#{first_name} #{last_name}"
       end
-
-      def role_names
-        roles.map(&:name)
-      end
-
-      def to_token_payload
-        { id: id, email: email, name: full_name, roles: role_names }
-      end
-
-      def has_module(code)
-        app_module = ApplicationModule.find_by(code: code)
-        roles = self.roles.select { |ur| ur.application_module == app_module }
-        roles.count.positive?
-      end
-
-      def role?(role)
-        roles.any? { |r| r.name.underscore.to_sym == role }
-      end
-
-      def any_role?(role_list)
-        roles.any? { |r| role_list.include?(r.name.underscore.to_sym) }
-      end
     end
   end
-end
+end

data/app/models/mks/auth/user_role.rb

@@ -1,16 +1,11 @@
 module Mks
   module Auth
-    # A model to represent various roles of users in the system
     class UserRole < ApplicationRecord
-      validates :name, presence: true, uniqueness: true
-
-      belongs_to :application_module
-      has_and_belongs_to_many :users, join_table: 'mks_auth_users_user_roles'
-      has_and_belongs_to_many :menus, join_table: 'mks_auth_menus_user_roles'
+       # self.table_name = 'mks_user_roles'
 
-      def sym_name
-        name.underscore.to_sym
-      end
+      validates :name, presence: true, uniqueness: true
+      has_and_belongs_to_many :users, :join_table => :mks_auth_users_user_roles
+      has_and_belongs_to_many :menus, :join_table => :mks_auth_menus_user_roles
     end
   end
-end
+end

data/config/routes.rb

@@ -1,28 +1,32 @@
-# frozen_string_literal: true
-
 Mks::Auth::Engine.routes.draw do
+  get '/csrf_token', to: 'access#csrf_token'
+
+  get '/attempt_login', to: 'access#attempt_login'
+
+  get '/logout', to: 'access#logout'
+
+  get '/menu', to: 'access#menu'
 
-  post '/login', controller: :users, action: :login
+  get '/check_login', to: 'access#check_login'
+
+  post '/login', to: 'access#attempt_login'
 
   resources :application_modules
 
-  resources :users, except: %i[new edit show destroy]
+  # get '/users', to: 'users#index'
+
+  resources :users, except: [:new, :edit, :show, :destroy]
+
+  get '/users/roles', controller: :users, action: :roles
 
-  resources :users do
-    member do
-      get 'roles', controller: :users, action: :roles
-      get 'menus', controller: :menus, action: :menus
-      get 'user_roles', controller: :users, action: :user_roles
-      post 'user_roles', controller: :users, action: :save_selected_roles
-    end
-  end
+  get '/users/fetch_by_role', to: 'users#fetch_by_role'
 
-  resources :user_roles, except: %i[new edit show destroy]
+  # get '/user_roles', to: 'user_roles#index'
 
-  get '/user_roles/:id/users', controller: :user_roles, action: :users
+  resource :user_roles, except: [:new, :edit, :show, :destroy]
 
-  post '/users/:id/assign_roles', controller: :user_roles, action: :assign_roles
+  post '/assign_roles', to: 'user_roles#assign_roles'
 
-  get '/users/:id/assigned_roles', controller: :user_roles, action: :assigned_roles
+  get '/assigned_roles/:user_id', to: 'user_roles#get_assigned_roles'
 
 end

data/db/migrate/20161029065810_create_mks_auth_application_modules.rb

@@ -1,4 +1,4 @@
-class CreateMksAuthApplicationModules < ActiveRecord::Migration[5.2]
+class CreateMksAuthApplicationModules < ActiveRecord::Migration[5.0]
   def change
     create_table :mks_auth_application_modules do |t|
       t.string :code, unique: true, null: false

data/db/migrate/20161029065959_create_mks_auth_users.rb

@@ -1,13 +1,16 @@
-class CreateMksAuthUsers < ActiveRecord::Migration[5.2]
+class CreateMksAuthUsers < ActiveRecord::Migration[5.0]
   def change
     create_table :mks_auth_users do |t|
       t.string :first_name, null: false
       t.string :last_name, null: false
       t.string :email, null: false
       t.boolean :active, null: false, default: true
+      t.references :application_module, index: true
       t.string :password_digest
 
       t.timestamps
     end
+
+    add_foreign_key :mks_auth_users, :mks_auth_application_modules, :column => :application_module_id
   end
 end

data/db/migrate/20161029070807_create_mks_auth_user_roles.rb

@@ -1,10 +1,9 @@
-class CreateMksAuthUserRoles < ActiveRecord::Migration[5.2]
+class CreateMksAuthUserRoles < ActiveRecord::Migration[5.0]
   def change
     create_table :mks_auth_user_roles do |t|
       t.string :name, null: false
-      t.references :application_module, index: true
+
       t.timestamps
     end
-    add_foreign_key :mks_auth_user_roles, :mks_auth_application_modules, column: :application_module_id
   end
 end

data/db/migrate/20161029071047_create_mks_users_user_roles.rb

@@ -1,11 +1,11 @@
-class CreateMksUsersUserRoles < ActiveRecord::Migration[5.2]
+class CreateMksUsersUserRoles < ActiveRecord::Migration[5.0]
   def change
     create_table :mks_auth_users_user_roles, id: false do |t|
       t.references :user, index: false
       t.references :user_role, index: false
     end
-    add_index :mks_auth_users_user_roles, %i[user_id user_role_id]
-    add_foreign_key :mks_auth_users_user_roles, :mks_auth_users, column: :user_id
-    add_foreign_key :mks_auth_users_user_roles, :mks_auth_user_roles, column: :user_role_id
+    add_index :mks_auth_users_user_roles, [:user_id, :user_role_id]
+    add_foreign_key :mks_auth_users_user_roles, :mks_auth_users, :column => :user_id
+    add_foreign_key :mks_auth_users_user_roles, :mks_auth_user_roles, :column => :user_role_id
   end
 end

data/db/migrate/20161029072256_create_mks_auth_menus.rb

@@ -1,4 +1,4 @@
-class CreateMksAuthMenus < ActiveRecord::Migration[5.2]
+class CreateMksAuthMenus < ActiveRecord::Migration[5.0]
   def change
     create_table :mks_auth_menus do |t|
       t.string :text, null: false
@@ -11,7 +11,7 @@ class CreateMksAuthMenus < ActiveRecord::Migration[5.2]
       t.timestamps
     end
 
-    add_foreign_key :mks_auth_menus, :mks_auth_menus, column: :parent_id
-    add_foreign_key :mks_auth_menus, :mks_auth_application_modules, column: :application_module_id
+    add_foreign_key :mks_auth_menus, :mks_auth_menus, :column => :parent_id
+    add_foreign_key :mks_auth_menus, :mks_auth_application_modules, :column => :application_module_id
   end
 end

data/db/migrate/20161029074023_create_mks_menus_user_roles.rb

@@ -1,11 +1,11 @@
-class CreateMksMenusUserRoles < ActiveRecord::Migration[5.2]
+class CreateMksMenusUserRoles < ActiveRecord::Migration[5.0]
   def change
     create_table :mks_auth_menus_user_roles do |t|
       t.references :menu, index: false
       t.references :user_role, index: false
     end
     add_index :mks_auth_menus_user_roles, [:menu_id, :user_role_id]
-    add_foreign_key :mks_auth_menus_user_roles, :mks_auth_menus, column: :menu_id
-    add_foreign_key :mks_auth_menus_user_roles, :mks_auth_user_roles, column: :user_role_id
+    add_foreign_key :mks_auth_menus_user_roles, :mks_auth_menus, :column => :menu_id
+    add_foreign_key :mks_auth_menus_user_roles, :mks_auth_user_roles, :column => :user_role_id
   end
 end

data/lib/mks/auth/engine.rb

@@ -4,18 +4,25 @@ module Mks
       isolate_namespace Mks::Auth
 
       initializer :append_migrations do |app|
-        unless app.root.to_s.match? root.to_s
-          config.paths['db/migrate'].expanded.each do |expanded_path|
-            app.config.paths['db/migrate'] << expanded_path
+        unless app.root.to_s.match root.to_s
+          if app.config.app_code == 'PSH'
+            config.paths['db/migrate'].expanded.each do |expanded_path|
+              app.config.paths['db/migrate'] << expanded_path
+            end
           end
         end
       end
 
+      initializer 'mks_auth.factories', :after => 'factory_girl.set_factory_paths' do
+        FactoryGirl.definition_file_paths << File.expand_path('../../../../spec/factories', __FILE__) if defined?(FactoryGirl)
+      end
+
       config.generators do |g|
-        g.test_framework :rspec, fixture: false
+        g.test_framework :rspec, :fixture => false
+        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
         g.assets false
         g.helper false
       end
     end
   end
-end
+end

data/lib/mks/auth/version.rb

@@ -1,5 +1,5 @@
 module Mks
   module Auth
-    VERSION = '1.0.14'.freeze
+    VERSION = '1.2.0'
   end
 end

data/lib/mks_auth.rb

@@ -1,3 +1,2 @@
 require 'mks/auth'
 require 'mks/auth/engine'
-require 'mks/auth/token_auth'

data/spec/controllers/mks/auth/users_controller_spec.rb

@@ -1,5 +1,4 @@
 require 'rails_helper'
-require 'mks/auth/token_auth'
 
 module Mks
   module Auth
@@ -9,99 +8,11 @@ module Mks
       describe 'GET #roles' do
         it 'gets roles of a user' do
           u = create(:user)
-          token = Mks::Auth::TokenAuth.issue(name: u.full_name, email: u.email, id: u.id)
-          request.headers['Authorization'] = "Bearer #{token}"
-
           roles = [create(:user_role), create(:user_role)]
           u.roles << roles
-          get :roles, params: { id: u.id }
-          result = JSON(response.body)
-          expect(result.count).to eq 2
-        end
-      end
-
-      describe 'GET #user_roles' do
-        it 'fetches roles' do
-          app_module = create(:application_module, code: 'DUMMY')
-          u = create(:user, application_modules: [app_module])
-          token = Mks::Auth::TokenAuth.issue(name: u.full_name, email: u.email, id: u.id)
-          request.headers['Authorization'] = "Bearer #{token}"
-
-          r1 = create(:user_role, application_module: app_module)
-          r2 = create(:user_role, application_module: app_module)
-          u.roles << r1
-
-          get :user_roles, params: { id: u.id }
-          result = JSON(response.body)
-          expect(result.count).to eq 2
-          expect(result.select { |r| r['id'] == r1.id }[0]['selected']).to be_truthy
-          expect(result.select { |r| r['id'] == r2.id }[0]['selected']).to be_falsey
-        end
-      end
-
-      describe 'POST #create' do
-        it 'creates a new user' do
-          app_module = create(:application_module, code: 'DUMMY')
-          u = create(:user, application_modules: [app_module])
-          token = Mks::Auth::TokenAuth.issue(name: u.full_name, email: u.email, id: u.id)
-          request.headers['Authorization'] = "Bearer #{token}"
-
-          user = {
-            first_name: 'test user',
-            last_name: 'test user',
-            email: 'test@test.com',
-            password: 'test123',
-            password_confirmation: 'test123'
-          }
-
-          count = User.count
-          post :create, params: { user: user }
-          result = JSON(response.body)
-          expect(result['success']).to be_truthy
-          expect(User.count).to eq count + 1
-        end
-      end
-
-      describe 'POST #save_selected_roles' do
-        it 'saves selected user roles' do
-          app_module = create(:application_module, code: 'DUMMY')
-          u = create(:user, application_modules: [app_module])
-          token = Mks::Auth::TokenAuth.issue(name: u.full_name, email: u.email, id: u.id)
-          request.headers['Authorization'] = "Bearer #{token}"
-
-          r1 = create(:user_role, application_module: app_module)
-          r2 = create(:user_role, application_module: app_module)
-
-          roles = [
-            { id: r1.id, selected: true },
-            { id: r2.id, selected: true }
-          ]
-
-          post :save_selected_roles, params: { id: u.id, roles: roles }
-          u.reload
-          expect(u.roles.count).to eq 2
-        end
-      end
-
-      describe 'POST #login' do
-        it 'returns a jwt token for correct credentials' do
-          m = create(:application_module)
-          ur = create(:user_role, application_module: m)
-          u = create(:user, password: '123456', password_confirmation: '123456', roles: [ur], application_modules: [m])
-          auth = { email: u.email, password: '123456', app_module: m.code }
-          token = Mks::Auth::TokenAuth.issue(u.to_token_payload)
-          post :login, params: { auth: auth }
-
+          get :roles, session: { user_id: u.id }
           result = JSON(response.body)
-          expect(result['jwt']).to eq token
-        end
-
-        it 'returns a 401 status for failed logins' do
-          u = create(:user)
-          auth = { email: u.email, password: '123456' }
-          post :login, params: { auth: auth }
-
-          expect(response.status).to eq 400
+          expect(result['data'].count).to eq 2
         end
       end
     end

data/spec/dummy/config/application.rb

@@ -15,8 +15,6 @@ require "mks_auth"
 
 module Dummy
   class Application < Rails::Application
-    config.auth_secret = '31a70abfaa57e5e77a3fc9f27aeaaf59b9a9f5355b5e16c842ee172035a8ed40bf82c1c971ecc176e4f0b4c9e6141db07fd4a5af3f7db9265e719fbe340b105a'
-    config.app_code = 'DUMMY'
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.

data/spec/dummy/config/database.yml

@@ -6,20 +6,18 @@
 #
 default: &default
   adapter: postgresql
-  host: localhost
-  port: 5433
   pool: 5
   timeout: 5000
-  user: postgres
+  user: henock
   pass:
 
 development:
   <<: *default
-  database: construction_development
+  database: logistics_development
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   <<: *default
-  database: construction_test
+  database: logistics_test