dina 0.4.2.0 → 0.4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 868b096ec196f62ae6cf4507cadf08c277b26f462957873140abc93ecf88a1a6
-  data.tar.gz: 26c127ec2bf4e6e9c990b4361aff69d1ce9f6a5e578ae01065472e8ede524bf5
+  metadata.gz: 3a77888d0a10acb3970bf9591e736bc8659d4bd4df79d7da5635b59db1e6c26d
+  data.tar.gz: 1ba52d47cff3f85e4d0bed7ec62b388fc51f2e8a00f35dd7e578f310f0452a75
 SHA512:
-  metadata.gz: 9fcd3ceca0594b95caaea14870a0ff6ebc9284fab58eac5e98bd236c04e8235b4fb542c720cba9c394b63b719a4883642f82e0871b347a9a18c5225c8e42e5b6
-  data.tar.gz: 95d262c72d8955a9eb944886efcd0784af500f4f8235846bc062a69d5128652e0af0260d85f7243bd608e8d2bd3f895a309cc752baac6b742282f84db658f88e
+  metadata.gz: 7ff956f4b1fe2d20d22a2f98e9139e0812e54f1c05433a8a5bd8372880258662fdc27d81ccd75d55d5037f3f12a9490e1e1b7bc93faf33d4cd2a8bc47ca3b212
+  data.tar.gz: 8cc16fd12372ad0e50fd5b90b0ac25c83fb9b389e76f06e60cf4f613a3a5b44e0262e5ec0a379518d0be332d005e314de7457c600d033a4b8730745ac56ff996

data/lib/dina/authentication/authentication.rb

@@ -18,16 +18,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])
+        raise TokenStoreFileNotFound
+      end
+
       @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]
-      @authorization_url = options[:authorization_url]
-      @realm = options[:realm]
-      Keycloak.auth_server_url = @authorization_url
-      Keycloak.realm = @realm
+      Keycloak.auth_server_url = options[:authorization_url]
+      Keycloak.realm = options[:realm]
     end
 
     # Gets, sets, and renews a Bearer access token as required
@@ -47,10 +58,34 @@ module Dina
     end
 
     class << self
-      attr_accessor :token_store_file, :authorization_url, :endpoint_url, :client_id, :realm, :server_name
+      attr_accessor :endpoint_url
 
       private
 
+      def access_token
+        begin
+          read_token[@server_name.to_sym][:access_token]
+        rescue
+          raise TokenStoreContentInvalid
+        end
+      end
+
+      def refresh_token
+        begin
+          read_token[@server_name.to_sym][:refresh_token]
+        rescue
+          raise TokenStoreContentInvalid
+        end
+      end
+
+      def auth_expiry
+        begin
+          read_token[@server_name.to_sym][:auth_expiry]
+        rescue
+          raise TokenStoreContentInvalid
+        end
+      end
+
       def get_token
         response = Keycloak::Client.get_token(
           @user,
@@ -80,29 +115,11 @@ module Dina
         end
       end
 
-      def access_token
-        read_token[:access_token]
-      end
-
-      def refresh_token
-        read_token[:refresh_token]
-      end
-
-      def auth_expiry
-        read_token[:auth_expiry] rescue "9999-01-01 00:00:00 -0500"
-      end
-
       def read_token
-        raise TokenStoreFileNotFound unless @token_store_file.instance_of?(String) && ::File.exist?(@token_store_file)
-        JSON.parse(::File.read(@token_store_file), symbolize_names: true)[@server_name.to_sym] rescue default_token
-      end
-
-      def default_token
-        { access_token: nil, refresh_token: nil, auth_expiry: "9999-01-01 00:00:00 -0500" }
+        JSON.parse(::File.read(@token_store_file), symbolize_names: true)
       end
 
       def save_token(access_token:, refresh_token:, auth_expiry:)
-        raise TokenStoreFileNotFound unless @token_store_file.instance_of?(String) && ::File.exist?(@token_store_file)
         data_hash = JSON.parse(::File.read(@token_store_file), symbolize_names: true) rescue {}
         data_hash[@server_name.to_sym] = {
           access_token: access_token,

data/lib/dina/exceptions.rb

@@ -1,6 +1,8 @@
 module Dina
   class DinaException < StandardError; end
   class TokenStoreFileNotFound < DinaException; end
+  class TokenStoreContentInvalid < DinaException; end
+  class ConfigItemMissing < DinaException; end
   class ObjectInvalid < DinaException; end
   class PropertyValueInvalid < ObjectInvalid; end
 end

data/lib/dina/json_api_client_patch.rb

@@ -3,7 +3,7 @@ module JsonApiClient
   module Associations
     class BaseAssociation
       def data(url)
-        url.sub!("/api/v1/", "/api/#{association_class.requestor.instance_variable_get(:@klass).endpoint_path}")
+        url.sub!("/api/v1/", "/api/#{klass.endpoint_path}")
         from_result_set(association_class.requestor.linked(url))
       end
     end

data/lib/dina/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.4.2.0
+  version: 0.4.4.0
 platform: ruby
 authors:
 - David P. Shorthouse
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client