Revision 1297:0a574315af3e .svn/pristine/36

View differences:

.svn/pristine/36/3666692670ecc84af41e4a546b7591a94d203311.svn-base
1
api.time_entry do
2
  api.id @time_entry.id
3
  api.project(:id => @time_entry.project_id, :name => @time_entry.project.name) unless @time_entry.project.nil?
4
  api.issue(:id => @time_entry.issue_id) unless @time_entry.issue.nil?
5
  api.user(:id => @time_entry.user_id, :name => @time_entry.user.name) unless @time_entry.user.nil?
6
  api.activity(:id => @time_entry.activity_id, :name => @time_entry.activity.name) unless @time_entry.activity.nil?
7
  api.hours @time_entry.hours
8
  api.comments @time_entry.comments
9
  api.spent_on @time_entry.spent_on
10
  api.created_on @time_entry.created_on
11
  api.updated_on @time_entry.updated_on
12

  
13
  render_api_custom_values @time_entry.custom_field_values, api
14
end
.svn/pristine/36/367408f1f75021a71b939b14007872b6740672f3.svn-base
1
# Redmine - project management software
2
# Copyright (C) 2006-2012  Jean-Philippe Lang
3
#
4
# This program is free software; you can redistribute it and/or
5
# modify it under the terms of the GNU General Public License
6
# as published by the Free Software Foundation; either version 2
7
# of the License, or (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
17

  
18
require File.expand_path('../../../test_helper', __FILE__)
19

  
20
class ApiTest::VersionsTest < ActionController::IntegrationTest
21
  fixtures :projects, :trackers, :issue_statuses, :issues,
22
           :enumerations, :users, :issue_categories,
23
           :projects_trackers,
24
           :roles,
25
           :member_roles,
26
           :members,
27
           :enabled_modules,
28
           :workflows,
29
           :versions
30

  
31
  def setup
32
    Setting.rest_api_enabled = '1'
33
  end
34

  
35
  context "/projects/:project_id/versions" do
36
    context "GET" do
37
      should "return project versions" do
38
        get '/projects/1/versions.xml'
39

  
40
        assert_response :success
41
        assert_equal 'application/xml', @response.content_type
42
        assert_tag :tag => 'versions',
43
          :attributes => {:type => 'array'},
44
          :child => {
45
            :tag => 'version',
46
            :child => {
47
              :tag => 'id',
48
              :content => '2',
49
              :sibling => {
50
                :tag => 'name',
51
                :content => '1.0'
52
              }
53
            }
54
          }
55
      end
56
    end
57

  
58
    context "POST" do
59
      should "create the version" do
60
        assert_difference 'Version.count' do
61
          post '/projects/1/versions.xml', {:version => {:name => 'API test'}}, credentials('jsmith')
62
        end
63

  
64
        version = Version.first(:order => 'id DESC')
65
        assert_equal 'API test', version.name
66

  
67
        assert_response :created
68
        assert_equal 'application/xml', @response.content_type
69
        assert_tag 'version', :child => {:tag => 'id', :content => version.id.to_s}
70
      end
71

  
72
      should "create the version with due date" do
73
        assert_difference 'Version.count' do
74
          post '/projects/1/versions.xml', {:version => {:name => 'API test', :due_date => '2012-01-24'}}, credentials('jsmith')
75
        end
76

  
77
        version = Version.first(:order => 'id DESC')
78
        assert_equal 'API test', version.name
79
        assert_equal Date.parse('2012-01-24'), version.due_date
80

  
81
        assert_response :created
82
        assert_equal 'application/xml', @response.content_type
83
        assert_tag 'version', :child => {:tag => 'id', :content => version.id.to_s}
84
      end
85

  
86
      context "with failure" do
87
        should "return the errors" do
88
          assert_no_difference('Version.count') do
89
            post '/projects/1/versions.xml', {:version => {:name => ''}}, credentials('jsmith')
90
          end
91

  
92
          assert_response :unprocessable_entity
93
          assert_tag :errors, :child => {:tag => 'error', :content => "Name can't be blank"}
94
        end
95
      end
96
    end
97
  end
98

  
99
  context "/versions/:id" do
100
    context "GET" do
101
      should "return the version" do
102
        get '/versions/2.xml'
103

  
104
        assert_response :success
105
        assert_equal 'application/xml', @response.content_type
106
        assert_select 'version' do
107
          assert_select 'id', :text => '2'
108
          assert_select 'name', :text => '1.0'
109
          assert_select 'sharing', :text => 'none'
110
        end
111
      end
112
    end
113

  
114
    context "PUT" do
115
      should "update the version" do
116
        put '/versions/2.xml', {:version => {:name => 'API update'}}, credentials('jsmith')
117

  
118
        assert_response :ok
119
        assert_equal '', @response.body
120
        assert_equal 'API update', Version.find(2).name
121
      end
122
    end
123

  
124
    context "DELETE" do
125
      should "destroy the version" do
126
        assert_difference 'Version.count', -1 do
127
          delete '/versions/3.xml', {}, credentials('jsmith')
128
        end
129

  
130
        assert_response :ok
131
        assert_equal '', @response.body
132
        assert_nil Version.find_by_id(3)
133
      end
134
    end
135
  end
136
end
.svn/pristine/36/36f96aa6819066dbc18f6f0375ee24e3c2d52b96.svn-base
1
# Redmine - project management software
2
# Copyright (C) 2006-2012  Jean-Philippe Lang
3
#
4
# This program is free software; you can redistribute it and/or
5
# modify it under the terms of the GNU General Public License
6
# as published by the Free Software Foundation; either version 2
7
# of the License, or (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
17

  
18
class AccountController < ApplicationController
19
  helper :custom_fields
20
  include CustomFieldsHelper
21

  
22
  # prevents login action to be filtered by check_if_login_required application scope filter
23
  skip_before_filter :check_if_login_required
24

  
25
  # Login request and validation
26
  def login
27
    if request.get?
28
      logout_user
29
    else
30
      authenticate_user
31
    end
32
  rescue AuthSourceException => e
33
    logger.error "An error occured when authenticating #{params[:username]}: #{e.message}"
34
    render_error :message => e.message
35
  end
36

  
37
  # Log out current user and redirect to welcome page
38
  def logout
39
    logout_user
40
    redirect_to home_url
41
  end
42

  
43
  # Lets user choose a new password
44
  def lost_password
45
    redirect_to(home_url) && return unless Setting.lost_password?
46
    if params[:token]
47
      @token = Token.find_by_action_and_value("recovery", params[:token].to_s)
48
      if @token.nil? || @token.expired?
49
        redirect_to home_url
50
        return
51
      end
52
      @user = @token.user
53
      unless @user && @user.active?
54
        redirect_to home_url
55
        return
56
      end
57
      if request.post?
58
        @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
59
        if @user.save
60
          @token.destroy
61
          flash[:notice] = l(:notice_account_password_updated)
62
          redirect_to signin_path
63
          return
64
        end
65
      end
66
      render :template => "account/password_recovery"
67
      return
68
    else
69
      if request.post?
70
        user = User.find_by_mail(params[:mail].to_s)
71
        # user not found or not active
72
        unless user && user.active?
73
          flash.now[:error] = l(:notice_account_unknown_email)
74
          return
75
        end
76
        # user cannot change its password
77
        unless user.change_password_allowed?
78
          flash.now[:error] = l(:notice_can_t_change_password)
79
          return
80
        end
81
        # create a new token for password recovery
82
        token = Token.new(:user => user, :action => "recovery")
83
        if token.save
84
          Mailer.lost_password(token).deliver
85
          flash[:notice] = l(:notice_account_lost_email_sent)
86
          redirect_to signin_path
87
          return
88
        end
89
      end
90
    end
91
  end
92

  
93
  # User self-registration
94
  def register
95
    redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
96
    if request.get?
97
      session[:auth_source_registration] = nil
98
      @user = User.new(:language => Setting.default_language)
99
    else
100
      user_params = params[:user] || {}
101
      @user = User.new
102
      @user.safe_attributes = user_params
103
      @user.admin = false
104
      @user.register
105
      if session[:auth_source_registration]
106
        @user.activate
107
        @user.login = session[:auth_source_registration][:login]
108
        @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
109
        if @user.save
110
          session[:auth_source_registration] = nil
111
          self.logged_user = @user
112
          flash[:notice] = l(:notice_account_activated)
113
          redirect_to :controller => 'my', :action => 'account'
114
        end
115
      else
116
        @user.login = params[:user][:login]
117
        unless user_params[:identity_url].present? && user_params[:password].blank? && user_params[:password_confirmation].blank?
118
          @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
119
        end
120

  
121
        case Setting.self_registration
122
        when '1'
123
          register_by_email_activation(@user)
124
        when '3'
125
          register_automatically(@user)
126
        else
127
          register_manually_by_administrator(@user)
128
        end
129
      end
130
    end
131
  end
132

  
133
  # Token based account activation
134
  def activate
135
    redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
136
    token = Token.find_by_action_and_value('register', params[:token])
137
    redirect_to(home_url) && return unless token and !token.expired?
138
    user = token.user
139
    redirect_to(home_url) && return unless user.registered?
140
    user.activate
141
    if user.save
142
      token.destroy
143
      flash[:notice] = l(:notice_account_activated)
144
    end
145
    redirect_to signin_path
146
  end
147

  
148
  private
149

  
150
  def authenticate_user
151
    if Setting.openid? && using_open_id?
152
      open_id_authenticate(params[:openid_url])
153
    else
154
      password_authentication
155
    end
156
  end
157

  
158
  def password_authentication
159
    user = User.try_to_login(params[:username], params[:password])
160

  
161
    if user.nil?
162
      invalid_credentials
163
    elsif user.new_record?
164
      onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
165
    else
166
      # Valid user
167
      successful_authentication(user)
168
    end
169
  end
170

  
171
  def open_id_authenticate(openid_url)
172
    authenticate_with_open_id(openid_url, :required => [:nickname, :fullname, :email], :return_to => signin_url, :method => :post) do |result, identity_url, registration|
173
      if result.successful?
174
        user = User.find_or_initialize_by_identity_url(identity_url)
175
        if user.new_record?
176
          # Self-registration off
177
          redirect_to(home_url) && return unless Setting.self_registration?
178

  
179
          # Create on the fly
180
          user.login = registration['nickname'] unless registration['nickname'].nil?
181
          user.mail = registration['email'] unless registration['email'].nil?
182
          user.firstname, user.lastname = registration['fullname'].split(' ') unless registration['fullname'].nil?
183
          user.random_password
184
          user.register
185

  
186
          case Setting.self_registration
187
          when '1'
188
            register_by_email_activation(user) do
189
              onthefly_creation_failed(user)
190
            end
191
          when '3'
192
            register_automatically(user) do
193
              onthefly_creation_failed(user)
194
            end
195
          else
196
            register_manually_by_administrator(user) do
197
              onthefly_creation_failed(user)
198
            end
199
          end
200
        else
201
          # Existing record
202
          if user.active?
203
            successful_authentication(user)
204
          else
205
            account_pending
206
          end
207
        end
208
      end
209
    end
210
  end
211

  
212
  def successful_authentication(user)
213
    logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
214
    # Valid user
215
    self.logged_user = user
216
    # generate a key and set cookie if autologin
217
    if params[:autologin] && Setting.autologin?
218
      set_autologin_cookie(user)
219
    end
220
    call_hook(:controller_account_success_authentication_after, {:user => user })
221
    redirect_back_or_default :controller => 'my', :action => 'page'
222
  end
223

  
224
  def set_autologin_cookie(user)
225
    token = Token.create(:user => user, :action => 'autologin')
226
    cookie_name = Redmine::Configuration['autologin_cookie_name'] || 'autologin'
227
    cookie_options = {
228
      :value => token.value,
229
      :expires => 1.year.from_now,
230
      :path => (Redmine::Configuration['autologin_cookie_path'] || '/'),
231
      :secure => (Redmine::Configuration['autologin_cookie_secure'] ? true : false),
232
      :httponly => true
233
    }
234
    cookies[cookie_name] = cookie_options
235
  end
236

  
237
  # Onthefly creation failed, display the registration form to fill/fix attributes
238
  def onthefly_creation_failed(user, auth_source_options = { })
239
    @user = user
240
    session[:auth_source_registration] = auth_source_options unless auth_source_options.empty?
241
    render :action => 'register'
242
  end
243

  
244
  def invalid_credentials
245
    logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
246
    flash.now[:error] = l(:notice_account_invalid_creditentials)
247
  end
248

  
249
  # Register a user for email activation.
250
  #
251
  # Pass a block for behavior when a user fails to save
252
  def register_by_email_activation(user, &block)
253
    token = Token.new(:user => user, :action => "register")
254
    if user.save and token.save
255
      Mailer.register(token).deliver
256
      flash[:notice] = l(:notice_account_register_done)
257
      redirect_to signin_path
258
    else
259
      yield if block_given?
260
    end
261
  end
262

  
263
  # Automatically register a user
264
  #
265
  # Pass a block for behavior when a user fails to save
266
  def register_automatically(user, &block)
267
    # Automatic activation
268
    user.activate
269
    user.last_login_on = Time.now
270
    if user.save
271
      self.logged_user = user
272
      flash[:notice] = l(:notice_account_activated)
273
      redirect_to :controller => 'my', :action => 'account'
274
    else
275
      yield if block_given?
276
    end
277
  end
278

  
279
  # Manual activation by the administrator
280
  #
281
  # Pass a block for behavior when a user fails to save
282
  def register_manually_by_administrator(user, &block)
283
    if user.save
284
      # Sends an email to the administrators
285
      Mailer.account_activation_request(user).deliver
286
      account_pending
287
    else
288
      yield if block_given?
289
    end
290
  end
291

  
292
  def account_pending
293
    flash[:notice] = l(:notice_account_pending)
294
    redirect_to signin_path
295
  end
296
end

Also available in: Unified diff