dina 0.7.0.0 → 0.7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f683d4b9e156194f6c356e5ebfbd46fcb6f821548403cb5821357d0813d5ba6a
-  data.tar.gz: 867eef99e2ffb402420f425f495c4b44f4b5e98dbf955383d7fe39215f8d1104
+  metadata.gz: 5a0d3f25267c47fba2fa7e0cf5df80602065c1d182578d48522d0f1f81815fef
+  data.tar.gz: cf53d98747de1528002a5e4c9b88c8e245ff98e2beebfb5d1a9c3047f38bff33
 SHA512:
-  metadata.gz: 815c80204d71ac6eb567ff3aee545123d582573a38d4602b85a18b20c2200837323a57e515663790951691ce642c8865ef0587532a6acefd1cc9dc378051d779
-  data.tar.gz: 4a8d252554cc5eff4a76ee00970a525ba15d805eee63ec026832ddd9ad5eeeeafac2e5eefb5667ab7ea9c22eb9ee5cca92f639492e5b6b7ea0c0a157a58a35e4
+  metadata.gz: f80d1a0565a76412d07a4367d4c6b1085c5042fcac24d83d231d5699c071da560219a11451a9928f01df4702233bfe70dfff7bfca267b7e1aac7a0f0b2c443bf
+  data.tar.gz: d462deb63117f46c998df5ff471d9a809289bce7f411c9b6a50447e71b87c9826e134e881812205003a6c8f03440d7506c33d46cb7401aa66e169ec8c606f1ac

data/lib/dina/authentication/authentication.rb

@@ -4,8 +4,6 @@ module Dina
   class Authentication
 
     class << self
-      attr_accessor :endpoint_url
-
       def instance
         Thread.current[:dina_authentication] ||= new
       end
@@ -13,12 +11,12 @@ module Dina
 
     def initialize
       @token = nil
-      @endpoint_url = nil
-      @token_store_file = nil
-      @user = nil
-      @password = nil
-      @server_name = nil
-      @client_id = nil
+      @config = nil
+      @opts = default_opts
+    end
+
+    def config
+      @config ||= OpenStruct.new(@opts)
     end
 
     # Sets Authentication configuration
@@ -35,31 +33,27 @@ module Dina
     # }
     #
     # @param options [Hash] the configuration options
-    def config(options = {})
-      raise ConfigItemMissing, "Missing token_store_file from config." unless options[:token_store_file]
-      raise ConfigItemMissing, "Missing user from config." unless options[:user]
-      raise ConfigItemMissing, "Missing password from config." unless options[:password]
-      raise ConfigItemMissing, "Missing server_name from config." unless options[:server_name]
-      raise ConfigItemMissing, "Missing client_id from config." unless options[:client_id]
-      raise ConfigItemMissing, "Missing endpoint_url from config." unless options[:endpoint_url]
-      raise ConfigItemMissing, "Missing authorization_url from config." unless options[:authorization_url]
-      raise ConfigItemMissing, "Missing realm from config." unless options[:realm]
-
-      if !options[:token_store_file].instance_of?(String) || !::File.exist?(options[:token_store_file])
+    def config=(opts = {})
+      raise ConfigItemMissing, "Missing token_store_file from config." unless opts[:token_store_file]
+      raise ConfigItemMissing, "Missing user from config." unless opts[:user]
+      raise ConfigItemMissing, "Missing password from config." unless opts[:password]
+      raise ConfigItemMissing, "Missing server_name from config." unless opts[:server_name]
+      raise ConfigItemMissing, "Missing client_id from config." unless opts[:client_id]
+      raise ConfigItemMissing, "Missing endpoint_url from config." unless opts[:endpoint_url]
+      raise ConfigItemMissing, "Missing authorization_url from config." unless opts[:authorization_url]
+      raise ConfigItemMissing, "Missing realm from config." unless opts[:realm]
+
+      if !opts[:token_store_file].instance_of?(String) || !::File.exist?(opts[:token_store_file])
         raise TokenStoreFileNotFound
       end
 
       @token = nil
-      @token_store_file = options[:token_store_file]
-      @user = options[:user]
-      @password = options[:password]
-      @server_name = options[:server_name]
-      @client_id = options[:client_id]
-      @endpoint_url = options[:endpoint_url]
-      Keycloak.auth_server_url = options[:authorization_url]
-      Keycloak.realm = options[:realm]
-
-      if ::File.zero?(@token_store_file)
+      @config = nil
+      @opts.merge!(opts)
+      Keycloak.auth_server_url = config.authorization_url
+      Keycloak.realm = config.realm
+
+      if ::File.zero?(config.token_store_file)
         write_token(data: empty_token)
       end
     end
@@ -83,16 +77,35 @@ module Dina
       "Bearer " + access_token
     end
 
-    # Flush instance variables and save default values in token store file
+    # Save default values in token store file
     def flush
       write_token(data: empty_token)
     end
 
+    def flush_config
+      @opts = default_opts
+      @config = nil
+      @token = nil
+    end
+
     private
 
+    def default_opts
+      {
+        token_store_file: nil,
+        user: nil,
+        password: nil,
+        server_name: nil,
+        client_id: nil,
+        endpoint_url: nil,
+        realm: nil,
+        authorization_url: nil
+      }
+    end
+
     def access_token
       begin
-        token[@server_name.to_sym][:access_token]
+        token[config.server_name.to_sym][:access_token]
       rescue
         raise TokenStoreContentInvalid
       end
@@ -100,7 +113,7 @@ module Dina
 
     def refresh_token
       begin
-        token[@server_name.to_sym][:refresh_token]
+        token[config.server_name.to_sym][:refresh_token]
       rescue
         raise TokenStoreContentInvalid
       end
@@ -108,7 +121,7 @@ module Dina
 
     def auth_expiry
       begin
-        token[@server_name.to_sym][:auth_expiry]
+        token[config.server_name.to_sym][:auth_expiry]
       rescue
         raise TokenStoreContentInvalid
       end
@@ -116,9 +129,9 @@ module Dina
 
     def get_token
       response = Keycloak::Client.get_token(
-        @user,
-        @password,
-        client_id= @client_id,
+        config.user,
+        config.password,
+        client_id= config.client_id,
         secret='')
       JSON.parse(response, symbolize_names: true)
     end
@@ -133,7 +146,7 @@ module Dina
       begin
         response = Keycloak::Client.get_token_by_refresh_token(
           refresh_token,
-          client_id= @client_id,
+          client_id= config.client_id,
           secret='')
         json = JSON.parse(response, symbolize_names: true)
         auth_expiry = (Time.now + json[:expires_in].seconds).to_s
@@ -144,12 +157,12 @@ module Dina
     end
 
     def token
-      @token ||= JSON.parse(::File.read(@token_store_file), symbolize_names: true)
+      @token ||= JSON.parse(::File.read(config.token_store_file), symbolize_names: true)
     end
 
     def empty_token
       data = {}
-      data[@server_name.to_sym] = {
+      data[config.server_name.to_sym] = {
         access_token: nil,
         refresh_token: nil,
         auth_expiry: nil
@@ -158,8 +171,8 @@ module Dina
     end
 
     def save_token(access_token:, refresh_token:, auth_expiry:)
-      data = JSON.parse(::File.read(@token_store_file), symbolize_names: true) rescue {}
-      data[@server_name.to_sym] = {
+      data = JSON.parse(::File.read(config.token_store_file), symbolize_names: true) rescue {}
+      data[config.server_name.to_sym] = {
         access_token: access_token,
         refresh_token: refresh_token,
         auth_expiry: auth_expiry
@@ -168,7 +181,7 @@ module Dina
     end
 
     def write_token(data:)
-      ::File.write(@token_store_file, JSON.dump(data))
+      ::File.write(config.token_store_file, JSON.dump(data))
       @token = data
     end
 

data/lib/dina/models/base_model.rb

@@ -15,8 +15,8 @@ module Dina
 
     # Required by json_api_client
     def self.site
-      raise ConfigItemMissing, "Missing endpoint_url from config. Perhaps Dina.config has not yet been called." unless Authentication.endpoint_url
-      Authentication.endpoint_url + "/" + endpoint_path
+      raise ConfigItemMissing, "Missing endpoint_url from config. Perhaps Dina.config has not yet been called." unless Dina.config.endpoint_url
+      Dina.config.endpoint_url + "/" + endpoint_path
     end
 
     # injects keybloak bearer token with all json_api_client calls

data/lib/dina/models/object_store/file.rb

@@ -35,7 +35,7 @@ module Dina
     end
 
     def endpoint
-      Autentication.endpoint_url
+      Dina.config.endpoint_url
     end
 
     def endpoint_path

data/lib/dina/search/base_search.rb

@@ -10,7 +10,7 @@ module Dina
     end
 
     def self.endpoint
-      Dina::Authentication.endpoint_url
+      Dina.config.endpoint_url
     end
 
     def self.endpoint_path
@@ -43,7 +43,7 @@ module Dina
           headers: {
             accept: 'application/json',
             content_type: 'application/json',
-            authorization: Dina::Authentication.header
+            authorization: Dina.header
           },
           verify_ssl: verify_ssl
         )

data/lib/dina/version.rb

@@ -3,7 +3,7 @@ module Dina
 
     MAJOR = 0
     MINOR = 7
-    PATCH = 0
+    PATCH = 2
     BUILD = 0
 
     def self.version

data/lib/dina.rb

@@ -9,10 +9,10 @@ module Dina
 
   JsonApiClient::Paginating::NestedParamPaginator.page_param = "offset"
   JsonApiClient::Paginating::NestedParamPaginator.per_page_param = "limit"
-  JsonApiClient::Schema.register array: Dina::ArrayCaster
-  JsonApiClient::Schema.register object: Dina::ObjectCaster
-  JsonApiClient::Schema.register multilingual_title: Dina::MultilingualTitleCaster
-  JsonApiClient::Schema.register multilingual_description: Dina::MultilingualDescriptionCaster
+  JsonApiClient::Schema.register array: ArrayCaster
+  JsonApiClient::Schema.register object: ObjectCaster
+  JsonApiClient::Schema.register multilingual_title: MultilingualTitleCaster
+  JsonApiClient::Schema.register multilingual_description: MultilingualDescriptionCaster
 
   module_function
 
@@ -20,8 +20,12 @@ module Dina
     BaseModel.subclasses
   end
 
-  def config(options = {})
-    Authentication.instance.config(options)
+  def config
+    Authentication.instance.config
+  end
+
+  def config=(options = {})
+    Authentication.instance.config = options
   end
 
   def header
@@ -32,4 +36,8 @@ module Dina
     Authentication.instance.flush
   end
 
+  def flush_config
+    Authentication.instance.flush_config
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.7.0.0
+  version: 0.7.2.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-03 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client