mks_auth 1.0.10 → 1.2.0

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,31 +1,32 @@
-# frozen_string_literal: true
-
 Mks::Auth::Engine.routes.draw do
+  get '/csrf_token', to: 'access#csrf_token'
 
-  post '/login', controller: :users, action: :login
+  get '/attempt_login', to: 'access#attempt_login'
 
-  resources :application_modules
+  get '/logout', to: 'access#logout'
+
+  get '/menu', to: 'access#menu'
 
-  resources :users, except: %i[new edit show destroy]
+  get '/check_login', to: 'access#check_login'
+
+  post '/login', to: 'access#attempt_login'
+
+  resources :application_modules
 
-  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', to: 'users#index'
 
+  resources :users, except: [:new, :edit, :show, :destroy]
 
+  get '/users/roles', controller: :users, action: :roles
 
+  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.10'.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

data/spec/dummy/config/initializers/new_framework_defaults.rb

@@ -18,7 +18,7 @@ ActiveSupport.to_time_preserves_timezone = true
 Rails.application.config.active_record.belongs_to_required_by_default = true
 
 # Do not halt callback chains when a callback returns false. Previous versions had true.
-# ActiveSupport.halt_callback_chains_on_return_false = false
+ActiveSupport.halt_callback_chains_on_return_false = false
 
 # Configure SSL options to enable HSTS with subdomains. Previous versions had false.
 Rails.application.config.ssl_options = { hsts: { subdomains: true } }

data/spec/dummy/db/schema.rb

@@ -10,74 +10,66 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2018_02_01_104912) do
+ActiveRecord::Schema.define(version: 20161029074023) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
   create_table "mks_auth_application_modules", force: :cascade do |t|
-    t.string "code", null: false
-    t.string "name", null: false
+    t.string   "code",       null: false
+    t.string   "name",       null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "mks_auth_menus", force: :cascade do |t|
-    t.string "text", null: false
-    t.string "icon_cls"
-    t.string "class_name"
-    t.string "location"
-    t.integer "parent_id"
-    t.bigint "application_module_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["application_module_id"], name: "index_mks_auth_menus_on_application_module_id"
-    t.index ["parent_id"], name: "index_mks_auth_menus_on_parent_id"
+    t.string   "text",                  null: false
+    t.string   "icon_cls"
+    t.string   "class_name"
+    t.string   "location"
+    t.integer  "parent_id"
+    t.integer  "application_module_id"
+    t.datetime "created_at",            null: false
+    t.datetime "updated_at",            null: false
+    t.index ["application_module_id"], name: "index_mks_auth_menus_on_application_module_id", using: :btree
+    t.index ["parent_id"], name: "index_mks_auth_menus_on_parent_id", using: :btree
   end
 
   create_table "mks_auth_menus_user_roles", force: :cascade do |t|
-    t.bigint "menu_id"
-    t.bigint "user_role_id"
-    t.index ["menu_id", "user_role_id"], name: "index_mks_auth_menus_user_roles_on_menu_id_and_user_role_id"
+    t.integer "menu_id"
+    t.integer "user_role_id"
+    t.index ["menu_id", "user_role_id"], name: "index_mks_auth_menus_user_roles_on_menu_id_and_user_role_id", using: :btree
   end
 
   create_table "mks_auth_user_roles", force: :cascade do |t|
-    t.string "name", null: false
-    t.bigint "application_module_id"
+    t.string   "name",       null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["application_module_id"], name: "index_mks_auth_user_roles_on_application_module_id"
   end
 
   create_table "mks_auth_users", force: :cascade do |t|
-    t.string "first_name", null: false
-    t.string "last_name", null: false
-    t.string "email", null: false
-    t.boolean "active", default: true, null: false
-    t.string "password_digest"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "mks_auth_users_application_modules", id: false, force: :cascade do |t|
-    t.bigint "user_id"
-    t.bigint "application_module_id"
-    t.index ["user_id", "application_module_id"], name: "am_on_users_indx"
+    t.string   "first_name",                           null: false
+    t.string   "last_name",                            null: false
+    t.string   "email",                                null: false
+    t.boolean  "active",                default: true, null: false
+    t.integer  "application_module_id"
+    t.string   "password_digest"
+    t.datetime "created_at",                           null: false
+    t.datetime "updated_at",                           null: false
+    t.index ["application_module_id"], name: "index_mks_auth_users_on_application_module_id", using: :btree
   end
 
   create_table "mks_auth_users_user_roles", id: false, force: :cascade do |t|
-    t.bigint "user_id"
-    t.bigint "user_role_id"
-    t.index ["user_id", "user_role_id"], name: "index_mks_auth_users_user_roles_on_user_id_and_user_role_id"
+    t.integer "user_id"
+    t.integer "user_role_id"
+    t.index ["user_id", "user_role_id"], name: "index_mks_auth_users_user_roles_on_user_id_and_user_role_id", using: :btree
   end
 
   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_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_user_roles", "mks_auth_application_modules", column: "application_module_id"
-  add_foreign_key "mks_auth_users_application_modules", "mks_auth_application_modules", column: "application_module_id"
-  add_foreign_key "mks_auth_users_application_modules", "mks_auth_users", column: "user_id"
+  add_foreign_key "mks_auth_users", "mks_auth_application_modules", column: "application_module_id"
   add_foreign_key "mks_auth_users_user_roles", "mks_auth_user_roles", column: "user_role_id"
   add_foreign_key "mks_auth_users_user_roles", "mks_auth_users", column: "user_id"
 end