discourse_api 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83abc19a3d7e268f4e7bbed2ba58af029149bf8f
-  data.tar.gz: a355175ab4498a2d02f2cbb340b48987770882ba
+  metadata.gz: f274e6981e46cd2e393462cb9df4f24c8933aa5a
+  data.tar.gz: de4fded436009054fd23e9b889a3437ae6350452
 SHA512:
-  metadata.gz: 5db56a7d1101b1568cd51e52dee5df79651697c11f84c83e9b5c4e7c73336689e34a8e0ea1e6eb72f082c6efb6e61056b2ce5ac6c732acb355aff6a9044c0781
-  data.tar.gz: 98317ae29f5fc092f5126f988d35c73e29eb46baab5264fab7dd7e96fa6b73b643dd558121d5ef003736a2dd7c2d2beba22e0e3e5cf88c976a75b78cb760f1a5
+  metadata.gz: 255799bc16658b2c84945ba46e349126a095590dd869d2b715a58dc2a03e3a3cf4e008764b2e8fab29c3d544301391a77068f5a84ff433fa69ffceffec2a51ab
+  data.tar.gz: 61d1bb2ce5287e6666be41546948477a9baad9a122d14d004ed12156bd6d22aa967bace0160b9d31b0ccdda5463dbd0ac548c81f9761704b8336e8f24d099395

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.20.0] - 2017-12-13
+### Added
+- Add base error class
+### Fixed
+- Update SSO
+
 ## [0.19.0] - 2017-11-22
 ### Added
 - Added optional `create_post` params

data/README.md

@@ -80,4 +80,5 @@ client.create_private_message(                  #=> Creates a private messages b
 1. Install discourse locally
 2. Inside of your discourse directory, run: `bundle exec rake db:api_test_seed`
 3. Start discourse: `bundle exec rails s`
-4. Inside of your discourse_api directory, run: `bundle exec rspec spec/`
+4. Install bundler in the discourse_api directory, run `gem install bundler`
+5. Inside of your discourse_api directory, run: `bundle exec rspec spec/`

data/lib/discourse_api/error.rb

@@ -1,5 +1,8 @@
 module DiscourseApi
-  class Error < StandardError
+  class DiscourseError < StandardError
+  end
+
+  class Error < DiscourseError
     attr_reader :wrapped_exception
 
     # Initializes a new Error object
@@ -12,15 +15,15 @@ module DiscourseApi
     end
   end
 
-  class UnauthenticatedError < StandardError
+  class UnauthenticatedError < DiscourseError
   end
 
-  class NotFoundError < StandardError
+  class NotFoundError < DiscourseError
   end
 
-  class UnprocessableEntity < StandardError
+  class UnprocessableEntity < DiscourseError
   end
 
-  class TooManyRequests < StandardError
+  class TooManyRequests < DiscourseError
   end
 end

data/lib/discourse_api/single_sign_on.rb

@@ -4,14 +4,16 @@ require 'openssl'
 
 module DiscourseApi
   class SingleSignOn
-    ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update,
-                 :about_me, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title]
+    ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update, :require_activation,
+                 :bio, :external_id, :return_sso_url, :admin, :moderator, :suppress_welcome_message, :title,
+                 :add_groups, :remove_groups, :groups]
     FIXNUMS = []
-    BOOLS = [:avatar_force_update, :admin, :moderator, :suppress_welcome_message]
+    BOOLS = [:avatar_force_update, :admin, :moderator, :require_activation, :suppress_welcome_message]
+    ARRAYS = [:groups]
     #NONCE_EXPIRY_TIME = 10.minutes # minutes is a rails method and is causing an error. Is this needed in the api?
 
     attr_accessor(*ACCESSORS)
-    attr_accessor :sso_secret, :sso_url
+    attr_writer :sso_secret, :sso_url
 
     def self.sso_secret
       raise RuntimeError, "sso_secret not implemented on class, be sure to set it on instance"
@@ -44,15 +46,12 @@ module DiscourseApi
         if BOOLS.include? k
           val = ["true", "false"].include?(val) ? val == "true" : nil
         end
+        val = Array(val) if ARRAYS.include?(k) && !val.nil?
         sso.send("#{k}=", val)
       end
 
-      decoded_hash.each do |k,v|
-        # 1234567
-        # custom.
-        #
-        if k[0..6] == "custom."
-          field = k[7..-1]
+      decoded_hash.each do |k, v|
+        if field = k[/^custom\.(.+)$/, 1]
           sso.custom_fields[field] = v
         end
       end
@@ -60,6 +59,10 @@ module DiscourseApi
       sso
     end
 
+    def diagnostics
+      DiscourseApi::SingleSignOn::ACCESSORS.map { |a| "#{a}: #{send(a)}" }.join("\n")
+    end
+
     def sso_secret
       @sso_secret || self.class.sso_secret
     end
@@ -72,32 +75,30 @@ module DiscourseApi
       @custom_fields ||= {}
     end
 
-
     def sign(payload)
       OpenSSL::HMAC.hexdigest("sha256", sso_secret, payload)
     end
 
-
-    def to_url(base_url=nil)
+    def to_url(base_url = nil)
       base = "#{base_url || sso_url}"
       "#{base}#{base.include?('?') ? '&' : '?'}#{payload}"
     end
 
     def payload
-      payload = Base64.encode64(unsigned_payload)
+      payload = Base64.strict_encode64(unsigned_payload)
       "sso=#{CGI::escape(payload)}&sig=#{sign(payload)}"
     end
 
     def unsigned_payload
       payload = {}
-      ACCESSORS.each do |k|
-       next if (val = send k) == nil
 
+      ACCESSORS.each do |k|
+        next if (val = send k) == nil
        payload[k] = val
       end
 
       if @custom_fields
-        @custom_fields.each do |k,v|
+        @custom_fields.each do |k, v|
           payload["custom.#{k}"] = v.to_s
         end
       end

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.19.0"
+  VERSION = "0.20.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_api
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Sam Saffron
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-22 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -307,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Allows access to the Discourse API