vatusa_client 0.0.1a4 → 1.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1730f81685798917b3da56b547c435b9470d8836
-  data.tar.gz: 831b7fd5f6e9ed5ee1a6e0b061a801c8a848af4b
+  metadata.gz: c6a068db3e9c268dde7f1e381bdbf69f23b8e43f
+  data.tar.gz: 70016cbe37e86e307560de753865918a7eda95e0
 SHA512:
-  metadata.gz: 7eb041f55b163158043435086253bbd3da817272c3c2530c9b220ed9f47b61d826069e5fee12160e306f10e6296bd5e3b73e1583b75daa5eb0e247c780240402
-  data.tar.gz: 56ea82d682a7267f4cfd5bb28c25bb1171ccd44caf9b7bcd94bd29a33cc94515b9c2acdecaa052934b1629625438ee89a45942c16cd1e3f2064db16c468e3fb0
+  metadata.gz: 05170d4888b520dc5f399730bcadd4288ba74ff1b67f179eff0d0dde1dafd3dcc1806e699e27663b7245e305fce5b28c93ac525da85fd848814b911db58b836b
+  data.tar.gz: e30f0b281452bff0bdc14569ad2ace301ad39bdb93e4c4a7487baa31b037db2fa43770e20840fe249bff17795781657344d627f7e2460a13200572f12bcf8995

data/lib/vatusa_client/uls.rb

@@ -1,10 +1,12 @@
+require 'jose'
 require 'jose/jwk'
 require 'typhoeus'
 require 'json'
+require 'vatusa_client'
 
 module VatusaClient::ULS
     class ULSClient
-        def new(jwk:, facility:, dev: false)
+        def initialize(jwk:, facility:, dev: false)
             @jwk = JOSE::JWK.from(jwk)
             @facility = facility
             @dev = dev
@@ -16,14 +18,26 @@ module VatusaClient::ULS
         end
         def c_returned(token:, ip:)
             v, tok = @jwk.verify(token)
-            raise InvalidTokenException unless v
-            raise IPMismatchException unless tok['ip'] == ip or @dev
+            raise VatusaClient::ULS::Exceptions::InvalidTokenException unless v
+            raise VatusaClient::ULS::Exceptions::IPMismatchException unless tok['ip'] == ip or @dev
             req = Typhoeus.get(
                 'https://login.vatusa.net/uls/v2/info',
-                params: { token: tok }
+                params: { token: token }
             )
-            req.run
-            return JSON.parse(req.body)
+            r = JSON.parse(req.body)
+            if r.key?('status')
+                case r['status']
+                when 'error'
+                    if r.key?('msg')
+                        case r['msg']
+                        when 'Invalid token'
+                            raise VatusaClient::ULS::Exceptions::InvalidTokenException
+                        end
+                    end
+                when 'Expired'
+                    raise VatusaClient::ULS::Exceptions::ExpiredTokenException
+                end
+            end
         end
     end
     module Exceptions
@@ -35,5 +49,6 @@ module VatusaClient::ULS
         end
         class InvalidTokenException < VerificationException
         end
+        class ExpiredTokenException < VerificationException
     end
 end

data/lib/vatusa_client/version.rb

@@ -1,3 +1,3 @@
 module VatusaClient
-    VERSION = "0.0.1a4"
+    VERSION = "1.0.0rc1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vatusa_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1a4
+  version: 1.0.0rc1
 platform: ruby
 authors:
 - Julian DeMille
@@ -100,6 +100,7 @@ files:
 - lib/vatusa_client/api.rb
 - lib/vatusa_client/uls.rb
 - lib/vatusa_client/version.rb
+- vatusa_client-0.0.1a4.gem
 - vatusa_client.gemspec
 homepage: https://gitlab.com/vatusa-clients/vatusa_client_ruby
 licenses: []