etna 0.1.28 → 0.1.33

data/lib/etna/hmac.rb

@@ -20,14 +20,14 @@ module Etna
     end
 
     # this returns arguments for URI::HTTP.build
-    def url_params
+    def url_params(with_headers=true)
       params = {
         signature: signature,
         expiration: @expiration,
         nonce: @nonce,
         id: @id.to_s,
         headers: @headers.keys.join(','),
-      }.merge(@headers).map do |name, value|
+      }.merge(with_headers ? @headers : {}).map do |name, value|
         [
           "X-Etna-#{ name.to_s.split(/_/).map(&:capitalize).join('-') }",
           value

data/lib/etna/route.rb

@@ -91,6 +91,10 @@ module Etna
       @auth && @auth[:noauth]
     end
 
+    def ignore_janus?
+      @auth && @auth[:ignore_janus]
+    end
+
     private
 
     def application

data/lib/etna/spec/auth.rb

@@ -2,22 +2,22 @@ module Etna::Spec
   module Auth
     AUTH_USERS = {
       superuser: {
-        email: 'zeus@olympus.org', first: 'Zeus', perm: 'A:administration'
+        email: 'zeus@olympus.org', name: 'Zeus', perm: 'A:administration'
       },
       admin: {
-        email: 'hera@olympus.org', first: 'Hera', perm: 'a:labors'
+        email: 'hera@olympus.org', name: 'Hera', perm: 'a:labors'
       },
       editor: {
-        email: 'eurystheus@twelve-labors.org', first: 'Eurystheus', perm: 'E:labors'
+        email: 'eurystheus@twelve-labors.org', name: 'Eurystheus', perm: 'E:labors'
       },
       restricted_editor: {
-        email: 'copreus@twelve-labors.org', first: 'Copreus', perm: 'e:labors'
+        email: 'copreus@twelve-labors.org', name: 'Copreus', perm: 'e:labors'
       },
       viewer: {
-        email: 'hercules@twelve-labors.org', first: 'Hercules', perm: 'v:labors'
+        email: 'hercules@twelve-labors.org', name: 'Hercules', perm: 'v:labors'
       },
       non_user: {
-        email: 'nessus@centaurs.org', first: 'Nessus', perm: ''
+        email: 'nessus@centaurs.org', name: 'Nessus', perm: ''
       }
     }
 

data/lib/etna/user.rb

@@ -7,14 +7,14 @@ module Etna
     }
 
     def initialize params, token=nil
-      @first, @last, @email, @encoded_permissions, encoded_flags = params.values_at(:first, :last, :email, :perm, :flags)
+      @name, @email, @encoded_permissions, encoded_flags = params.values_at(:name, :email, :perm, :flags)
 
       @flags = encoded_flags&.split(/;/) || []
       @token = token unless !token
       raise ArgumentError, "No email given!" unless @email
     end
 
-    attr_reader :first, :last, :email, :token
+    attr_reader :name, :email, :token
 
     def permissions
       @permissions ||= @encoded_permissions.split(/\;/).map do |roles|
@@ -36,10 +36,6 @@ module Etna
       @flags.include?(flag)
     end
 
-    def name
-      "#{first} #{last}"
-    end
-
     def projects
       permissions.keys
     end
@@ -50,7 +46,7 @@ module Etna
       viewer: /[Vv]/,
       restricted: /[AEV]/,
     }
-    def has_roles(project, *roles)
+    def has_any_role?(project, *roles)
       perm = permissions[project.to_s]
 
       return false unless perm
@@ -59,15 +55,23 @@ module Etna
     end
 
     def is_superuser? project=nil
-      has_roles(:administration, :admin)
+      has_any_role?(:administration, :admin)
+    end
+
+    def is_supereditor? project=nil
+      has_any_role?(:administration, :admin, :editor)
+    end
+
+    def is_superviewer? project=nil
+      has_any_role?(:administration, :admin, :editor, :viewer)
     end
 
     def can_edit? project
-      is_superuser? || has_roles(project, :admin, :editor)
+      is_supereditor? || has_any_role?(project, :admin, :editor)
     end
 
     def can_view? project
-      is_superuser? || has_roles(project, :admin, :editor, :viewer)
+      is_superviewer? || has_any_role?(project, :admin, :editor, :viewer)
     end
 
     # superusers - administrators of the Administration group - cannot
@@ -79,7 +83,7 @@ module Etna
     end
 
     def is_admin? project
-      is_superuser? || has_roles(project, :admin)
+      is_superuser? || has_any_role?(project, :admin)
     end
 
     def active? project=nil

data/lib/helpers.rb

@@ -57,9 +57,9 @@ module WithEtnaClients
         **EtnaApp.instance.config(:metis, environment) || {})
   end
 
-  def janus_client
+  def janus_client(opts={})
     @janus_client ||= Etna::Clients::Janus.new(
-        token: token,
+        token: opts.has_key?(:token) ? opts[:token] : token,
         ignore_ssl: EtnaApp.instance.config(:ignore_ssl),
         **EtnaApp.instance.config(:janus, environment) || {})
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etna
 version: !ruby/object:Gem::Version
-  version: 0.1.28
+  version: 0.1.33
 platform: ruby
 authors:
 - Saurabh Asthana
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-17 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: See summary
 email: Saurabh.Asthana@ucsf.edu
 executables:
@@ -103,6 +117,8 @@ files:
 - lib/etna/clients/janus.rb
 - lib/etna/clients/janus/client.rb
 - lib/etna/clients/janus/models.rb
+- lib/etna/clients/janus/workflows.rb
+- lib/etna/clients/janus/workflows/generate_token_workflow.rb
 - lib/etna/clients/magma.rb
 - lib/etna/clients/magma/client.rb
 - lib/etna/clients/magma/formatting.rb