discourse_api 0.2.8 → 0.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDE1ZjRkODM3YTU1NDc4YTM4Y2Q3YWFkMTc4YzM5MWY3ZjRhNDRjMw==
+    ODA2NDFjN2M1NWFhODkxZGM2Yjg3MTlhYWM2MWUzNzhiOGNiZTM0MA==
   data.tar.gz: !binary |-
-    NTZmODMxODE2ZDAxNmY2MzYzMWY1YmE4YWJkYmMyMWE5NWM1OTM4NQ==
+    MTVhODU2YmE5MDM3ODdiZGUwMTQxY2U4ZGNiM2MyZjAxNmM1ODBhZg==
 SHA512:
   metadata.gz: !binary |-
-    NzFmOGNhMmRmY2IyMmM5YTAwYmQyNzRiNTI3YzVmYzcyZDhhMTBiZDFmZDNh
-    Njg3Mzc1NDkzZjdkMWFlOWQyMTk0OTM3MGExOGQ2ZDM4ZTI4MDYxOTVhNmE5
-    MTkzZjQwYjgwYjI3OTEzYTkyNDQ3ZTc1MzNlZGI0NTg4ZjBhZmM=
+    ODAyY2M0MzU2OTk5ODVmNDJhNjIxNjgzODI4ZGRlODUyMjdlNzIyZDI1MjVj
+    ZjFiMzg2MjA2ZWQ0MjM3MDhhYWIwODEzNjhjNDQ4ZmQ3YmQ1OWYzNTk0MjQz
+    MWFlMWI2ZjcyZWUxOWJiOGYzNTM5YzE1NDA3YjQ3OTEzMTczY2I=
   data.tar.gz: !binary |-
-    N2RmNDhiYzZiY2E1ZDQyMWMzZjRmZWYyZTMxOTI2ZmZjYTM4NDlkZTkwZTY3
-    ODVjMGJmNWZhNzU5YzI1YTNhMzI5ODdjNDgxMjMwMTA2MjQwYzFhOGNhOGNj
-    NjllMzUzMmE2NzZhYTQ1ZmQ4YTA0NzhhNGNhZmZmODNkYzkzZTI=
+    N2Q3YmYzMzZkZjIxMzRjYWMxNzEzY2VhNjU2NmFmMWYzYWVmOTY2MjNiNWM2
+    NTgzYjRiYTA1MmVjMTU4NzdiMzBiMTJlZmUzYmFlM2Q5YWVlYmJhYmY4NjEw
+    YmE0ZDBkY2IyODk3ZTBjYzk4Mjc4MTZhNDRjYWYyMTVkMGM1ODc=

data/lib/discourse_api.rb

@@ -2,3 +2,4 @@ require "discourse_api/api/params"
 require "discourse_api/client"
 require "discourse_api/error"
 require "discourse_api/version"
+require "discourse_api/single_sign_on"

data/lib/discourse_api/api/sso.rb

@@ -1,10 +1,8 @@
-require 'single_sign_on'
-
 module DiscourseApi
   module API
     module SSO
       def sync_sso(params={})
-        sso = SingleSignOn.new
+        sso = DiscourseApi::SingleSignOn.new
         sso.sso_secret = params[:sso_secret]
         sso.name = params[:name]
         sso.username = params[:username]

data/lib/discourse_api/single_sign_on.rb

@@ -0,0 +1,102 @@
+require 'base64'
+require 'rack'
+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]
+    FIXNUMS = []
+    BOOLS = [:avatar_force_update, :admin, :moderator]
+
+    attr_accessor(*ACCESSORS)
+    attr_accessor :sso_secret, :sso_url
+
+    def self.sso_secret
+      raise RuntimeError, "sso_secret not implemented on class, be sure to set it on instance"
+    end
+
+    def self.sso_url
+      raise RuntimeError, "sso_url not implemented on class, be sure to set it on instance"
+    end
+
+    def self.parse(payload, sso_secret = nil)
+      sso = new
+      sso.sso_secret = sso_secret if sso_secret
+
+      parsed = Rack::Utils.parse_query(payload)
+      if sso.sign(parsed["sso"]) != parsed["sig"]
+        raise RuntimeError, "Bad signature for payload"
+      end
+
+      decoded = Base64.decode64(parsed["sso"])
+      decoded_hash = Rack::Utils.parse_query(decoded)
+
+      ACCESSORS.each do |k|
+        val = decoded_hash[k.to_s]
+        val = val.to_i if FIXNUMS.include? k
+        if BOOLS.include? k
+          val = ["true", "false"].include?(val) ? val == "true" : nil
+        end
+        sso.send("#{k}=", val)
+      end
+
+      decoded_hash.each do |k,v|
+        # 1234567
+        # custom.
+        #
+        if k[0..6] == "custom."
+          field = k[7..-1]
+          sso.custom_fields[field] = v
+        end
+      end
+
+      sso
+    end
+
+    def sso_secret
+      @sso_secret || self.class.sso_secret
+    end
+
+    def sso_url
+      @sso_url || self.class.sso_url
+    end
+
+    def custom_fields
+      @custom_fields ||= {}
+    end
+
+
+    def sign(payload)
+      OpenSSL::HMAC.hexdigest("sha256", sso_secret, payload)
+    end
+
+
+    def to_url(base_url=nil)
+      base = "#{base_url || sso_url}"
+      "#{base}#{base.include?('?') ? '&' : '?'}#{payload}"
+    end
+
+    def payload
+      payload = Base64.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
+
+       payload[k] = val
+      end
+
+      if @custom_fields
+        @custom_fields.each do |k,v|
+          payload["custom.#{k}"] = v.to_s
+        end
+      end
+
+      Rack::Utils.build_query(payload)
+    end
+  end
+end

data/lib/discourse_api/version.rb

@@ -1,3 +1,3 @@
 module DiscourseApi
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse_api
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Sam Saffron
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -220,8 +220,8 @@ files:
 - lib/discourse_api/api/users.rb
 - lib/discourse_api/client.rb
 - lib/discourse_api/error.rb
+- lib/discourse_api/single_sign_on.rb
 - lib/discourse_api/version.rb
-- lib/single_sign_on.rb
 - routes.txt
 - spec/discourse_api/api/categories_spec.rb
 - spec/discourse_api/api/groups_spec.rb
@@ -298,3 +298,4 @@ test_files:
 - spec/fixtures/user_update_user.json
 - spec/fixtures/user_update_username.json
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/single_sign_on.rb

@@ -1,98 +0,0 @@
-require 'base64'
-require 'rack'
-require 'openssl'
-
-class SingleSignOn
-  ACCESSORS = [:nonce, :name, :username, :email, :avatar_url, :avatar_force_update,
-               :about_me, :external_id]
-  FIXNUMS = []
-  NONCE_EXPIRY_TIME = 600 # 10 minutes
-
-  attr_accessor(*ACCESSORS)
-  attr_accessor :sso_secret, :sso_url
-
-  def self.sso_secret
-    raise RuntimeError, "sso_secret not implemented on class, be sure to set it on instance"
-  end
-
-  def self.sso_url
-    raise RuntimeError, "sso_url not implemented on class, be sure to set it on instance"
-  end
-
-  def self.parse(payload, sso_secret = nil)
-    sso = new
-    sso.sso_secret = sso_secret if sso_secret
-
-    parsed = Rack::Utils.parse_query(payload)
-    if sso.sign(parsed["sso"]) != parsed["sig"]
-      raise RuntimeError, "Bad signature for payload"
-    end
-
-    decoded = Base64.decode64(parsed["sso"])
-    decoded_hash = Rack::Utils.parse_query(decoded)
-
-    ACCESSORS.each do |k|
-      val = decoded_hash[k.to_s]
-      val = val.to_i if FIXNUMS.include? k
-      sso.send("#{k}=", val)
-    end
-
-    decoded_hash.each do |k,v|
-      # 1234567
-      # custom.
-      #
-      if k[0..6] == "custom."
-        field = k[7..-1]
-        sso.custom_fields[field] = v
-      end
-    end
-
-    sso
-  end
-
-  def sso_secret
-    @sso_secret || self.class.sso_secret
-  end
-
-  def sso_url
-    @sso_url || self.class.sso_url
-  end
-
-  def custom_fields
-    @custom_fields ||= {}
-  end
-
-
-  def sign(payload)
-    OpenSSL::HMAC.hexdigest("sha256", sso_secret, payload)
-  end
-
-
-  def to_url(base_url=nil)
-    base = "#{base_url || sso_url}"
-    "#{base}#{base.include?('?') ? '&' : '?'}#{payload}"
-  end
-
-  def payload
-    payload = Base64.encode64(unsigned_payload)
-    "sso=#{CGI::escape(payload)}&sig=#{sign(payload)}"
-  end
-
-  def unsigned_payload
-    payload = {}
-    ACCESSORS.each do |k|
-     next unless (val = send k)
-
-     payload[k] = val
-    end
-
-    if @custom_fields
-      @custom_fields.each do |k,v|
-        payload["custom.#{k}"] = v.to_s
-      end
-    end
-
-    Rack::Utils.build_query(payload)
-  end
-
-end