dina 0.5.9.1 → 0.6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dce66cc9ad35b27eaf11fd314027b06def22bab64025b4ee79de9b3a8b22f1a
-  data.tar.gz: 6bf96dfc20327ca42e450c42e2dd8a0c1d5c2a025f09127a118077b3ff742968
+  metadata.gz: fce6aa7545f2fe1bb7a340fd5ef64fb85ed56e50ad12b970a37cad5d0ba3bfc2
+  data.tar.gz: 532c2e30e916fe27a13b3739efccd5adb770f12e4b6706f2fed7eec4276b80b8
 SHA512:
-  metadata.gz: 476b81d9353c5c05f5f1c744cf4b00555bd7a9337ee6a2569689c270fdd280c521c696c84ab2df466350e52f502a6c728a920f958d55ce358b7e836266ae5439
-  data.tar.gz: fb0f7c3f96d1576c7a0c211d20640a429b51c6d69dab3c8a15d62a4ce1fa3231b2491d5410c134948e9355aaadda29f600bd94b6588a8a090779780eeb0430da
+  metadata.gz: 2e7ff2cd1b927195c3c17d7986e31bc60fad738dff9f7198029af2e822673b05d8ea5748db0e7aeb330fd1cd59366a5e75870556fd7cf7b74d8160b8558fa79b
+  data.tar.gz: 95f10aa0889f8eb03b782925458398ba1ed7c066df7cb5ff94c630710170a1fd567381334207242381d6e4736cb960c4fd4edad29b047ba7328ff86aa40ae5b1

data/lib/dina/authentication/authentication.rb

@@ -61,6 +61,31 @@ 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
+    end
+
     class << self
       attr_accessor :endpoint_url
 
@@ -68,7 +93,7 @@ module Dina
 
       def access_token
         begin
-          read_token[@server_name.to_sym][:access_token]
+          token[@server_name.to_sym][:access_token]
         rescue
           raise TokenStoreContentInvalid
         end
@@ -76,7 +101,7 @@ module Dina
 
       def refresh_token
         begin
-          read_token[@server_name.to_sym][:refresh_token]
+          token[@server_name.to_sym][:refresh_token]
         rescue
           raise TokenStoreContentInvalid
         end
@@ -84,7 +109,7 @@ module Dina
 
       def auth_expiry
         begin
-          read_token[@server_name.to_sym][:auth_expiry]
+          token[@server_name.to_sym][:auth_expiry]
         rescue
           raise TokenStoreContentInvalid
         end
@@ -119,28 +144,33 @@ module Dina
         end
       end
 
-      def read_token
-        JSON.parse(::File.read(@token_store_file), symbolize_names: true)
+      def token
+        @token ||= JSON.parse(::File.read(@token_store_file), symbolize_names: true)
       end
 
       def create_empty_token
-        data_hash = {}
-        data_hash[@server_name.to_sym] = {
+        data = {}
+        data[@server_name.to_sym] = {
           access_token: nil,
           refresh_token: nil,
           auth_expiry: nil
         }
-        ::File.write(@token_store_file, JSON.dump(data_hash))
+        write_token(data: data)
       end
 
       def save_token(access_token:, refresh_token:, auth_expiry:)
-        data_hash = JSON.parse(::File.read(@token_store_file), symbolize_names: true) rescue {}
-        data_hash[@server_name.to_sym] = {
+        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
         }
-        ::File.write(@token_store_file, JSON.dump(data_hash))
+        write_token(data: data)
+      end
+
+      def write_token(data:)
+        ::File.write(@token_store_file, JSON.dump(data))
+        @token = data
       end
 
     end

data/lib/dina/models/base_model.rb

@@ -8,21 +8,28 @@ module Dina
     before_create :on_before_create
     before_save :on_before_save
 
+    # Required by json_api_client
+    # Set by all child classes
     def self.endpoint_path
     end
 
+    # 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
     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 }
     end
 
+    # helper method for all child classes to retrieve records by group
     def self.find_by_group(group, page: 1, per: 50)
       self.where("group.groupName": group).page(page).per(per)
     end
 
+    # helper method to retrieve all properties for a class
     def self.properties
       self.schema.instance_values["properties"]
     end

data/lib/dina/version.rb

@@ -2,9 +2,9 @@ module Dina
   class Version
 
     MAJOR = 0
-    MINOR = 5
-    PATCH = 9
-    BUILD = 1
+    MINOR = 6
+    PATCH = 1
+    BUILD = 0
 
     def self.version
       [MAJOR, MINOR, PATCH, BUILD].compact.join('.').freeze

metadata

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