ocean-rails 6.1.7 → 6.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a68d0d48e09ae7bee67dc8099da9ed592b095b94
-  data.tar.gz: 7aff7c2a33add1f11ab9da72ff4047d884d1bfe1
+  metadata.gz: a7db358dd02e5c6518a773461ca0d22b6123b0e8
+  data.tar.gz: 72830f4405a9d35e22693795de20d3bbb211be22
 SHA512:
-  metadata.gz: d888abd3a67b2fc421e722908ebcb6350754649aa846a143f59c074e77b32dce1ba37db487ca0551b36a417a573bc48026967d9d571acbb1867322b3a7eba039
-  data.tar.gz: acda4d43fb7242703781fb9f742e3ca0d98f8f010611e616901234040885b5300dc13fc3fb644c3bd9cb8f7023719365785661e191ae722c18a3bcbf56b186e0
+  metadata.gz: 2a9d574e20a145ecc738b0e7566ade9de5608505d64de0cb49391e8262e8723846f1ef4f5f6ff117caee49ba0b146fe5e767934ef7235a62c2789bb36ef58c02
+  data.tar.gz: 9e8f1cf62eabfcc3d297eb16392e1e79d25a523cdff38b279faf212be072edb72c8d9528322f15183a5491231193da55f37c9e33158209b92c8d59b557ab95bf

data/lib/ocean/api.rb

@@ -202,7 +202,7 @@ class Api
 
     url = url.first == "/" ? "#{INTERNAL_OCEAN_API_URL}#{url}" : Api.internalize_uri(url)
 
-    # This is a Proc when run queues the request and schedules retries
+    # This is a Proc which when run queues the request and schedules retries
     enqueue_request = lambda do
       # First construct a request. It will not be sent yet.
       request = Typhoeus::Request.new(url,
@@ -379,27 +379,37 @@ class Api
   # If not successful, +nil+ is returned.
   #
   def self.authenticate(username=API_USER, password=API_PASSWORD)
-    # response = request "/v1/authentications", :post,
-    #                    headers: {'X-API-Authenticate' => credentials(username, password)}
-    response = Typhoeus.post "#{INTERNAL_OCEAN_API_URL}/v1/authentications", 
-                 body: "", headers: {'X-API-Authenticate' => credentials(username, password)}
-    case response.code
-    when 201
-      token = JSON.parse(response.body)['authentication']['token']
-      @service_token = token if username == API_USER && password == API_PASSWORD
-      token
-    when 400
-      # Malformed credentials. Don't repeat the request.
-      nil
-    when 403
-      # Does not authenticate. Don't repeat the request.
-      nil 
-    when 500
-      # Error. Don't repeat. 
-      nil   
-    else
-      # Should never end up here.
-      raise "Authentication weirdness"
+    attempts = 3
+    loop do
+      response = Typhoeus.post "#{INTERNAL_OCEAN_API_URL}/v1/authentications", 
+                   body: "", headers: {'X-API-Authenticate' => credentials(username, password)}
+      case response.code
+      when 100..199
+        return nil if attempts < 1
+        attempts -= 1
+        next
+      when 200..299
+        token = JSON.parse(response.body)['authentication']['token']
+        @service_token = token if username == API_USER && password == API_PASSWORD
+        return token
+      when 403
+        # Does not authenticate. Don't repeat the request.
+        return nil 
+      when 400
+        # Malformed credentials. Don't repeat the request.
+        return nil
+      when 400..499
+        # Client error. Don't repeat the request.
+        return nil
+      when 500
+        # Error. Don't repeat. 
+        return nil if attempts < 1
+        attempts -= 1
+        next
+      else
+        # Should never end up here.
+        raise "Authentication weirdness"
+      end
     end
   end
   

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "6.1.7"
+  VERSION = "6.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 6.1.7
+  version: 6.1.8
 platform: ruby
 authors:
 - Peter Bengtson