bjond-api 0.3.6 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6233aca9691d51f8bb56fc751e4265b01ac23514
-  data.tar.gz: 9eeffbc67ef255cc405804599c59b7a46e2d2486
+  metadata.gz: 82a0156fdf8e39b37d70a3c3b1c14080cbb95bad
+  data.tar.gz: 4a4b1322de078979b37d0463371a0e73c408ff45
 SHA512:
-  metadata.gz: 017ddc9c3ce3e0b1006aec1180870d20bd368946267c5507a0e46b2abe204608845e459322d4e2abd4814f88a298f96cc6073aca62ef044589fd0cc2a2b96570
-  data.tar.gz: 2773cc89b11292d6d0cb3e87a0e0193a28d481b3ca058198e0f351a5d52743f5fcb5452928c4fa4d0c746a8c1abd15f9a1eb3841b2c79f380aceec954da514c5
+  metadata.gz: 927d3e18556a622c48e7a888878fc9419792a0c24207863797746b6cf44f3950579a7c8f068805130ce1e0b578801870d09a72e0ce63485e4c71a2ad9b4b1d8b
+  data.tar.gz: a4a10a435810f450de2ca2d81db4b44ad61d728afb904f5329c111b158f22a6b474534288dd3a3d51b19e9b69d4389c2b10421f2aecafc7040387db21b765c8c

data/Gemfile

@@ -1,4 +1,4 @@
-
+source 'https://rubygems.org'
 gem 'rails', '~> 4.2', '>= 4.2.4'
 
 group :development, :test do

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.9

data/app/controllers/bjondservices_controller.rb

@@ -11,6 +11,19 @@ class BjondservicesController < ApplicationController
     @app_info = BjondApi::BjondAppConfig.instance.active_definition
   end
 
+  def edit
+    @bjondservice = BjondService.find(params[:id])
+  end
+
+  def update
+    @bjondservice = BjondService.find(params[:id])
+    if @bjondservice.update(bjondservices_params)
+      redirect_to @bjondservice.bjond_registration, notice: 'Bjond services was successfully updated.'
+    else
+      render @bjondservice.bjond_registration
+    end
+  end
+
   def register
     registration = BjondRegistration.find_by_id(params[:id])
     if (!registration.nil?)
@@ -80,4 +93,10 @@ class BjondservicesController < ApplicationController
     return registration
   end
 
+  # Only allow a trusted parameter "white list" through.
+  private
+    def bjondservices_params
+      params.require(:bjond_service).permit(:group_id, :endpoint_id,)
+    end
+
 end

data/app/views/bjond_registrations/_form.html.erb

@@ -32,7 +32,7 @@
 
   <div class="field">
     <span class="label">
-      Encryption Key
+      API Key / Encryption Key
     </span>
     <%= f.text_field :encryption_key %>
   </div>

data/app/views/bjond_registrations/show.html.erb

@@ -24,7 +24,7 @@
   <%- if (@bjond_registration.encrypted_encryption_key) %>
     <div class="encryption-key-found">
       <p>
-        <strong>Encryption Key (encrypted):</strong>
+        <strong>API Key / Encryption Key (encrypted):</strong>
         <%= @bjond_registration.encrypted_encryption_key %>
       </p>
     </div>
@@ -54,6 +54,21 @@
       Bjond Services associated with this Registration
     </h3>
 
+    <div class="bjond-info">
+      <p>
+        <strong>Note:</strong></br>
+        Please verify that the service endpoints below have the correct host.
+        If the host (preceeding /server-core/services..) is incorrect, the Bjond Server
+        may need to set its OPENSHIFT_PUBLIC_URL environment variable. Once this
+        environment variable is re-set (and the Bjond Server restarted), please
+        re-register the affected services.
+      </p>
+      <p>
+        The endpoints may also be manually updated by modifying the Bjond Service.
+        Please exercise caution when modifying these fields.
+      </p>
+    </div>
+
     <%- @services.each do |service| %>
       <div class="bjond-service">
         <p>
@@ -70,6 +85,10 @@
           <%= service.endpoint %>
         </p>
 
+        <p>
+          <%= link_to "Modify Bjond Service", "/bjond-app/services/edit/#{service.id}"%>
+        </p>
+
       </div>
     <% end %>
   <% end %>

data/app/views/bjondservices/edit.html.erb

@@ -0,0 +1,36 @@
+<div class="edit-registrations">
+  <h1 class="app-info-header">Editing Bjond Bjond Service</h1>
+
+  <%= form_for(@bjondservice, :url => "/bjond-app/services/#{@bjondservice.id}") do |f| %>
+    <% if @bjondservice.errors.any? %>
+      <div id="error_explanation">
+        <h2><%= pluralize(@bjondservice.errors.count, "error") %> prohibited this bjondservice from being saved:</h2>
+
+        <ul>
+        <% @bjondservice.errors.full_messages.each do |message| %>
+          <li><%= message %></li>
+        <% end %>
+        </ul>
+      </div>
+    <% end %>
+
+    <div class="field">
+      <span class="label">
+        Group ID:
+      </span>
+      <%= f.text_field :group_id %>
+    </div>
+    <div class="field">
+      <span class="label">
+        Endpoint:
+      </span>
+      <%= f.text_field :endpoint %>
+    </div>
+    
+    <div class="actions">
+      <%= f.submit %>
+    </div>
+  <% end %>
+
+
+</div>

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.6 ruby lib
+# stub: bjond-api 0.3.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bjond-api".freeze
-  s.version = "0.3.6"
+  s.version = "0.3.9"
 
   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-12"
+  s.date = "2016-12-20"
   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]
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "app/views/bjond_registrations/index.html.erb",
     "app/views/bjond_registrations/new.html.erb",
     "app/views/bjond_registrations/show.html.erb",
+    "app/views/bjondservices/edit.html.erb",
     "app/views/bjondservices/index.html.erb",
     "app/views/shared/_app_info.html.erb",
     "bin/rails",
@@ -85,7 +86,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/Bjond/bjond-integration-gem".freeze
   s.licenses = ["GPL".freeze]
-  s.rubygems_version = "2.6.6".freeze
+  s.rubygems_version = "2.6.7".freeze
   s.summary = "Interface that facilitates communication with Bj\u{f6}nd servers.".freeze
 
   if s.respond_to? :specification_version then

data/config/routes.rb

@@ -1,10 +1,15 @@
 Rails.application.routes.draw do
 
   resources :bjond_registrations
-  get  '/bjond-app/services/' => 'bjondservices#index'
-  get  '/bjond-app/services/schema' => 'bjondservices#get_schema'
-  get  '/bjond-app/services/register' => 'bjondservices#register'
-  post '/bjond-app/services/:groupid/register' => 'bjondservices#register_group_endpoint'
-  get  '/bjond-app/services/:groupid/read' => 'bjondservices#get_group_configuration'
-  post '/bjond-app/services/:groupid/configure' => 'bjondservices#configure_group_endpoint'
+
+  scope '/bjond-app' do
+    get  '/services/' => 'bjondservices#index'
+    get  '/services/edit/:id' => 'bjondservices#edit'
+    patch  '/services/:id' => 'bjondservices#update'
+    get  '/services/schema' => 'bjondservices#get_schema'
+    get  '/services/register' => 'bjondservices#register'
+    post '/services/:groupid/register' => 'bjondservices#register_group_endpoint'
+    get  '/services/:groupid/read' => 'bjondservices#get_group_configuration'
+    post '/services/:groupid/configure' => 'bjondservices#configure_group_endpoint'
+  end
 end

data/lib/bjond-api.rb

@@ -32,6 +32,7 @@ module BjondApi
     services.each do |bjond_svc|
       url = bjond_svc.endpoint + "/#{event_id}"
       puts "Creating connection to " + url
+      puts BjondJwt::jwt_encode_payload(payload, bjond_registration)
       conn = Faraday.new(:url => url)
       conn.post do |req|
         req.headers['Content-Type'] = 'application/json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bjond-api
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.9
 platform: ruby
 authors:
 - Blake Rego
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -146,6 +146,7 @@ files:
 - app/views/bjond_registrations/index.html.erb
 - app/views/bjond_registrations/new.html.erb
 - app/views/bjond_registrations/show.html.erb
+- app/views/bjondservices/edit.html.erb
 - app/views/bjondservices/index.html.erb
 - app/views/shared/_app_info.html.erb
 - bin/rails
@@ -190,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Interface that facilitates communication with Bjönd servers.