etna 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c509ba77487fcda069ddf9083cddaa28b9a1cab2c6d6c62a681a6999e2bcd28a
-  data.tar.gz: 10044f1c299846a87aa5d70e90deee34cf7e860e7f6df503f6d7aa5a7d880ea3
+  metadata.gz: d7ff510ea92327172e9682b7b07e65dc299d2f7246f7250ece8a2071891eb965
+  data.tar.gz: a13cb194bc64ae42ef76c0d2daf9ca6041ae46b37fd70db3c90752c80a479ae2
 SHA512:
-  metadata.gz: 06062b4c110c17f2ae70ffba0bd3ac6d0b7e934a09f1f24553d22e2dddc106a1b5d9fad6172f31bf7355a28991364b7c6a8200eef8eec4854b7e76642733dd36
-  data.tar.gz: f66ef71c2b257bf99dbcf29786c128affab8a1b480c4fa7ee958aed473979c356a0e2a9bba523c13b81f6a2a5481ea9c5f4ef36963382ab6bc5a8889d60b32ec
+  metadata.gz: d42498eecb1db7f476e004a7824f1e7b05c10685ded4da125d748c192ea7c2820c3efb3aff60fa7ed3ed026aace0503a12ed2ac61812ba23502925b19d674e99
+  data.tar.gz: d584c7eef1d6d874d8bf38d5eb046f91b29de1ec10485b89094ed52dcc8f29e8d43ec8da39fd97a5399a0eba7f9f0da14e340bb026f7b0cefac559d23d40aac9

data/lib/commands.rb

@@ -355,8 +355,6 @@ class EtnaApp
         def execute(project_name, redcap_tokens, models: "all", commit: false)
           raise "Must provide at least one REDCap token (comma-separated)." unless redcap_tokens.split(',').length > 0
 
-          raise "Your token is expired." if polyphemus_client.token_expired?
-
           puts "NOTE: This is a **preview** of what the data loading will look like. Use the --commit flag to load records into Magma." unless commit
 
           polyphemus_client.job(Etna::Clients::Polyphemus::RedcapJobRequest.new(

data/lib/etna/clients/base_client.rb

@@ -10,13 +10,15 @@ module Etna
         raise "#{self.class.name} client configuration is missing host." unless host
         raise "#{self.class.name} client configuration is missing token." unless token
 
+        @token = token
+        raise "Your token is expired." if token_expired?
+
         @etna_client = ::Etna::Client.new(
           host,
           token,
           routes_available: false,
           ignore_ssl: ignore_ssl)
         @host = host
-        @token = token
         @ignore_ssl = ignore_ssl
       end
 
@@ -26,6 +28,7 @@ module Etna
       end
 
       def token_will_expire?(offset=3000)
+        # offset in seconds
         # Will the user's token expire in the given amount of time?
         epoch_seconds = JSON.parse(Base64.urlsafe_decode64(token.split('.')[1]))["exp"]
         expiration = DateTime.strptime(epoch_seconds.to_s, "%s")

data/lib/etna/test_auth.rb

@@ -7,7 +7,7 @@ module Etna
   class TestAuth < Auth
     def self.token_header(params)
       token = Base64.strict_encode64(params.to_json)
-      return [ 'Authorization', "Etna #{token}" ]
+      return [ 'Authorization', "Etna something.#{token}" ]
     end
 
     def self.token_param(params)
@@ -36,8 +36,12 @@ module Etna
 
       return false unless token
 
-      # here we simply base64-encode our user hash and pass it through
-      payload = JSON.parse(Base64.decode64(token))
+      # Here we simply base64-encode our user hash and pass it through
+      # In order to behave more like "real" tokens, we expect the user hash to be
+      #   in index 1 after splitting by ".".
+      # We do this to support Metis client tests, we pass in tokens with multiple "."-separated parts, so
+      #   have to account for that.
+      payload = JSON.parse(Base64.decode64(token.split('.')[1]))
 
       request.env['etna.user'] = Etna::User.new(payload.map{|k,v| [k.to_sym, v]}.to_h, token)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack