dina 0.6.2.0 → 0.7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40bf041e6919be1d72c4a9c737d347f137655521390502d8ea295aa88af84a4d
-  data.tar.gz: 9f1da8dbef7c18c16d0b639c31992ce077f9d5b93f35e3515b93990002afad2a
+  metadata.gz: f6c152942d702bdba2e7abbe4a11d5a9baddc01903e08c70c18c8952d1082479
+  data.tar.gz: d392fb4a47e0d34e1dd38ccbde15926b4bc45a817f2f1f7722ebd25ece9461bb
 SHA512:
-  metadata.gz: 7e711ba392d49fb80afe98c808196302c85530fd83ab67849a555dbd7890e81c978727cef898c17be1494e161f3e453af9915d118732a93733c048b329d70f20
-  data.tar.gz: ddf3131bf5c39099ee130907238668a1523b9e0883a5867d0fcfa4322f1e880a1b8f39fabb49de12e7811ef9929be74a6e19389b021eeb16803d4a1b39eaf7a1
+  metadata.gz: 7d94a07c2f0bdbe1bbc73f3e39bf13ebb1740bc9939027383e588771ca58f46fee3c33829e33bfa224948c5ed19323f4ff770495656c5dad94a2cd5e3f962216
+  data.tar.gz: ec3005ea8d5dbd382d2db1e29722d598b74fdb27f5fafbdc34772c45040cdbe9ff80e45ac56b3c80dcbdae63fea036c2ff141ba55d548f6df1602c349540cc66

data/lib/dina/authentication/authentication.rb

@@ -1,7 +1,23 @@
 # encoding: utf-8
 
 module Dina
-  module Authentication
+  class Authentication
+
+    class << self
+      def instance
+        Thread.current[:dina_authentication] ||= new
+      end
+    end
+
+    def initialize
+      @token = nil
+      @config = nil
+      @opts = default_opts
+    end
+
+    def config
+      @config ||= OpenStruct.new(@opts)
+    end
 
     # Sets Authentication configuration
     # Options hash as follows:
@@ -17,31 +33,27 @@ module Dina
     # }
     #
     # @param options [Hash] the configuration options
-    def self.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
@@ -53,7 +65,7 @@ module Dina
     # and load the token_store_file with every call to header
     #
     # @return [String] the Bearer token
-    def self.header
+    def header
       if access_token.nil? || refresh_token.nil?
         set_token
       end
@@ -65,99 +77,114 @@ module Dina
       "Bearer " + access_token
     end
 
-    # Flush instance variables and save default values in token store file
-    def self.flush
+    # Save default values in token store file
+    def flush
       write_token(data: empty_token)
     end
 
-    class << self
-      attr_accessor :endpoint_url
+    def flush_config
+      @opts = default_opts
+      @config = nil
+      @token = nil
+    end
 
-      private
+    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]
-        rescue
-          raise TokenStoreContentInvalid
-        end
+    def access_token
+      begin
+        token[config.server_name.to_sym][:access_token]
+      rescue
+        raise TokenStoreContentInvalid
       end
+    end
 
-      def refresh_token
-        begin
-          token[@server_name.to_sym][:refresh_token]
-        rescue
-          raise TokenStoreContentInvalid
-        end
+    def refresh_token
+      begin
+        token[config.server_name.to_sym][:refresh_token]
+      rescue
+        raise TokenStoreContentInvalid
       end
+    end
 
-      def auth_expiry
-        begin
-          token[@server_name.to_sym][:auth_expiry]
-        rescue
-          raise TokenStoreContentInvalid
-        end
+    def auth_expiry
+      begin
+        token[config.server_name.to_sym][:auth_expiry]
+      rescue
+        raise TokenStoreContentInvalid
       end
+    end
 
-      def get_token
-        response = Keycloak::Client.get_token(
-          @user,
-          @password,
-          client_id= @client_id,
-          secret='')
-        JSON.parse(response, symbolize_names: true)
-      end
+    def get_token
+      response = Keycloak::Client.get_token(
+        config.user,
+        config.password,
+        client_id= config.client_id,
+        secret='')
+      JSON.parse(response, symbolize_names: true)
+    end
 
-      def set_token
-        json = get_token
+    def set_token
+      json = get_token
+      auth_expiry = (Time.now + json[:expires_in].seconds).to_s
+      save_token(access_token: json[:access_token], refresh_token: json[:refresh_token], auth_expiry: auth_expiry)
+    end
+
+    def renew_token
+      begin
+        response = Keycloak::Client.get_token_by_refresh_token(
+          refresh_token,
+          client_id= config.client_id,
+          secret='')
+        json = JSON.parse(response, symbolize_names: true)
         auth_expiry = (Time.now + json[:expires_in].seconds).to_s
         save_token(access_token: json[:access_token], refresh_token: json[:refresh_token], auth_expiry: auth_expiry)
+      rescue
+        set_token
       end
+    end
 
-      def renew_token
-        begin
-          response = Keycloak::Client.get_token_by_refresh_token(
-            refresh_token,
-            client_id= @client_id,
-            secret='')
-          json = JSON.parse(response, symbolize_names: true)
-          auth_expiry = (Time.now + json[:expires_in].seconds).to_s
-          save_token(access_token: json[:access_token], refresh_token: json[:refresh_token], auth_expiry: auth_expiry)
-        rescue
-          set_token
-        end
-      end
-
-      def token
-        @token ||= JSON.parse(::File.read(@token_store_file), symbolize_names: true)
-      end
-
-      def empty_token
-        data = {}
-        data[@server_name.to_sym] = {
-          access_token: nil,
-          refresh_token: nil,
-          auth_expiry: nil
-        }
-        data
-      end
+    def token
+      @token ||= JSON.parse(::File.read(config.token_store_file), symbolize_names: true)
+    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] = {
-          access_token: access_token,
-          refresh_token: refresh_token,
-          auth_expiry: auth_expiry
-        }
-        write_token(data: data)
-      end
+    def empty_token
+      data = {}
+      data[config.server_name.to_sym] = {
+        access_token: nil,
+        refresh_token: nil,
+        auth_expiry: nil
+      }
+      data
+    end
 
-      def write_token(data:)
-        ::File.write(@token_store_file, JSON.dump(data))
-        @token = data
-      end
+    def save_token(access_token:, refresh_token:, auth_expiry:)
+      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
+      }
+      write_token(data: data)
+    end
 
+    def write_token(data:)
+      ::File.write(config.token_store_file, JSON.dump(data))
+      @token = data
     end
 
   end
+
 end

data/lib/dina/models/base_model.rb

@@ -15,13 +15,13 @@ module Dina
 
     # Required by json_api_client
     def self.site
-      raise ConfigItemMissing, "Missing endpoint_url from config. Perhaps Dina::Authentication.config has not yet been called." unless Dina::Authentication.endpoint_url
-      Dina::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
     def self.custom_headers
-      { content_type: "application/vnd.api+json", authorization: Dina::Authentication.header }
+      { content_type: "application/vnd.api+json", authorization: Dina.header }
     end
 
     # helper method for all child classes to retrieve records by group

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

@@ -15,7 +15,7 @@ module Dina
       obj.group = group
       RestClient::Request.execute(
         method: :get,
-        headers: { authorization: Dina::Authentication.header },
+        headers: { authorization: Dina.header },
         url: obj.url + "/#{id}",
         verify_ssl: verify_ssl
       )
@@ -35,7 +35,7 @@ module Dina
     end
 
     def endpoint
-      Dina::Authentication.endpoint_url
+      Autentication.endpoint_url
     end
 
     def endpoint_path
@@ -58,7 +58,7 @@ module Dina
       validate_params
       response = RestClient::Request.execute(
         method: :post,
-        headers: { authorization: Dina::Authentication.header },
+        headers: { authorization: Dina.header },
         url: (!is_derivative) ? url : url + "/derivative",
         payload: {
           multipart: true,

data/lib/dina/version.rb

@@ -2,8 +2,8 @@ module Dina
   class Version
 
     MAJOR = 0
-    MINOR = 6
-    PATCH = 2
+    MINOR = 7
+    PATCH = 1
     BUILD = 0
 
     def self.version

data/lib/dina.rb

@@ -9,12 +9,35 @@ 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
 
-  def self.classes
-    Dina::BaseModel.subclasses
+  module_function
+
+  def classes
+    BaseModel.subclasses
+  end
+
+  def config
+    Authentication.instance.config
+  end
+
+  def config=(options = {})
+    Authentication.instance.config = options
+  end
+
+  def header
+    Authentication.instance.header
+  end
+
+  def flush
+    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.6.2.0
+  version: 0.7.1.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client