doorkeeper_sso 0.4.8 → 0.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 229918057255c549df3c4f5f01fb54df4710c160
-  data.tar.gz: 42ddf70c03c67529561f1cfb35fc055c409baa9f
+  metadata.gz: 16c808f31d307591acaf6cc14d26c1fbe7a5103f
+  data.tar.gz: 5b535b54c1e3d9dc14bf5c89bda5596228b46deb
 SHA512:
-  metadata.gz: 44c906adddda2b0b95057f4eac2e699d3c470400c4e681b32eb6408ee4ffcf21708c361288c4788d74781a05b77fd55f308a732561d880aa457abddbdf8b5f6d
-  data.tar.gz: 1ab043955e3b4375a7bccd034f5f67e0d45f48b8c23fe401aba653a6aac4a11e0f3231b690a04b91413e1009df172b58709c6a6d966f73b2f258a0b51a75ed17
+  metadata.gz: 327af4ca735445b7f1b83389cf1bf058496a3958352bc61d0fcc7e44e877743f7709f1d65ebc4e9965aac554e267d450f9f37aad236f1f17c5214848179bbd41
+  data.tar.gz: 9f0507ac75064591b2ee2363d3eba3504d8f9fc3b1280281b08749468939c1fc209f83adf9548531631eaac4ff0395f3743ad1201e598d50ce25f92cfeb8df91

data/app/controllers/sso/sessions_controller.rb

@@ -2,23 +2,14 @@ module Sso
   class SessionsController < Sso::ApplicationController
     include ::Sso::Logging
 
-    before_action :authenticate_user!, only: [:jsonp]
-    before_action :doorkeeper_authorize!, only: [:show, :create]
+    before_action :doorkeeper_authorize!, only: :create
+    before_action :authenticate_user!, except: :create
     respond_to :json
 
     ################################################################################
-    # OAuth2 Endpoint
+    # OAuth2 Endpoints
     ################################################################################
 
-    # Passport verification
-    # Session exists (browser/insider) - return passport state
-    # Sessionless (iphone/outsider)
-    # Returns passport
-    def show
-      @client = current_client
-      render json: @client, serializer: Sso::ClientSerializer
-    end
-
     # Passport exchange
     # Passport Strategy first exchange
     # Insider : Client information from Apps should always be trusted
@@ -35,29 +26,26 @@ module Sso
     ################################################################################
     # JSONP endpoint based on Devise session
     ################################################################################
-    def jsonp
-      # TODO : Check inconsistent
-      render :nothing => true
-      # respond_with @session, :location => sso.sessions_url
+    def id
+      render json:  { passport_id: sso_session_id }
     end
 
-
-    ################################################################################
-    # Mobile endpoint
-    ################################################################################
-    def mobile
-      # TODO : Check inconsistent
-
-      # passport.load_user!
-      # passport.create_chip!
-      render :nothing => true
-      # respond_with @session, :location => sso.sessions_url
+    # Passport verification
+    # Session exists (browser/insider) - return passport state
+    # Sessionless (iphone/outsider)
+    # Returns passport
+    def show
+      @session = Sso::Session.find(sso_session_id)
+      render json: @session, serializer: Sso::SessionSerializer
     end
 
 
-
   protected
 
+    def sso_session_id
+      warden.session(:user)["sso_session_id"]
+    end
+
     def current_client
       @current_client ||= doorkeeper_token.sso_client
     end
@@ -66,10 +54,6 @@ module Sso
       @current_resource_owner ||= User.find(doorkeeper_token.resource_owner_id)
     end
 
-    def current_session
-      @current_session = current_client.session
-    end
-
     def client_params
       params.permit(:ip, :agent)
     end
@@ -77,28 +61,3 @@ module Sso
   end
 end
 
-
-#passport exchange
-          # finding = ::SSO::Server::Passports.find_by_access_token_id(access_token.id)
-          # if finding.failure?
-          #   # This should never happen. Every Access Token should be connected to a Passport.
-          #   return json_error :passport_not_found
-          # end
-          # passport = finding.object
-
-          # ::SSO::Server::Passports.update_activity passport_id: passport.id, request: request
-
-          # debug { "Attaching user and chip to passport #{passport.inspect}" }
-          # passport.load_user!
-          # passport.create_chip!
-
-          # payload = { success: true, code: :here_is_your_passport, passport: passport.export }
-          # debug { "Created Passport #{passport.id}, sending it including user #{passport.user.inspect}}" }
-
-          # [200, { 'Content-Type' => 'application/json' }, [payload.to_json]]
-
-#passport  verification
-
-          # if request.get? && request.path == passports_path
-          #   debug { 'Detected incoming Passport verification request.' }
-          #   env['warden'].authenticate! :passport

data/app/serializers/sso/session_serializer.rb

@@ -2,7 +2,7 @@ module Sso
   class SessionSerializer < ActiveModel::Serializer
     attributes :id, :active?, :revoked_at, :revoke_reason, :secret
 
-    has_many :clients
+    # has_many :clients
     belongs_to :owner, serializer: Sso::OwnerSerializer
   end
 end

data/config/routes.rb

@@ -1,3 +1,5 @@
 Sso::Engine.routes.draw do
-  resource :sessions, :only => [:show, :create]
+  resource :sessions, :only => [:show, :create] do
+     get 'id', on: :collection
+  end
 end

data/lib/sso/doorkeeper/oauth/base.rb

@@ -8,7 +8,8 @@ module Sso
           return @sso_client if @sso_client
 
           user = User.find(@access_token.resource_owner_id)
-          sso_session = Sso::Session.generate_master(user, {})
+          attributes = {  ip: request.ip, agent: request.user_agent }
+          sso_session = Sso::Session.generate_master(user, attributes)
           @sso_client = sso_session.clients.last
         end
 

data/lib/sso/version.rb

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

data/spec/api/schemas/sso_session.json

@@ -0,0 +1,35 @@
+{
+  "type": "object",
+  "required" : [
+    "id",
+    "active?",
+    "secret",
+    "owner"
+  ],
+  "properties": {
+    "id" : { "type" : "string" },
+    "active?" : { "type" : "boolean" },
+    "revoked_at" : { "type": ["string", "null"], "format": "date-time" },
+    "revoke_reason" : { "type": ["string", "null"] },
+    "secret" : { "type" : "string" },
+    "owner" : {
+      "type" : "object",
+      "required" : [
+        "id",
+        "name",
+        "email",
+        "first_name",
+        "last_name",
+        "lang"
+      ],
+      "properties" : {
+        "id" : { "type" : "integer" },
+        "name" : { "type" : "string" },
+        "email" : { "type" : "string" },
+        "first_name" : { "type" : "string" },
+        "last_name" : { "type" : "string" },
+        "lang" : { "type" : "string" }
+      }
+    }
+  }
+}

data/spec/controllers/sso/sessions_controller_spec.rb

@@ -4,63 +4,81 @@ RSpec.describe Sso::SessionsController, :type => :controller do
   routes { Sso::Engine.routes }
   render_views
 
-  pending "GET jsonp" do
-    let(:user) { Fabricate(:user) }
+  describe "GET id" do
 
     context "logged_in" do
-      before() {  sign_in user }
+      let(:user) { Fabricate(:user) }
+      let(:application) { Fabricate('Doorkeeper::Application') }
+      # let(:access_token) { Fabricate('Doorkeeper::AccessToken',
+      #                                resource_owner_id: user.id) }
+      # let(:access_grant) { Fabricate('Doorkeeper::AccessGrant',
+      #                                application_id: application.id,
+      #                                resource_owner_id: user.id,
+      #                                redirect_uri: 'http://localhost:3002/oauth/callback'
+      #                               ) }
 
-      it "returns not authorized" do
-        get :jsonp, format: :json
+      let(:session) {  Fabricate('Sso::Session', owner: user) }
+      # let!(:client) {  Fabricate('Sso::Client', session: session,
+      #                               application_id: application.id,
+      #                               access_token_id: access_token.id,
+      #                               access_grant_id: access_grant.id) }
+
+      before(:each) do
+        sign_in user
+        allow(controller).to receive(:sso_session_id).and_return(session.id)
+        get :id, format: :json
+      end
+
+      it "returns passport_id" do
         expect(response).to have_http_status(:ok)
+        expect(response).to match_response_schema("sso_session_id")
       end
     end
 
     context "not logged_in" do
       it "returns not authorized" do
-        get :jsonp, format: :json
+        get :id, format: :json
         expect(response).to have_http_status(:unauthorized)
+        expect(response).to match_response_schema("error")
       end
     end
   end
 
   describe "GET show" do
-    let(:user) { Fabricate(:user) }
-
     context "not logged_in" do
       it do
         get :show, format: :json
         expect(response).to have_http_status(:unauthorized)
+        expect(response).to match_response_schema("error")
       end
     end
 
     context "logged_in" do
       let(:user) { Fabricate(:user) }
       let(:application) { Fabricate('Doorkeeper::Application') }
-      let(:access_token) { Fabricate('Doorkeeper::AccessToken',
-                                     resource_owner_id: user.id) }
-      let(:access_grant) { Fabricate('Doorkeeper::AccessGrant',
-                                     application_id: application.id,
-                                     resource_owner_id: user.id,
-                                     redirect_uri: 'http://localhost:3002/oauth/callback'
-                                    ) }
+      # let(:access_token) { Fabricate('Doorkeeper::AccessToken',
+      #                                resource_owner_id: user.id) }
+      # let(:access_grant) { Fabricate('Doorkeeper::AccessGrant',
+      #                                application_id: application.id,
+      #                                resource_owner_id: user.id,
+      #                                redirect_uri: 'http://localhost:3002/oauth/callback'
+      #                               ) }
 
       let(:session) {  Fabricate('Sso::Session', owner: user) }
-      let!(:client) {  Fabricate('Sso::Client', session: session,
-                                    application_id: application.id,
-                                    access_token_id: access_token.id,
-                                    access_grant_id: access_grant.id) }
+      # let!(:client) {  Fabricate('Sso::Client', session: session,
+      #                               application_id: application.id,
+      #                               access_token_id: access_token.id,
+      #                               access_grant_id: access_grant.id) }
 
       before do
-        allow(controller).to receive(:doorkeeper_authorize!).and_return(true)
-        allow(controller).to receive(:doorkeeper_token).and_return(access_token)
-
+        sign_in user
+        allow(controller).to receive(:sso_session_id).and_return(session.id)
         get :show, format: :json
       end
 
       it { expect(response).to have_http_status(:ok) }
-      it { expect(assigns(:client)).to eq client }
-      it { expect(response).to match_response_schema("session") }
+      it { expect(assigns(:session)).to eq session }
+      it { expect(response).to match_response_schema("sso_session") }
     end
   end
 
@@ -96,7 +114,7 @@ RSpec.describe Sso::SessionsController, :type => :controller do
 
       it { expect(response).to have_http_status(:created) }
       it { expect(assigns(:session)).to eq master_sso_session }
-      it { expect(response).to match_response_schema("session") }
+      it { expect(response).to match_response_schema("sso_client") }
       it { expect(master_sso_session.clients).to include ::Sso::Client.find_by(access_token: access_token) }
       it { expect(master_sso_session.clients.map(&:ip)).to include "202.188.0.133" }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper_sso
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors:
 - John Wong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2015-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: warden
@@ -373,7 +373,8 @@ files:
 - lib/sso/warden/support.rb
 - lib/tasks/sso_tasks.rake
 - spec/api/schemas/error.json
-- spec/api/schemas/session.json
+- spec/api/schemas/sso_client.json
+- spec/api/schemas/sso_session.json
 - spec/api/schemas/sso_session_id.json
 - spec/controllers/sso/sessions_controller_spec.rb
 - spec/fabricators/api_application_fabricator.rb
@@ -435,7 +436,8 @@ 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_client.json
+- spec/api/schemas/sso_session.json
 - spec/api/schemas/sso_session_id.json
 - spec/controllers/sso/sessions_controller_spec.rb
 - spec/fabricators/api_application_fabricator.rb