dina 0.6.1.0 → 0.6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fce6aa7545f2fe1bb7a340fd5ef64fb85ed56e50ad12b970a37cad5d0ba3bfc2
-  data.tar.gz: 532c2e30e916fe27a13b3739efccd5adb770f12e4b6706f2fed7eec4276b80b8
+  metadata.gz: 40bf041e6919be1d72c4a9c737d347f137655521390502d8ea295aa88af84a4d
+  data.tar.gz: 9f1da8dbef7c18c16d0b639c31992ce077f9d5b93f35e3515b93990002afad2a
 SHA512:
-  metadata.gz: 2e7ff2cd1b927195c3c17d7986e31bc60fad738dff9f7198029af2e822673b05d8ea5748db0e7aeb330fd1cd59366a5e75870556fd7cf7b74d8160b8558fa79b
-  data.tar.gz: 95f10aa0889f8eb03b782925458398ba1ed7c066df7cb5ff94c630710170a1fd567381334207242381d6e4736cb960c4fd4edad29b047ba7328ff86aa40ae5b1
+  metadata.gz: 7e711ba392d49fb80afe98c808196302c85530fd83ab67849a555dbd7890e81c978727cef898c17be1494e161f3e453af9915d118732a93733c048b329d70f20
+  data.tar.gz: ddf3131bf5c39099ee130907238668a1523b9e0883a5867d0fcfa4322f1e880a1b8f39fabb49de12e7811ef9929be74a6e19389b021eeb16803d4a1b39eaf7a1

data/lib/dina/authentication/authentication.rb

@@ -31,6 +31,7 @@ module Dina
         raise TokenStoreFileNotFound
       end
 
+      @token = nil
       @token_store_file = options[:token_store_file]
       @user = options[:user]
       @password = options[:password]
@@ -41,13 +42,16 @@ 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
       if access_token.nil? || refresh_token.nil?
@@ -61,29 +65,9 @@ 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
+      write_token(data: empty_token)
     end
 
     class << self
@@ -148,14 +132,14 @@ module Dina
         @token ||= JSON.parse(::File.read(@token_store_file), symbolize_names: true)
       end
 
-      def create_empty_token
+      def empty_token
         data = {}
         data[@server_name.to_sym] = {
           access_token: nil,
           refresh_token: nil,
           auth_expiry: nil
         }
-        write_token(data: data)
+        data
       end
 
       def save_token(access_token:, refresh_token:, auth_expiry:)

data/lib/dina/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dina
 version: !ruby/object:Gem::Version
-  version: 0.6.1.0
+  version: 0.6.2.0
 platform: ruby
 authors:
 - David P. Shorthouse