// Copyright (C) 2009 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.gerrit.httpd;

import com.google.gerrit.server.account.AccountManager;
import com.google.gerrit.server.config.AuthConfig;
import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;

import java.io.IOException;

import javax.annotation.Nullable;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@Singleton
class HttpLogoutServlet extends HttpServlet {
  private static final long serialVersionUID = 1L;

  private final Provider<WebSession> webSession;
  private final Provider<String> urlProvider;
  private final String logoutUrl;

  @Inject
  HttpLogoutServlet(final AuthConfig authConfig,
      final Provider<WebSession> webSession,
      @CanonicalWebUrl @Nullable final Provider<String> urlProvider,
      final AccountManager accountManager) {
    this.webSession = webSession;
    this.urlProvider = urlProvider;
    this.logoutUrl = authConfig.getLogoutURL();
  }

  @Override
  protected void doGet(final HttpServletRequest req,
      final HttpServletResponse rsp) throws IOException {
    webSession.get().logout();
    if (logoutUrl != null) {
      rsp.sendRedirect(logoutUrl);
    } else {
      rsp.sendRedirect(urlProvider.get());
    }
  }
}

@@ -636,16 +636,55 @@
 httpd;%0A%0A
+import com.google.common.base.Strings;%0A
 import c
@@ -1948,32 +1948,281 @@
  %7D else %7B%0A      
+String url = urlProvider.get();%0A      if (Strings.isNullOrEmpty(url)) %7B%0A        url = req.getContextPath();%0A      %7D%0A      if (Strings.isNullOrEmpty(url)) %7B%0A        url = %22/%22;%0A      %7D%0A      if (!url.endsWith(%22/%22)) %7B%0A        url += %22/%22;%0A      %7D%0A      
 rsp.sendRedirect
@@ -2225,30 +2225,16 @@
 rect(url
-Provider.get()
 );%0A    %7D

Use servlet context path during logout