bjond-api 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aec8fffd13d372a603b382de0c6aeae1c73c4a7b
-  data.tar.gz: 20df01f0bdad2456c2f9a77893b79c2210a8c439
+  metadata.gz: c6b916f5e1273f9bcb9ac17f6cf491a4c4f2e501
+  data.tar.gz: 0480d45caa52d56814276c26e426d0357bb81bac
 SHA512:
-  metadata.gz: a9a808e736f95a18cf9a0ee957af7fe81c2674b95383b1c6f09fb04de50cecbc4b5eb041a4aba2e55d96ac41c91ce6953d77b268443383f4c2c5f7f63ecdf9e0
-  data.tar.gz: fdd587cba74e71e52d040cf1bcb131ca9b7e6ae4145f21ccc6619edd9337908d9b1bf6f72ec259559cb73b5607867156d49cd3c3b27491fe2a3ce10d04921b78
+  metadata.gz: c2bc1a0d8b002e1fad5f17ec4f5e90ba4f0955fdf1d46628be9ac69b47ce6bbf0c0f507ea2737f8b7b369789a9cdb7f02a02e61656c8018e61845d973cf8c1b8
+  data.tar.gz: c87c1016a328176b08f0c0529d141c6ae2cf48a6e1a313fdd15e66672fcb52c8d8da6fae77a062bbb0cf3e61cda7d64d38cb224b8e7f79524f9be446b533009e

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/app/controllers/bjondservices_controller.rb

@@ -32,7 +32,7 @@ class BjondservicesController < ApplicationController
 
 
   def register_group_endpoint
-    registration = BjondRegistration.find_registration_by_remote_request(request)
+    registration = get_registration
     service = BjondService.find_or_initialize_by(:group_id => params[:groupid], :bjond_registration_id => registration.id)
     if (service.endpoint != params[:endpoint])
       service.endpoint = params[:endpoint]
@@ -44,7 +44,7 @@ class BjondservicesController < ApplicationController
   ################ Encrypted Communication w Bjond servers ################
   def configure_group_endpoint
     puts 'configure_group_endpoint'
-    bjond_registration = BjondRegistration.find_registration_by_remote_request(request)
+    bjond_registration = get_registration
     result = jwt_decode_payload_and_return_json(request.raw_post, bjond_registration)
     BjondApi::BjondAppConfig.instance.configure_group(result, bjond_registration)
     render :json => {
@@ -55,13 +55,29 @@ class BjondservicesController < ApplicationController
   def get_schema
     puts 'get_schema'
     render :json => jwt_encode_payload(BjondApi::BjondAppConfig.instance.group_configuration_schema,
-                                       BjondRegistration.find_registration_by_remote_request(request))
+                                       get_registration)
   end
 
   def get_group_configuration
-    bjond_registration = BjondRegistration.find_registration_by_remote_request(request)
+    bjond_registration = get_registration
     payload = BjondApi::BjondAppConfig.instance.get_group_configuration(bjond_registration)
     render :json => jwt_encode_payload(payload.to_json, bjond_registration)
   end
 
+  def get_registration
+    ap params
+    registration = nil
+    if (params[:environment])
+      puts '**************** Looking up registration by environment'
+      registration = BjondRegistration.find_by_server(params[:environment])
+    end
+
+    if (registration.nil?)
+      puts 'searching by remote request'
+      registration = BjondRegistration.find_registration_by_remote_request(request)
+    end
+    ap registration
+    return registration
+  end
+
 end

data/bjond-api.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bjond-api 0.3.2 ruby lib
+# stub: bjond-api 0.3.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bjond-api".freeze
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Blake Rego".freeze]
-  s.date = "2016-09-09"
+  s.date = "2016-09-12"
   s.description = "Rails engine that provides communication between Bj\u{f6}nd Server Core and a client app.".freeze
   s.email = "blake.rego@bjondinc.com".freeze
   s.executables = ["rails".freeze]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bjond-api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Blake Rego
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails