Merge branch 'redirect_back_after_auth' into 'master'

Redirect back after authorization https://dev.gitlab.org/gitlab/gitlab-ci/issues/287 See merge request !182
gitlabhq · Jun 30, 2015 · 762ffa8 · 762ffa8
2 parents f21d792 + cb1d33e
commit 762ffa8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,7 @@ v7.13.0
   - Implemented "rake env:info". Rake task to receive system information
   - Fix coverage calculation on commit page
   - Enhance YAML validation
+  - Redirect back after authorization
 
 v7.12.1
   - Runner without tag should pick builds without tag only

diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
@@ -10,7 +10,8 @@ def new
 
   def auth
     redirect_to client.auth_code.authorize_url({
-      redirect_uri: callback_user_sessions_url
+      redirect_uri: callback_user_sessions_url,
+      state: params[:return_to]
     })
   end
 
@@ -21,7 +22,7 @@ def callback
     user = @user_session.authenticate(access_token: token)
 
     if user && sign_in(user)
-      redirect_to root_path
+      redirect_to(params[:state] || root_path)
     else
       @error = 'Invalid credentials'
       render :new

diff --git a/app/views/user_sessions/new.html.haml b/app/views/user_sessions/new.html.haml
@@ -4,5 +4,5 @@
     Make sure you have account on GitLab server
     = link_to GitlabCi.config.gitlab_server.url, GitlabCi.config.gitlab_server.url, no_turbolink
   %hr
-  = link_to "Login with GitLab", auth_user_sessions_path, no_turbolink.merge( class: 'btn btn-login btn-success' )
+  = link_to "Login with GitLab", auth_user_sessions_path(return_to: params[:return_to]), no_turbolink.merge( class: 'btn btn-login btn-success' )