doorkeeper_sso 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bd334100cf66c77b3f645412a863eabdc1662d2
-  data.tar.gz: dc41d49dbc70d8372eafd3f3b4d4992d46f70ec7
+  metadata.gz: 229918057255c549df3c4f5f01fb54df4710c160
+  data.tar.gz: 42ddf70c03c67529561f1cfb35fc055c409baa9f
 SHA512:
-  metadata.gz: 733ec62c0762c923ccd25322e5670641f531850fddb84778a408c1d45bdac1b19c928db1114caeb296391e57bb4b2ec26f69cd43414ba53face2da3ab5cdd606
-  data.tar.gz: efdd2637c8a3b766f47766d985e7ffab1d1ee2643e2299b0b156dc049c474de6970983bf3e66e384742fff00915285100f24f9b877e94dc84e80d7dfe1ad94a7
+  metadata.gz: 44c906adddda2b0b95057f4eac2e699d3c470400c4e681b32eb6408ee4ffcf21708c361288c4788d74781a05b77fd55f308a732561d880aa457abddbdf8b5f6d
+  data.tar.gz: 1ab043955e3b4375a7bccd034f5f67e0d45f48b8c23fe401aba653a6aac4a11e0f3231b690a04b91413e1009df172b58709c6a6d966f73b2f258a0b51a75ed17

data/app/models/sso/client.rb

@@ -13,8 +13,6 @@ module Sso
     scope :with_access_grant, -> { where.not(access_grant: nil) }
     scope :with_access_token, -> { where.not(access_token: nil) }
 
-    before_save :ensure_random_token
-
     class << self
       def find_by_grant_token(token)
         find_by(access_grant: ::Doorkeeper::AccessGrant.by_token(token))
@@ -34,10 +32,5 @@ module Sso
       return false unless oauth_token = ::Doorkeeper::AccessToken.by_token(token)
       update(access_token_id: oauth_token.id, application_id: oauth_token.application.id)
     end
-
-  private
-    def ensure_random_token
-      self.random_token ||= SecureRandom.hex
-    end
   end
 end

data/app/serializers/sso/client_serializer.rb

@@ -3,7 +3,7 @@ module Sso
     delegate :id, :active?, :revoked_at, :revoke_reason, :secret, to: :session
 
     attribute  :id, :key => :client_id
-    attributes :id, :active?, :revoked_at, :revoke_reason, :secret, :random_token
+    attributes :id, :active?, :revoked_at, :revoke_reason, :secret
 
 
     belongs_to :owner, serializer: Sso::OwnerSerializer # WTH : hack to load owner using serializer

data/db/migrate/20151030064515_add_device_information_to_sso_clients.rb

@@ -6,11 +6,5 @@ class AddDeviceInformationToSsoClients < ActiveRecord::Migration
       t.string      "device_model"
       t.string      "random_token"
     end
-
-    Sso::Client.find_each do |client|
-      client.save
-    end
-
-    change_column :sso_clients, :random_token, :string, :null => true
   end
 end

data/db/migrate/20151221071537_remove_random_token_from_sso_clients.rb

@@ -0,0 +1,7 @@
+class RemoveRandomTokenFromSsoClients < ActiveRecord::Migration
+  def change
+    change_table :sso_clients do |t|
+      t.remove :random_token
+    end
+  end
+end

data/lib/sso/version.rb

@@ -1,3 +1,3 @@
 module Sso
-  VERSION = "0.4.6"
+  VERSION = "0.4.8"
 end

data/spec/api/schemas/error.json

@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "required" : [
+    "error"
+  ],
+  "properties": {
+    "error" : { "type" : "string" }
+  }
+}

data/spec/api/schemas/session.json

@@ -5,8 +5,7 @@
     "id",
     "active?",
     "secret",
-    "owner",
-    "random_token"
+    "owner"
   ],
   "properties": {
     "client_id" : { "type" : "string" },
@@ -15,7 +14,6 @@
     "revoked_at" : { "type": ["string", "null"], "format": "date-time" },
     "revoke_reason" : { "type": ["string", "null"] },
     "secret" : { "type" : "string" },
-    "random_token" : { "type" : "string" },
     "owner" : {
       "type" : "object",
       "required" : [

data/spec/api/schemas/sso_session_id.json

@@ -0,0 +1,9 @@
+{
+  "type": "object",
+  "required" : [
+    "passport_id"
+  ],
+  "properties": {
+    "passport_id" : { "type" : "string" }
+  }
+}

data/spec/models/sso/client_spec.rb

@@ -56,13 +56,4 @@ RSpec.describe Sso::Client, :type => :model do
       expect(client.access_token).to eq access_token
     end
   end
-
-  describe "#ensure_random_token" do
-    subject!(:client) {  Fabricate('Sso::Client', session: session,
-                                application_id: application.id,
-                                access_grant_id: access_grant.id) }
-
-    it { expect(client.random_token).not_to be_blank }
-  end
-
 end

data/spec/test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151104090509) do
+ActiveRecord::Schema.define(version: 20151221071537) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -83,7 +83,6 @@ ActiveRecord::Schema.define(version: 20151104090509) do
     t.string   "device_os"
     t.string   "device_os_version"
     t.string   "device_model"
-    t.string   "random_token",      null: false
   end
 
   add_index "sso_clients", ["access_grant_id"], name: "index_sso_clients_on_access_grant_id", using: :btree

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -351,6 +351,7 @@ files:
 - db/migrate/20150603145730_add_pingback_uri_to_doorkeeper_applications.rb
 - db/migrate/20151030064515_add_device_information_to_sso_clients.rb
 - db/migrate/20151104090509_remove_group_id_from_sessions.rb
+- db/migrate/20151221071537_remove_random_token_from_sso_clients.rb
 - lib/doorkeeper_sso.rb
 - lib/sso.rb
 - lib/sso/doorkeeper/access_grant_mixin.rb
@@ -371,7 +372,9 @@ files:
 - lib/sso/warden/hooks/session_check.rb
 - lib/sso/warden/support.rb
 - lib/tasks/sso_tasks.rake
+- spec/api/schemas/error.json
 - spec/api/schemas/session.json
+- spec/api/schemas/sso_session_id.json
 - spec/controllers/sso/sessions_controller_spec.rb
 - spec/fabricators/api_application_fabricator.rb
 - spec/fabricators/doorkeeper_access_grant_fabricator.rb
@@ -431,7 +434,9 @@ signing_key:
 specification_version: 4
 summary: Leveraging Doorkeeper as single-sign-on OAuth server.
 test_files:
+- spec/api/schemas/error.json
 - spec/api/schemas/session.json
+- spec/api/schemas/sso_session_id.json
 - spec/controllers/sso/sessions_controller_spec.rb
 - spec/fabricators/api_application_fabricator.rb
 - spec/fabricators/doorkeeper_access_grant_fabricator.rb