dina 0.4.3.0 → 0.5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32052c3bba673462b3f37308893e0e75a2d6b90c8cf83bb015afdb114605079f
-  data.tar.gz: d907470232863681e01a113f55a968d092dc76dd059471906f39c72151ab6837
+  metadata.gz: cee08dca65cf1c04b4c2b03aa08e9686a4684ea96b484fe6a4b1a9e32d8001a8
+  data.tar.gz: c247128c86df604291f3ec985254e59bc676b120481e8a8736c1033d3adfb063
 SHA512:
-  metadata.gz: 459d73f40c8133a76ae7596d4aa8aa58665337fac57e591dfc10a76b4a0ef03398ff1331c537d98be2434182af0b35e216477e424e3ef2532ef70853cfe6ed96
-  data.tar.gz: 6386e868c47a886466ff7fd905c9854f1f3ff701cf99fd58243fc37966a233e2bb4758c84e8b20bf0914dfac6a34f26e0e4dd656ac0681068e3ab9627a98ee59
+  metadata.gz: 78ea88a086216ae6a5d27c6121cc6d345537a17902a9cd2c0dd4caaf4748a9c45d3c5243ea8d06d4ffa7d09c57a7da0092677bc20e3187d16f7517782ef3af2e
+  data.tar.gz: da1011c76dcd1fb72f1cd26623cb0cf02835535b091bb19e3bcd76cc393343e238b3ffde0419ff98c53f90a5278d0d0908ccff481f9e10ffe6f6a46c11cca580

data/lib/dina/authentication/authentication.rb

@@ -11,23 +11,34 @@ module Dina
     #    password: "password provided by DINA admin in Keycloak",
     #    server_name: "used locally to reference the token",
     #    client_id: "provided by DINA admin in Keycloak",
-    #    endpoint_url: "DINA API URL",
-    #    authorization_url: "Keycloak authorization URL".
+    #    endpoint_url: "DINA API URL without terminating slash",
+    #    authorization_url: "Keycloak authorization URL without terminating slash".
     #    realm: "provided by DINA admin in Keycloak"
     # }
     #
     # @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/models/base_model.rb

@@ -12,7 +12,7 @@ module Dina
     end
 
     def self.site
-      Dina::Authentication.endpoint_url + endpoint_path
+      Dina::Authentication.endpoint_url + "/" + endpoint_path
     end
 
     def self.custom_headers

data/lib/dina/version.rb

@@ -2,8 +2,8 @@ module Dina
   class Version
 
     MAJOR = 0
-    MINOR = 4
-    PATCH = 3
+    MINOR = 5
+    PATCH = 0
     BUILD = 0
 
     def self.version

metadata

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