@@ -0,0 +1,1774 @@
+// Copyright 2019 Google LLC%0A//%0A// Licensed under the Apache License, Version 2.0 (the %22License%22);%0A// you may not use this file except in compliance with the License.%0A// You may obtain a copy of the License at%0A//%0A//     https://www.apache.org/licenses/LICENSE-2.0%0A//%0A// Unless required by applicable law or agreed to in writing, software%0A// distributed under the License is distributed on an %22AS IS%22 BASIS,%0A// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.%0A// See the License for the specific language governing permissions and%0A// limitations under the License.%0A%0Apackage com.google.sps.servlets;%0A%0Aimport com.google.appengine.api.users.UserService;%0Aimport com.google.appengine.api.users.UserServiceFactory;%0Aimport com.google.gson.Gson;%0Aimport com.google.gson.JsonObject;%0Aimport com.google.sps.util.UserHelper;%0Aimport java.io.IOException;%0Aimport java.io.PrintWriter;%0Aimport javax.servlet.annotation.WebServlet;%0Aimport javax.servlet.http.HttpServlet;%0Aimport javax.servlet.http.HttpServletRequest;%0Aimport javax.servlet.http.HttpServletResponse;%0A%0A%0A@WebServlet(%22/user-status%22)%0Apublic class UserStatusServlet extends HttpServlet %7B%0A%0A  // Response: returns some user information JSON from the current user's sign-in API profile.%0A  // Data: %22isUserLoggedIn%22 : boolean%0A  @Override%0A  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException %7B%0A    response.setContentType(%22application/json%22);%0A%0A    JsonObject userInfo = new JsonObject();%0A    userInfo.addProperty(%22isUserLoggedIn%22, UserHelper.isUserLoggedIn());%0A    if (UserHelper.isUserLoggedIn()) %7B%0A        System.out.println(%22User is logged in%22);%0A        // other properties may be added in the future.%0A    %7D%0A%0A    response.getWriter().println(userInfo.toString());%0A  %7D%0A%7D%0A

add deleted file in attempt to resolve merge conflict