dina 0.6.0.0 → 0.6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04c4026773ff1a9e6b972dde877db7db2ce24f266a6eedec9c557201b913836
-  data.tar.gz: 8482b240897f73716a649e69c7d616cc1be6e66fd2d0f5237d2f4ef71f16af48
+  metadata.gz: fce6aa7545f2fe1bb7a340fd5ef64fb85ed56e50ad12b970a37cad5d0ba3bfc2
+  data.tar.gz: 532c2e30e916fe27a13b3739efccd5adb770f12e4b6706f2fed7eec4276b80b8
 SHA512:
-  metadata.gz: 1ee8a029d86598ae2f8e63afe9713aad2707d19347d3e305c800a93e74a5955adff10a191e37fb5615b75ba994c07d0db72f028b002e35096ed36c4854095dca
-  data.tar.gz: 41640031cd2cebbb32a624866b1cd44ed7fac03b8e4b8854c9a94d1276b5a7f91f70b7d467f696d1034b998330cdeeb8577f33d1c1d5483aee0206096c12faf2
+  metadata.gz: 2e7ff2cd1b927195c3c17d7986e31bc60fad738dff9f7198029af2e822673b05d8ea5748db0e7aeb330fd1cd59366a5e75870556fd7cf7b74d8160b8558fa79b
+  data.tar.gz: 95f10aa0889f8eb03b782925458398ba1ed7c066df7cb5ff94c630710170a1fd567381334207242381d6e4736cb960c4fd4edad29b047ba7328ff86aa40ae5b1

data/lib/dina/authentication/authentication.rb

@@ -63,7 +63,8 @@ module Dina
 
     # Flushes instance variables from memory
     # but token store file content remains intact
-    def self.flush
+    def self.flush_variables
+      @token = nil
       @token_store_file = nil
       @user = nil
       @password = nil
@@ -74,11 +75,17 @@ module Dina
       Keycloak.realm = nil
     end
 
-    # Replaces content of token store file with default values
+    # 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
 
@@ -86,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
@@ -94,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
@@ -102,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
@@ -137,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/version.rb

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

metadata

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