mobius-client 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb3a779d514fea2f8482f7843d4c2e78ce01902a
-  data.tar.gz: bf92f3da028fc789bb158f81318239d66ee84add
+  metadata.gz: a684d298e256ef48ac6444bf5c5332d916782599
+  data.tar.gz: ea6423937edabcb334ae694050c9d801307119c3
 SHA512:
-  metadata.gz: 7f6a32e7302f77b8530e6b8f79ef84091cf69ff1902721f928bbb1392227fef2a18d9563250fb178062359e0788f97d082de26d670aa7edf485c0d476afa9794
-  data.tar.gz: b6af2c669c2a6311fe6a5ddadf55a78a9eb98d33938dd720cbdbb5d0f715b1de4320fd02a5bc7a9496e98e9921b9a7e13acadcee72fc82cba8e410540a633ed8
+  metadata.gz: c1b6871824d70a6145b64dc602cee22f4056e7d66c815ac7eaffbb559ebeb5821def7c8651b69484259b11a518e629313c743ceb7fdb7484f8a7f00fa15e6809
+  data.tar.gz: 9d5fc04dbf0a28ced1639082be72426c444e4386cefb9c2c750ea9e2079caa774e45ce2fcf16b3721c3043a73ab159b15cac4f96e52b5a76f809d446a911def4

data/README.md

@@ -194,13 +194,13 @@ class AppController < ApplicationController
 
   # GET /balance
   def balance
-    render plain: app.balance
+    render plain: app.user_balance
   end
 
   # POST /charge
   def charge
     app.charge(ROUND_PRICE)
-    render plain: app.balance
+    render plain: app.user_balance
   rescue Mobius::Client::Error::InsufficientFunds
     render :gone
   end

data/lib/mobius/client/app.rb

@@ -56,7 +56,7 @@ class Mobius::Client::App
   def charge(amount, target_address: nil)
     amount = cast_amount(amount)
 
-    raise Mobius::Client::Error::InsufficientFunds if balance < amount
+    raise Mobius::Client::Error::InsufficientFunds if user_balance < amount
 
     submit_tx do |operations|
       operations << payment_op(amount, dest: app_keypair, src: user_keypair)

data/lib/mobius/client/auth/jwt.rb

@@ -10,13 +10,13 @@ class Mobius::Client::Auth::Jwt
   # Returns JWT token.
   # @param token [Mobius::Client::Auth::Token] Valid auth token
   # @return [String] JWT token
-  def encode(token)
+  def encode(token, options = {})
     payload = {
-      hash: token.hash(:hex),
-      public_key: token.address,
-      min_time: token.time_bounds.min_time,
-      max_time: token.time_bounds.max_time
-    }
+      jti: token.hash(:hex),
+      sub: token.address,
+      iat: token.time_bounds.min_time,
+      exp: token.time_bounds.max_time
+    }.merge(options)
 
     JWT.encode(payload, secret, ALG)
   end
@@ -25,11 +25,9 @@ class Mobius::Client::Auth::Jwt
   # @param jwt [String] JWT token
   # @return [Hash] Decoded token params
   def decode!(jwt)
-    OpenStruct.new(
-      JWT.decode(jwt, secret, true, algorithm: ALG).first
-    ).tap do |payload|
-      raise TokenExpired unless (payload.min_time..payload.max_time).cover?(Time.now.to_i)
-    end
+    OpenStruct.new(JWT.decode(jwt, secret, true, algorithm: ALG).first)
+  rescue JWT::ExpiredSignature => _
+    raise TokenExpired
   end
 
   # Used JWT algorithm

data/lib/mobius/client/version.rb

@@ -1,5 +1,5 @@
 module Mobius
   module Client
-    VERSION = "0.4.0".freeze
+    VERSION = "0.5.0".freeze
   end
 end

data/lib/mobius/client.rb

@@ -9,8 +9,6 @@ require "jwt"
 
 require "mobius/client/version"
 
-require "pry-byebug" rescue LoadError
-
 module Mobius
   module Cli
     autoload :Base,   "mobius/cli/base"

data/mobius-client.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "bundler-audit", "~> 0.6.0"
   spec.add_development_dependency "httplog", "~> 1.0", ">= 1.0.2"
-  spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 0.53"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobius-client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Viktor Sokolov
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement