phcscriptcdnpro 28.0.0 → 29.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5071f55442461797ae657a0a5ffcb5d60d7457c
-  data.tar.gz: c118484fca8da0dfd70a7b8f3ff64d463b272e44
+  metadata.gz: 95d7c8400569c0013941ed7c49c11dfa6ea78920
+  data.tar.gz: 2417f0166616ceae75a6462b20f73e69a7dbea7d
 SHA512:
-  metadata.gz: 29bb1512268a6558cd84a5d5c01aaae6a935880ba272cac1ec7331a655181a8bd32413b7ffb127e6ae84734a951b70eb1922511285cc6aa626855668aa0c02fe
-  data.tar.gz: 852ffbf4781840995c2094fd1d9b6e12d21a5cc3a383c82507f418885abbe341126b6c005059ee141487434ebac78eb54693b991028c589b26f94c025e94f2aa
+  metadata.gz: 7e19bc3a21d7af833f6c08fdf26b6e0e7c905fa8bd8fb53acd4fc6ee0bd2cef7726e265237487fc25a8816d76455df3c78a57638f5cbb6e1fdbf62881b25a872
+  data.tar.gz: abb44b5065b7d9cad2f2b81942e301e564b0a69d569580f06da341189d4373ff0aa2c8eeb4bbf5b80eb4c1cc111516a0f3f2ea407c2237ace3f1473806c03215

data/app/controllers/phcscriptcdnpro/application_controller.rb

@@ -9,29 +9,6 @@ module Phcscriptcdnpro
     helper Phcnotifi::Engine.helpers
     helper Phcaccountspro::Engine.helpers
 
-    # AuthRocket Definitions
-    def require_user
-      unless current_user
-        params.permit!
-        session[:last_url] = request.get? ? url_for(params) : url_for
-        redirect_to new_login_url
-      end
-    end
-
-    def current_user
-      @_current_user ||= AuthRocket::Session.from_token(session[:ar_token]).try(:user)
-    end
-    helper_method :current_user
-
-    def new_login_url
-      ENV['AUTHROCKET_LOGIN_URL']
-    end
-    helper_method :new_login_url
-
-    def authrocket_membership_info
-      AuthRocket::Membership.all(user_id: current_user.id).first
-    end
-
     # Papertrail Whodunnit Username
     def user_for_paper_trail
       # Default is: current_user rescue nil

data/app/controllers/phcscriptcdnpro/script/authors_controller.rb

@@ -4,8 +4,7 @@ module Phcscriptcdnpro
   class Script::AuthorsController < ApplicationController
 
     # Security & Action Filters
-    before_action :require_user
-    before_action :authrocket_membership_info
+    before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_script_author, only: [:show, :edit, :update, :destroy]
 
@@ -23,6 +22,8 @@ module Phcscriptcdnpro
     # NEW - Script Author
     def new
       @script_author = Script::Author.new
+      @script_author.user_id = current_user.id
+      @script_author.org_id = current_user.org_id
     end
 
     # EDIT - Script Author
@@ -33,9 +34,7 @@ module Phcscriptcdnpro
     def create
       @script_author = Script::Author.new(script_author_params)
       @script_author.user_id = current_user.id
-      @script_author.user_name = current_user.username
-      @script_author.membership_id = authrocket_membership_info.id
-      @script_author.oganization_id = authrocket_membership_info.org_id
+      @script_author.org_id = current_user.org_id
       if @script_author.save
         redirect_to script_authors_url, notice: 'Author was successfully created.'
         else
@@ -46,9 +45,7 @@ module Phcscriptcdnpro
     # PATCH/PUT - Script Author
     def update
       @script_author.user_id = current_user.id
-      @script_author.user_name = current_user.username
-      @script_author.membership_id = authrocket_membership_info.id
-      @script_author.oganization_id = authrocket_membership_info.org_id
+      @script_author.org_id = current_user.org_id
       if @script_author.update(script_author_params)
           redirect_to script_authors_url, notice: 'Author was successfully updated.'
           else

data/app/controllers/phcscriptcdnpro/script/extensions_controller.rb

@@ -4,8 +4,7 @@ module Phcscriptcdnpro
   class Script::ExtensionsController < ApplicationController
 
     # Security & Action Filters
-    before_action :require_user
-    before_action :authrocket_membership_info
+    before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_script_extension, only: [:show, :edit, :update, :destroy]
 
@@ -23,6 +22,8 @@ module Phcscriptcdnpro
     # NEW - Script Extension
     def new
       @script_extension = Script::Extension.new
+      @script_extension.user_id = current_user.id
+      @script_extension.org_id = current_user.org_id
     end
 
     # EDIT - Script Extension
@@ -33,9 +34,7 @@ module Phcscriptcdnpro
     def create
       @script_extension = Script::Extension.new(script_extension_params)
       @script_extension.user_id = current_user.id
-      @script_extension.user_name = current_user.username
-      @script_extension.membership_id = authrocket_membership_info.id
-      @script_extension.oganization_id = authrocket_membership_info.org_id
+      @script_extension.org_id = current_user.org_id
       if @script_extension.save
         redirect_to script_extensions_url, notice: 'Extension was successfully created.'
         else
@@ -46,9 +45,7 @@ module Phcscriptcdnpro
     # PATCH/PUT - Script Extension
     def update
       @script_extension.user_id = current_user.id
-      @script_extension.user_name = current_user.username
-      @script_extension.membership_id = authrocket_membership_info.id
-      @script_extension.oganization_id = authrocket_membership_info.org_id
+      @script_extension.org_id = current_user.org_id
       if @script_extension.update(script_extension_params)
         redirect_to script_extensions_url, notice: 'Extension was successfully updated.'
         else

data/app/controllers/phcscriptcdnpro/script/licences_controller.rb

@@ -4,8 +4,7 @@ module Phcscriptcdnpro
   class Script::LicencesController < ApplicationController
 
     # Security & Action Filters
-    before_action :require_user
-    before_action :authrocket_membership_info
+    before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_script_licence, only: [:show, :edit, :update, :destroy]
 
@@ -23,6 +22,8 @@ module Phcscriptcdnpro
     # NEW - Script Licences
     def new
       @script_licence = Script::Licence.new
+      @script_licence.user_id = current_user.id
+      @script_licence.org_id = current_user.org_id
     end
 
     # EDIT - Script Licences
@@ -33,9 +34,7 @@ module Phcscriptcdnpro
     def create
       @script_licence = Script::Licence.new(script_licence_params)
       @script_licence.user_id = current_user.id
-      @script_licence.user_name = current_user.username
-      @script_licence.membership_id = authrocket_membership_info.id
-      @script_licence.oganization_id = authrocket_membership_info.org_id
+      @script_licence.org_id = current_user.org_id
       if @script_licence.save
         redirect_to script_licences_url, notice: 'Licence was successfully created.'
         else
@@ -46,9 +45,7 @@ module Phcscriptcdnpro
     # PATCH/PUT - Script Licences
     def update
       @script_licence.user_id = current_user.id
-      @script_licence.user_name = current_user.username
-      @script_licence.membership_id = authrocket_membership_info.id
-      @script_licence.oganization_id = authrocket_membership_info.org_id
+      @script_licence.org_id = current_user.org_id
       if @script_licence.update(script_licence_params)
         redirect_to script_licences_url, notice: 'Licence was successfully updated.'
         else

data/app/controllers/phcscriptcdnpro/script/listings_controller.rb

@@ -4,8 +4,7 @@ module Phcscriptcdnpro
   class Script::ListingsController < ApplicationController
 
     # Security & Action Filters
-    before_action :require_user
-    before_action :authrocket_membership_info
+    before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_script_listing, only: [:show, :edit, :update, :destroy]
 
@@ -23,6 +22,8 @@ module Phcscriptcdnpro
     # NEW - Script Listings
     def new
       @script_listing = Script::Listing.new
+      @script_listing.user_id = current_user.id
+      @script_listing.org_id = current_user.org_id
     end
 
     # EDIT - Script Listings
@@ -33,9 +34,7 @@ module Phcscriptcdnpro
     def create
       @script_listing = Script::Listing.new(script_listing_params)
       @script_listing.user_id = current_user.id
-      @script_listing.user_name = current_user.username
-      @script_listing.membership_id = authrocket_membership_info.id
-      @script_listing.oganization_id = authrocket_membership_info.org_id
+      @script_listing.org_id = current_user.org_id
       if @script_listing.save
         redirect_to script_listings_path, notice: 'Listing was successfully created.'
         else
@@ -46,9 +45,7 @@ module Phcscriptcdnpro
     # PATCH/PUT - Script Listings
     def update
       @script_listing.user_id = current_user.id
-      @script_listing.user_name = current_user.username
-      @script_listing.membership_id = authrocket_membership_info.id
-      @script_listing.oganization_id = authrocket_membership_info.org_id
+      @script_listing.org_id = current_user.org_id
       if @script_listing.update(script_listing_params)
         redirect_to script_listings_path, notice: 'Listing was successfully updated.'
       else

data/app/controllers/phcscriptcdnpro/script/urls_controller.rb

@@ -4,8 +4,7 @@ module Phcscriptcdnpro
   class Script::UrlsController < ApplicationController
 
     # Security & Action Filters
-    before_action :require_user
-    before_action :authrocket_membership_info
+    before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_script_url, only: [:show, :edit, :update, :destroy]
 
@@ -25,6 +24,8 @@ module Phcscriptcdnpro
     def new
       script_listing = Script::Listing.find(params[:listing_id])
       @script_url = script_listing.urls.build
+      @script_url.user_id = current_user.id
+      @script_url.org_id = current_user.org_id
     end
 
     # EDIT - Script Athors
@@ -38,9 +39,7 @@ module Phcscriptcdnpro
       @script_listing = Script::Listing.find(params[:listing_id])
       @script_url = @script_listing.urls.create(script_url_params)
       @script_url.user_id = current_user.id
-      @script_url.user_name = current_user.username
-      @script_url.membership_id = authrocket_membership_info.id
-      @script_url.oganization_id = authrocket_membership_info.org_id
+      @script_url.org_id = current_user.org_id
       if @script_url.save
         redirect_to script_listing_urls_path, notice: 'Author was successfully created.'
         else
@@ -51,9 +50,7 @@ module Phcscriptcdnpro
     # PATCH/PUT - Script Athors
     def update
       @script_url.user_id = current_user.id
-      @script_url.user_name = current_user.username
-      @script_url.membership_id = authrocket_membership_info.id
-      @script_url.oganization_id = authrocket_membership_info.org_id
+      @script_url.org_id = current_user.org_id
       if @script_url.update(script_url_params)
         redirect_to script_listing_urls_path, notice: 'Author was successfully updated.'
         else

data/app/controllers/phcscriptcdnpro/script/versions_controller.rb

@@ -4,8 +4,7 @@ module Phcscriptcdnpro
   class Script::VersionsController < ApplicationController
 
     # Security & Action Filters
-    before_action :require_user
-    before_action :authrocket_membership_info
+    before_action :authenticate_user!
     before_action :set_paper_trail_whodunnit
     before_action :set_script_version, only: [:show, :edit, :update, :destroy]
 
@@ -23,6 +22,8 @@ module Phcscriptcdnpro
     # NEW - Script Versions
     def new
       @script_version = Script::Version.new
+      @script_version.user_id = current_user.id
+      @script_version.org_id = current_user.org_id
     end
 
     # EDIT - Script Versions
@@ -33,9 +34,7 @@ module Phcscriptcdnpro
     def create
       @script_version = Script::Version.new(script_version_params)
       @script_version.user_id = current_user.id
-      @script_version.user_name = current_user.username
-      @script_version.membership_id = authrocket_membership_info.id
-      @script_version.oganization_id = authrocket_membership_info.org_id
+      @script_version.org_id = current_user.org_id
       if @script_version.save
         redirect_to script_versions_url, notice: 'Version was successfully created.'
         else
@@ -46,9 +45,7 @@ module Phcscriptcdnpro
     # PATCH/PUT - Script Versions
     def update
       @script_version.user_id = current_user.id
-      @script_version.user_name = current_user.username
-      @script_version.membership_id = authrocket_membership_info.id
-      @script_version.oganization_id = authrocket_membership_info.org_id
+      @script_version.org_id = current_user.org_id
       if @script_version.update(script_version_params)
         redirect_to script_versions_url, notice: 'Version was successfully updated.'
         else

data/db/migrate/20160821183652_create_phcscriptcdnpro_script_listings.rb

@@ -21,9 +21,7 @@ class CreatePhcscriptcdnproScriptListings < ActiveRecord::Migration[5.1]
       t.string :slug
 
       t.string :user_id
-      t.string :user_name
-      t.string :membership_id
-      t.string :oganization_id
+      t.string :org_id
 
       t.references :version
       t.references :licence

data/db/migrate/20160821183714_create_phcscriptcdnpro_script_authors.rb

@@ -13,9 +13,7 @@ class CreatePhcscriptcdnproScriptAuthors < ActiveRecord::Migration[5.1]
       t.string :slug
 
       t.string :user_id
-      t.string :user_name
-      t.string :membership_id
-      t.string :oganization_id
+      t.string :org_id
 
       t.timestamps
 

data/db/migrate/20160821183735_create_phcscriptcdnpro_script_extensions.rb

@@ -10,9 +10,7 @@ class CreatePhcscriptcdnproScriptExtensions < ActiveRecord::Migration[5.1]
       t.string :slug
 
       t.string :user_id
-      t.string :user_name
-      t.string :membership_id
-      t.string :oganization_id
+      t.string :org_id
 
       t.timestamps
 

data/db/migrate/20160821183805_create_phcscriptcdnpro_script_licences.rb

@@ -17,9 +17,7 @@ class CreatePhcscriptcdnproScriptLicences < ActiveRecord::Migration[5.1]
       t.string :slug
 
       t.string :user_id
-      t.string :user_name
-      t.string :membership_id
-      t.string :oganization_id
+      t.string :org_id
 
       t.timestamps
 

data/db/migrate/20160821183830_create_phcscriptcdnpro_script_urls.rb

@@ -14,9 +14,7 @@ class CreatePhcscriptcdnproScriptUrls < ActiveRecord::Migration[5.1]
       t.string :slug
 
       t.string :user_id
-      t.string :user_name
-      t.string :membership_id
-      t.string :oganization_id
+      t.string :org_id
 
       t.timestamps
 

data/db/migrate/20160821183946_create_phcscriptcdnpro_script_versions.rb

@@ -8,9 +8,7 @@ class CreatePhcscriptcdnproScriptVersions < ActiveRecord::Migration[5.1]
       t.string :slug
 
       t.string :user_id
-      t.string :user_name
-      t.string :membership_id
-      t.string :oganization_id
+      t.string :org_id
 
       t.timestamps
 

data/db/migrate/20170517064049_create_phcscriptcdnpro_listing_versions.rb

@@ -10,6 +10,7 @@ class CreatePhcscriptcdnproListingVersions < ActiveRecord::Migration[5.1]
       t.text     :object, limit: TEXT_BYTES
       t.datetime :created_at
     end
+
     add_index :phcscriptcdnpro_listing_versions, %i(item_type item_id), :name => 'scriptcdnpro_listing_versions'
 
   end

data/db/migrate/20170517064114_create_phcscriptcdnpro_scriptversion_versions.rb

@@ -10,6 +10,7 @@ class CreatePhcscriptcdnproScriptversionVersions < ActiveRecord::Migration[5.1]
       t.text     :object, limit: TEXT_BYTES
       t.datetime :created_at
     end
+
     add_index :phcscriptcdnpro_scriptversion_versions, %i(item_type item_id), :name => 'scriptcdnpro_scriptversion_versions'
 
   end

data/db/migrate/20170517064150_create_phcscriptcdnpro_url_versions.rb

@@ -10,6 +10,7 @@ class CreatePhcscriptcdnproUrlVersions < ActiveRecord::Migration[5.1]
       t.text     :object, limit: TEXT_BYTES
       t.datetime :created_at
     end
+
     add_index :phcscriptcdnpro_url_versions, %i(item_type item_id), :name => 'scriptcdnpro_url_versions'
 
   end

data/db/migrate/20170517064208_create_phcscriptcdnpro_author_versions.rb

@@ -10,6 +10,7 @@ class CreatePhcscriptcdnproAuthorVersions < ActiveRecord::Migration[5.1]
       t.text     :object, limit: TEXT_BYTES
       t.datetime :created_at
     end
+
     add_index :phcscriptcdnpro_author_versions, %i(item_type item_id), :name => 'scriptcdnpro_author_versions'
 
   end

data/db/migrate/20170517064427_create_phcscriptcdnpro_licence_versions.rb

@@ -10,6 +10,7 @@ class CreatePhcscriptcdnproLicenceVersions < ActiveRecord::Migration[5.1]
       t.text     :object, limit: TEXT_BYTES
       t.datetime :created_at
     end
+
     add_index :phcscriptcdnpro_licence_versions, %i(item_type item_id), :name => 'scriptcdnpro_licence_versions'
 
   end

data/lib/phcscriptcdnpro/version.rb

@@ -1,3 +1,3 @@
 module Phcscriptcdnpro
-  VERSION = "28.0.0"
+  VERSION = "29.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phcscriptcdnpro
 version: !ruby/object:Gem::Version
-  version: 28.0.0
+  version: 29.0.0
 platform: ruby
 authors:
 - BradPotts