Merge pull request #884 from opf/feature/authenticated_user_id_available_in_api_4163

Looking good.

app/controllers/api/v2/authentication_controller.rb

@@ -35,7 +35,11 @@ module Api
 
       unloadable
 
+      AuthorizationData = Struct.new(:authorized, :authorized_user_id)
+
       def index
+        @authorization = AuthorizationData.new(true, User.current.id)
+
         respond_to do |format|
           format.api
         end

app/views/api/v2/authentication/index.api.rabl

@@ -25,7 +25,5 @@
 #
 # See doc/COPYRIGHT.rdoc for more details.
 #++
-object :none
-node :authorization do
-  {authorized: true}
-end
+object @authorization => :authorization
+attributes :authorized, :authorized_user_id

spec/controllers/api/v2/authentication_spec.rb

@@ -35,6 +35,24 @@ describe Api::V2::AuthenticationController do
     end
 
     it_should_behave_like "a controller action with require_login"
+
+    describe 'authorization data' do
+      let(:user) { FactoryGirl.create(:user) }
+
+      before do
+        User.stub(:current).and_return(user)
+
+        fetch
+      end
+
+      subject { assigns(:authorization) }
+
+      it { expect(subject).not_to be_nil }
+
+      it { expect(subject.authorized).to be_true }
+
+      it { expect(subject.authorized_user_id).to eq(user.id) }
+    end
   end
 
   describe "session" do

spec/views/api/v2/authentication/index_api_json_spec.rb

@@ -0,0 +1,69 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require File.expand_path('../../../../../spec_helper', __FILE__)
+
+describe 'api/v2/authentication/index.api.rabl' do
+  before { params[:format] = 'json' }
+
+  shared_examples_for 'valid authentication' do
+    it { expect(subject).to have_json_path('authorization') }
+
+    it { expect(subject).to have_json_size(2).at_path('authorization') }
+
+    it { expect(subject).to be_json_eql(content).at_path('authorization') }
+  end
+
+  describe 'authentication state' do
+    before do
+      assign(:authorization, Api::V2::AuthenticationController::AuthorizationData.new(true, nil))
+
+      render
+    end
+
+    subject { response.body }
+
+    it_behaves_like 'valid authentication' do
+      let(:content) { %({"authorized": true, "authorized_user_id":null}) }
+    end
+  end
+
+  describe 'authenticated user' do
+    before do
+      assign(:authorization, Api::V2::AuthenticationController::AuthorizationData.new(nil, 12345))
+
+      render
+    end
+
+    subject { response.body }
+
+    it_behaves_like 'valid authentication' do
+      let(:content) { %({"authorized":null, "authorized_user_id": 12345}) }
+    end
+  end
+end

spec/views/api/v2/authentication/index_api_xml_spec.rb

@@ -0,0 +1,57 @@
+#-- copyright
+# OpenProject is a project management system.
+# Copyright (C) 2012-2013 the OpenProject Foundation (OPF)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See doc/COPYRIGHT.rdoc for more details.
+#++
+
+require File.expand_path('../../../../../spec_helper', __FILE__)
+
+describe 'api/v2/authentication/index.api.rabl' do
+  before { params[:format] = 'xml' }
+
+  describe 'authentication state' do
+    before do
+      assign(:authorization, Api::V2::AuthenticationController::AuthorizationData.new(true, nil))
+
+      render
+    end
+
+    subject { response.body }
+
+    it { expect(subject).to have_selector('authorization authorized', text: true) }
+  end
+
+  describe 'authenticated user' do
+    before do
+      assign(:authorization, Api::V2::AuthenticationController::AuthorizationData.new(nil, 12345))
+
+      render
+    end
+
+    subject { response.body }
+
+    it { expect(subject).to have_selector('authorization authorized_user_id', text: 12345) }
+  end
+end