dina 0.6.1.0 → 0.7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce6aa7545f2fe1bb7a340fd5ef64fb85ed56e50ad12b970a37cad5d0ba3bfc2
-  data.tar.gz: 532c2e30e916fe27a13b3739efccd5adb770f12e4b6706f2fed7eec4276b80b8
+  metadata.gz: f683d4b9e156194f6c356e5ebfbd46fcb6f821548403cb5821357d0813d5ba6a
+  data.tar.gz: 867eef99e2ffb402420f425f495c4b44f4b5e98dbf955383d7fe39215f8d1104
 SHA512:
-  metadata.gz: 2e7ff2cd1b927195c3c17d7986e31bc60fad738dff9f7198029af2e822673b05d8ea5748db0e7aeb330fd1cd59366a5e75870556fd7cf7b74d8160b8558fa79b
-  data.tar.gz: 95f10aa0889f8eb03b782925458398ba1ed7c066df7cb5ff94c630710170a1fd567381334207242381d6e4736cb960c4fd4edad29b047ba7328ff86aa40ae5b1
+  metadata.gz: 815c80204d71ac6eb567ff3aee545123d582573a38d4602b85a18b20c2200837323a57e515663790951691ce642c8865ef0587532a6acefd1cc9dc378051d779
+  data.tar.gz: 4a8d252554cc5eff4a76ee00970a525ba15d805eee63ec026832ddd9ad5eeeeafac2e5eefb5667ab7ea9c22eb9ee5cca92f639492e5b6b7ea0c0a157a58a35e4

data/lib/dina/authentication/authentication.rb

@@ -1,7 +1,25 @@
 # encoding: utf-8
 
 module Dina
-  module Authentication
+  class Authentication
+
+    class << self
+      attr_accessor :endpoint_url
+
+      def instance
+        Thread.current[:dina_authentication] ||= new
+      end
+    end
+
+    def initialize
+      @token = nil
+      @endpoint_url = nil
+      @token_store_file = nil
+      @user = nil
+      @password = nil
+      @server_name = nil
+      @client_id = nil
+    end
 
     # Sets Authentication configuration
     # Options hash as follows:
@@ -17,7 +35,7 @@ module Dina
     # }
     #
     # @param options [Hash] the configuration options
-    def self.config(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]
@@ -31,6 +49,7 @@ module Dina
         raise TokenStoreFileNotFound
       end
 
+      @token = nil
       @token_store_file = options[:token_store_file]
       @user = options[:user]
       @password = options[:password]
@@ -41,15 +60,18 @@ module Dina
       Keycloak.realm = options[:realm]
 
       if ::File.zero?(@token_store_file)
-        create_empty_token
+        write_token(data: empty_token)
       end
     end
 
     # Gets, sets, and renews a Bearer access token as required
     # and produces a Header string
     #
+    # WARNING: this is not likely to be threadsafe unless we do away with @token
+    # 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
@@ -61,119 +83,95 @@ module Dina
       "Bearer " + access_token
     end
 
-    # Flushes instance variables from memory
-    # but token store file content remains intact
-    def self.flush_variables
-      @token = nil
-      @token_store_file = nil
-      @user = nil
-      @password = nil
-      @server_name = nil
-      @client_id = nil
-      @endpoint_url = nil
-      Keycloak.auth_server_url = nil
-      Keycloak.realm = nil
-    end
-
-    # Saves default values in token store file
-    def self.flush_token
-      create_empty_token
-    end
-
     # Flush instance variables and save default values in token store file
-    def self.flush
-      flush_variables
-      flush_token
+    def flush
+      write_token(data: empty_token)
     end
 
-    class << self
-      attr_accessor :endpoint_url
-
-      private
+    private
 
-      def access_token
-        begin
-          token[@server_name.to_sym][:access_token]
-        rescue
-          raise TokenStoreContentInvalid
-        end
+    def access_token
+      begin
+        token[@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[@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[@server_name.to_sym][:auth_expiry]
+      rescue
+        raise TokenStoreContentInvalid
       end
+    end
 
-      def get_token
-        response = Keycloak::Client.get_token(
-          @user,
-          @password,
+    def get_token
+      response = Keycloak::Client.get_token(
+        @user,
+        @password,
+        client_id= @client_id,
+        secret='')
+      JSON.parse(response, symbolize_names: true)
+    end
+
+    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= @client_id,
           secret='')
-        JSON.parse(response, symbolize_names: true)
-      end
-
-      def set_token
-        json = get_token
+        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 create_empty_token
-        data = {}
-        data[@server_name.to_sym] = {
-          access_token: nil,
-          refresh_token: nil,
-          auth_expiry: nil
-        }
-        write_token(data: data)
-      end
+    def token
+      @token ||= JSON.parse(::File.read(@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[@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(@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 write_token(data:)
+      ::File.write(@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 Authentication.endpoint_url
+      Authentication.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 = 1
+    MINOR = 7
+    PATCH = 0
     BUILD = 0
 
     def self.version

data/lib/dina.rb

@@ -14,7 +14,22 @@ module Dina
   JsonApiClient::Schema.register multilingual_title: Dina::MultilingualTitleCaster
   JsonApiClient::Schema.register multilingual_description: Dina::MultilingualDescriptionCaster
 
-  def self.classes
-    Dina::BaseModel.subclasses
+  module_function
+
+  def classes
+    BaseModel.subclasses
+  end
+
+  def config(options = {})
+    Authentication.instance.config(options)
+  end
+
+  def header
+    Authentication.instance.header
+  end
+
+  def flush
+    Authentication.instance.flush
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.6.1.0
+  version: 0.7.0.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