From: David Gageot <david@gageot.net>
Date: Mon, 10 Sep 2012 16:22:35 +0000 (+0200)
Subject: SONAR-3776 Provide a WS Api to validate a user's login/password
X-Git-Tag: 3.3~309
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0a20196d896510dbfe4052f3222ae2b80170e81c;p=sonarqube.git

SONAR-3776 Provide a WS Api to validate a user's login/password
---

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb
index fdc47c440fd..9040b8e5030 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/controllers/api/authentication_controller.rb
@@ -21,15 +21,17 @@ class Api::AuthenticationController < Api::ApiController
   skip_before_filter :check_authentication
 
   # prevent HTTP proxies from caching authentication status
-  before_filter :set_cache_buster, :only => 'index'
+  before_filter :set_cache_buster
 
   #
-  # GET /api/authentication/index
-  # curl http://localhost:9000/api/authentication/index -v -u admin:admin
+  # GET /api/authentication/validate
+  # curl http://localhost:9000/api/authentication/validate -v -u admin:admin
   #
-  def index
+  def validate
     hash={:valid => valid?}
 
+    reset_session
+
     respond_to do |format|
       format.json { render :json => jsonp(hash) }
       format.xml { render :xml => hash.to_xml(:skip_types => true, :root => 'authentication') }
diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AuthenticationQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AuthenticationQuery.java
index 5d4fcf4ab24..6e1975a28ec 100644
--- a/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AuthenticationQuery.java
+++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/services/AuthenticationQuery.java
@@ -20,7 +20,7 @@
 package org.sonar.wsclient.services;
 
 public class AuthenticationQuery extends Query<Authentication> {
-  public static final String BASE_URL = "/api/authentication/index";
+  public static final String BASE_URL = "/api/authentication/validate";
 
   @Override
   public String getUrl() {
diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/AuthenticationQueryTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/AuthenticationQueryTest.java
index cfdb766b8b9..d53cd9f8bbe 100644
--- a/sonar-ws-client/src/test/java/org/sonar/wsclient/services/AuthenticationQueryTest.java
+++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/services/AuthenticationQueryTest.java
@@ -28,7 +28,7 @@ public class AuthenticationQueryTest extends QueryTestCase {
   public void should_query_right_url() {
     AuthenticationQuery query = new AuthenticationQuery();
 
-    assertThat(query.getUrl()).isEqualTo("/api/authentication/index");
+    assertThat(query.getUrl()).isEqualTo("/api/authentication/validate");
     assertThat(query.getModelClass().getName()).isEqualTo(Authentication.class.getName());
   }
 }