lita-stackstorm 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 882ff1cc49a98751e6b5f2ea4d1801a1d661f0c8
-  data.tar.gz: eff92cd9224145295760a9c3e204083e86d026fa
+  metadata.gz: d2c537c4b77350c83a6d27e3af7bf44ee8987331
+  data.tar.gz: d1f40cd5510c37b3b999dbb3d596bb587f90eced
 SHA512:
-  metadata.gz: b4924a3d7bae2a3cf6090af4948f412172b2860b1d44e28034702066f310f9f5b15998153beae5cef9ff944d141b6a877ea5f046d07373bc3d2dc3aeae8db176
-  data.tar.gz: f2eda6a8f04787578156d97853b52c940fe008fc93cdddbf4da9fdee2469c0b0f124f040f7fac5eb4e49ee43e61a0c43384f8694388f624454505693bc907117
+  metadata.gz: 261f357ea263c5c9b8fa24b3cdcaf252bc38a023525bd65f14faad11b4711ba99fd016b456c12f2afe9d147fed8ef9827d74d2b7149e3d4d98ed655b23c6db3b
+  data.tar.gz: ab71084dc66552b5e2948431322dbb88f6c1c82887cec4ff8f239e8781c33c60ba88b27f53117ab9ae94274e51796f08a298ee6d62b7b9e46079ebef425636ba

data/lib/lita/handlers/stackstorm.rb

@@ -25,8 +25,24 @@ module Lita
 
       route /^!(.*)$/, :call_alias, command: false, help: {}
 
+      def auth_builder
+        if config.auth_port == 443 and config.url.start_with?('https')
+          "#{config.url}/auth"
+        else
+          "#{config.url}:#{config.auth_port}/v1"
+        end
+      end
+
+      def url_builder
+        if config.execution_port == 443 and config.url.start_with?('https')
+          "#{config.url}/api"
+        else
+          "#{config.url}:#{config.execution_port}/v1"
+        end
+      end
+
       def authenticate
-        resp = http.post("#{config.url}:#{config.auth_port}/v1/tokens") do |req|
+        resp = http.post("#{auth_builder()}/tokens") do |req|
           req.body = {}
           req.headers['Authorization'] = http.set_authorization_header(:basic_auth, config.username, config.password)
         end
@@ -52,7 +68,7 @@ module Lita
             source_channel: 'chatops',
             notification_channel: 'lita'
           }
-          s = make_post_request(":#{config.execution_port}/v1/aliasexecution", payload)
+          s = make_post_request("/aliasexecution", payload)
           j = JSON.parse(s.body)
           msg.reply "Got it! Details available at #{config.url}/#/history/#{j['execution']['id']}/general"
         elsif l.length > 0
@@ -70,7 +86,7 @@ module Lita
         if expired
           authenticate
         end
-        s = make_request(":#{config.execution_port}/v1/actionalias", "")
+        s = make_request("/actionalias", "")
         if JSON.parse(s.body).empty?
           msg.reply "No Action Aliases Registered"
         else
@@ -102,7 +118,7 @@ module Lita
       end
 
       def make_request(path, body)
-        resp = http.get("#{config.url}#{path}") do |req|
+        resp = http.get("#{url_builder()}#{path}") do |req|
           req.body = {}
           req.headers = headers
           req.body = body.to_json
@@ -111,7 +127,7 @@ module Lita
       end
 
       def make_post_request(path, body)
-        resp = http.post("#{config.url}#{path}") do |req|
+        resp = http.post("#{url_builder()}#{path}") do |req|
           req.body = {}
           req.headers = headers
           req.body = body.to_json

data/lita-stackstorm.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-stackstorm"
-  spec.version       = "0.5.0"
+  spec.version       = "0.5.1"
   spec.authors       = ["Jurnell Cockhren"]
   spec.email         = ["jurnell@sophicware.com"]
   spec.description   = "Stackstorm handler for lita 4+"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-stackstorm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Jurnell Cockhren
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Stackstorm handler for lita 4+