ctws 0.1.13.alpha → 0.1.14.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f86a86cc1af9c424b2349bad827b752cce5ad87
-  data.tar.gz: 167ea2979b16ea75af0ba49790e30a69765ee58f
+  metadata.gz: 42cf1778d44f1e0fc1b9c0be34387d7746070979
+  data.tar.gz: d5948630771004880418c9164559198bfc0a937a
 SHA512:
-  metadata.gz: 78997a0717a48effc5370641eec6d86d16b0069c640d762e246dd2e4dbe6ff69729adbdfa2fde10b36f741defc9f1caf884aeafce351d3655aec9794afcc05bd
-  data.tar.gz: af4cf13d78a02772d22c650841d7dab03e9b342df78b2cdc52a3a48d4894594a5b9aea2d331b6d35bc3a642b661ffd40f13d90fe7642ea0fcc5ec9f38e541f17
+  metadata.gz: '08c94533c262016260efd779fae227de4a2eb5adf1a3d8cc8cca412106d31a768eb9bb152d2a6655da7aa995328a603221c6bd2d63d7ff491af38cd42eef4eb7'
+  data.tar.gz: 05d48c75a9ea212fb9bb583ded70685bda1e87c00ecac427bfccf34ddb811414725e97a2af43db67e42bba55b0ef8b417c32cf9555325c958097c212766b1ebd

data/app/controllers/concerns/ctws/exception_handler.rb

@@ -16,6 +16,7 @@ module Ctws
     class UnprocessableEntity < StandardError; end
     class RoutingError < StandardError; end
     class NotConfirmed < StandardError; end
+    class VerificationError < StandardError; end
 
     included do
       # Define custom handlers
@@ -29,6 +30,7 @@ module Ctws
       rescue_from ActiveRecord::RecordNotFound, with: :not_found
       rescue_from ActionController::RoutingError, with: :not_found
       rescue_from ExceptionHandler::NotConfirmed, with: :not_confirmed
+      rescue_from ExceptionHandler::VerificationError, with: :four_ninety_eight
     end
 
     # JSON response with message; Status code 401 - Unauthorized

data/app/controllers/ctws/authentication_controller.rb

@@ -1,26 +1,25 @@
 module Ctws
   class AuthenticationController < CtwsController
     skip_before_action :authorize_request, only: :authenticate
-    
+
     # return auth token once user is authenticated
     def authenticate
       auth_token = Ctws::AuthenticateUser.new(auth_params[:email], auth_params[:password]).call
       json_response auth_as_jsonapi(auth_token)
-      
     end
-    
+
     private
-    
+
     def auth_as_jsonapi auth_token
       [{
         type: controller_name,
         attributes: {
-          message: Ctws::Message.authenticated_user_success, 
-          auth_token: auth_token, 
+          message: Ctws::Message.authenticated_user_success,
+          auth_token: auth_token
         }
       }]
     end
-    
+
     def auth_params
       params.permit(:email, :password)
     end

data/app/controllers/ctws/min_app_versions_controller.rb

@@ -8,12 +8,12 @@ module Ctws
       min_app_versions = []
       MinAppVersion.all.order(updated_at: :desc).group_by(&:platform).each do |platforms|
         platforms[1].each_with_index do |platform, index|
-          min_app_versions << {platforms[0] => platform.as_jsonapi} if index == 0
+          min_app_versions.push(platform.as_jsonapi) if index == 0
         end
       end
       json_response min_app_versions
     end
-    
+
     # GET /min_app_versions
     def index
       json_response MinAppVersion.all

data/app/lib/ctws/json_web_token.rb

@@ -1,7 +1,7 @@
 module Ctws
   class JsonWebToken
     require 'jwt'
-    
+
     # secret to encode and decode token
     HMAC_SECRET = Rails.application.secrets.secret_key_base
 
@@ -17,9 +17,13 @@ module Ctws
       body = JWT.decode(token, HMAC_SECRET)[0]
       HashWithIndifferentAccess.new body
       # rescue from expiry exception
-    rescue JWT::ExpiredSignature, JWT::VerificationError => e
-      # raise custom error to be handled by custom handler
-      raise Ctws::ExceptionHandler::ExpiredSignature, e.message
+      rescue JWT::ExpiredSignature => e
+        # raise custom error to be handled by custom handler
+        raise Ctws::ExceptionHandler::ExpiredSignature, e.message
+      rescue JWT::VerificationError => e
+        # raise custom error to be handled by custom handler
+        raise Ctws::ExceptionHandler::VerificationError, Ctws::Message.invalid_token
+
     end
   end
 end

data/app/lib/ctws/message.rb

@@ -24,16 +24,20 @@ module Ctws
       I18n.t('ctws.unauthorized')
     end
 
-    def self.account_created
-      I18n.t('ctws.account_created')
+    def self.resource_created(resource)
+      I18n.t('ctws.resource_created', resource: resource)
     end
 
-    def self.account_not_created
-      I18n.t('ctws.account_not_created')
+    def self.resource_updated(resource: resource)
+      I18n.t('ctws.resource_updated', resource: resource)
     end
 
-    def self.account_doesnt_exist
-      I18n.t('ctws.account_doesnt_exist')
+    def self.resource_not_created(resource: resource)
+      I18n.t('ctws.resource_not_created', resource: resource)
+    end
+
+    def self.resource_doesnt_exist(resource: resource)
+      I18n.t('ctws.resource_doesnt_exist', resource: resource)
     end
 
     def self.authenticated_user_success
@@ -47,5 +51,9 @@ module Ctws
     def self.record_not_confirmed(record = 'record')
       I18n.t('ctws.record_not_confirmed', record: record)
     end
+
+    def self.signature_verification_raised
+      I18n.t('ctws.signature_verification_raised')
+    end
   end
 end

data/app/models/ctws/min_app_version.rb

@@ -1,22 +1,20 @@
 module Ctws
   class MinAppVersion < ApplicationRecord
     validates_presence_of :codename, :description, :platform, :min_version, :store_uri
-  
+
     def as_jsonapi(options={})
       {
         type: ActiveModel::Naming.param_key(self),
         id: self.id,
         attributes: {
-          codename: self.codename, 
-          description: self.description, 
-          min_version: self.min_version, 
-          platform: self.platform, 
+          codename: self.codename,
+          description: self.description,
+          min_version: self.min_version,
+          platform: self.platform,
           store_uri: self.store_uri,
           updated_at: self.updated_at
         }
       }
     end
   end
-  
-  
 end

data/config/locales/ctws_messages_ca.yml

@@ -1,14 +1,15 @@
 ca:
   ctws:
-    account_created: "S'ha creat el compte amb èxit."
-    account_doesnt_exist: "El compte no existeix."
-    account_not_created: "No s'ha pogut crear el compte."
-    authenticated_user_success: "Usuari autenticat amb èxit."
+    authenticated_user_success: "usuari autenticat amb èxit."
     expired_token: "Ho sentim, el vostre token ha caducat. Inicieu sessió per continuar."
     invalid_credentials: "Credencials no vàlides."
     invalid_token: "Token invàlid."
     missing_token: "Falta token."
     not_found: "No s'ha trobat %{record}."
     record_not_confirmed: "%{record} no confirmat."
+    resource_created: "S'ha creat el %{resource} amb èxit."
+    resource_doesnt_exist: "El %{resource} no existeix."
+    resource_not_created: "No s'ha pogut crear el %{resource}."
+    resource_updated: "S'ha actualitzat el %{resource} amb èxit."
     unauthorized: "Sol·licitud no autoritzada."
     unmatched_route: "Cap ruta coincideix amb %{route}."

data/config/locales/ctws_messages_en.yml

@@ -1,14 +1,15 @@
 en:
   ctws:
-    account_created: "Account created successfully."
-    account_doesnt_exist: "Account doesn't exist."
-    account_not_created: "Account could not be created."
-    authenticated_user_success: "Authenticated user successfully."
+    authenticated_user_success: "Authenticated %{resource} successfully."
     expired_token: "Sorry, your token has expired. Please login to continue."
     invalid_credentials: "Invalid credentials."
     invalid_token: "Invalid token."
     missing_token: "Missing token."
     not_found: "Sorry, %{record} not found."
     record_not_confirmed: "%{record} not confirmed."
+    resource_created: "%{resource} created successfully."
+    resource_doesnt_exist: "%{resource} doesn't exist."
+    resource_not_created: "%{resource} could not be created."
+    resource_updated: "%{resource} created successfully."
     unauthorized: "Unauthorized request."
     unmatched_route: "No route matches %{route}."

data/config/locales/ctws_messages_es.yml

@@ -1,8 +1,5 @@
 es:
   ctws:
-    account_created: "Cuenta creada con éxito."
-    account_doesnt_exist: "La cuenta no existe."
-    account_not_created: "La cuenta no pudo ser creada."
     authenticated_user_success: "Usuario autenticado con éxito."
     expired_token: "Tu token ha expirado, por favor inicie sesión para continuar."
     invalid_credentials: "Credenciales no válidas."
@@ -10,5 +7,9 @@ es:
     missing_token: "Falta token."
     not_found: "Lo sentimos, %{record} no encontrado."
     record_not_confirmed: "%{record} not confirmado."
+    resource_created: "%{resource} creado con éxito."
+    resource_doesnt_exist: "%{resource} no existe."
+    resource_not_created: "%{resource} no pudo ser creada."
+    resource_updated: "%{resource} actualizado con éxito."
     unauthorized: "Solicitud no autorizada."
     unmatched_route: "Ninguna ruta coincide con %{route}."

data/lib/ctws/version.rb

@@ -1,3 +1,3 @@
 module Ctws
-  VERSION = '0.1.13.alpha'
+  VERSION = '0.1.14.beta'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ctws
 version: !ruby/object:Gem::Version
-  version: 0.1.13.alpha
+  version: 0.1.14.beta
 platform: ruby
 authors:
 - Agustí B.R.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2018-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rails gem to be used as Webservice base.