kadmin 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51c3cae4ed7c833aa663c74fa0ab036f3976c273869df2613721499d4d297d12
-  data.tar.gz: ddf52353bb65ec10d8865ad6e18535d4dcf02bdb7dfbfd93f8da6405f6f4ccf6
+  metadata.gz: b3aa3a7daa8c814970c094dc05160e8d8fa64abd57141bc784078e4022802c34
+  data.tar.gz: 754a7866c1f92826a4f3ddf194a1bf368524b3815fc5837369fe8f304afd3817
 SHA512:
-  metadata.gz: 4237584dd64f1e5c1f76adb2c1f1b465075742a12b05786e62f46a5f77b8b54e35cc99d38f68289d6f3b5e41e85998c7486580e1e98491c763ea4de79670586a
-  data.tar.gz: 5529f972678b909a6288796de6c0b8c829412c8835df306040ccf109961f061d55c56e77139a15cd8decc57096175c68a7da17f414da489618f0e1d6422e1eaf
+  metadata.gz: 9e740d139e1adf2a4484abf74f098e6862a23b544a4bd29d4ae45e139c2d9382498c0e9688469e0a616cb520f318926fe253ea40122d870ace04c2cc5d55a4ac
+  data.tar.gz: b12534a69b80d530b9a604e2f00fb776c869b95e3cecd3b693a28c765d5c5cb28a896c05490d530179d9aa43179f7fc996a4e0666ba05be105d51a4292c10598

data/app/views/layouts/kadmin/application.html.erb

@@ -22,7 +22,7 @@
 					<div class="header-block header-block-nav">
 						<ul class="nav-profile">
 						  <% if logged_in? %>
-								<li><%= authorized_user.organization %></li>
+								<li style="padding-right: 10px;"><%= authorized_user.organization %></li>
 								<li><%= link_to(t('kadmin.authorization.logout'), Kadmin::Engine.routes.url_helpers.auth_logout_path) %></li>
 							<% end %>
 						</ul>

data/lib/kadmin/auth/user_store.rb

@@ -1,9 +1,17 @@
 module Kadmin
   module Auth
     class UserStore
-      def initialize
+      def initialize(path = nil)
         @store = {}
-        load_users!
+
+        path ||= Rails.root.join('config', 'admin_users.yml')
+        if File.exist?(path) && File.readable?(path)
+          definitions = YAML.load_file(path.to_s)
+          create_organizations(definitions['organizations'])
+          load_users(definitions['users'])
+        else
+          Rails.logger.warn("Can't read admin users auth file at #{file}. Auth might not work")
+        end
       end
 
       def get(email)
@@ -18,25 +26,26 @@ module Kadmin
         @store.key?(email.to_s.downcase)
       end
 
-      def load_users!
-        file = Rails.root.join('config', 'admin_users.yml')
-        if File.exist?(file) && File.readable?(file)
-          definitions = YAML.load_file(file.to_s)
-          definitions.each do |definition|
-            email = definition['email']
-            options = {
-              admin: definition.fetch('admin', false),
-              accept: Array.wrap(definition.fetch('accept', [])).map(&:to_sym),
-              organization: definition.fetch('organization', 'offerista') # default organization, needs to exist in DB
-            }
-
-            set(email, Kadmin::Auth.config.user_class.new(email, **options))
-          end
-        else
-          Rails.logger.warn("Can't read admin users auth file at #{file}. Auth might not work")
+      private
+
+      def load_users(users)
+        users.each do |user|
+          email = user['email']
+          options = {
+            admin: user.fetch('admin', false),
+            accept: Array.wrap(user.fetch('accept', [])).map(&:to_sym),
+            organization: user.fetch('organization', 'offerista') # default organization, needs to exist in DB
+          }
+
+          set(email, Kadmin::Auth.config.user_class.new(email, **options))
+        end
+      end
+
+      def create_organizations(organizations)
+        organizations.each do |organization|
+          Kadmin::Organization.find_or_create_by(name: organization)
         end
       end
-      private :load_users!
     end
   end
 end

data/lib/kadmin/version.rb

@@ -1,3 +1,3 @@
 module Kadmin
-  VERSION = '1.0.3'.freeze
+  VERSION = '1.0.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kadmin
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Nicolas Pepin-Perreault
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Collection of utility, configuration, etc., for admin areas