Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

issue-29616-authentication-endpoint-documentation #29617

Merged
merged 17 commits into from
Aug 24, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4b0bc34
Added tags to AuthenticationResource
gavriella-dotcms Aug 16, 2024
a1fd2e7
Added @operation and ResponseEntityUserMapView class for v1/authenticate
gavriella-dotcms Aug 16, 2024
89c407c
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 19, 2024
f475687
Completed annotations for v1/authenticate
gavriella-dotcms Aug 19, 2024
5f9a39c
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 19, 2024
b7c77ef
Added ResponseEnityUserView.java and @Operation for logInUser
gavriella-dotcms Aug 19, 2024
32fbe5c
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 20, 2024
243b688
Completed @Operation for /authenticate/api-token
gavriella-dotcms Aug 20, 2024
e4bf5d3
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 21, 2024
dfc5582
Added markdown table to /authenticate and finished log in endpoint
gavriella-dotcms Aug 21, 2024
4fe4bfd
Added @Hidden to /api-token endpoint
gavriella-dotcms Aug 22, 2024
fbe888c
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 22, 2024
f7ed829
Format change
gavriella-dotcms Aug 23, 2024
a9b1671
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 23, 2024
57517c1
Unecessary file removal
gavriella-dotcms Aug 23, 2024
d317daa
Merge branch 'master' of https://github.com/dotCMS/core into issue-29…
gavriella-dotcms Aug 23, 2024
a45d779
Comment adde to @Hidden
gavriella-dotcms Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dotCMS/javac.20240820_083616.args
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@/tmp/org.codehaus.plexus.compiler.javac.JavacCompiler14439678467023706055arguments
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,16 @@
import com.liferay.portal.model.User;
import com.liferay.portal.util.WebKeys;
import com.liferay.util.LocaleUtil;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.ExternalDocumentation;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
Expand All @@ -34,6 +44,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
Expand All @@ -52,8 +63,15 @@
* @version 3.7
* @since Jul 7, 2016
*/


@SuppressWarnings("serial")
@Path("/v1/authentication")
@Tag(name = "Authentication",
description = "Endpoints that perform operations related to user authentication",
externalDocs = @ExternalDocumentation(description = "Additional Authentication API information",
url = "https://www.dotcms.com/docs/latest/rest-api-authentication"))

public class AuthenticationResource implements Serializable {

static final String USER = "user";
Expand Down Expand Up @@ -90,8 +108,37 @@ protected AuthenticationResource(final LoginServiceAPI loginService,
@JSONP
@NoCache
@Produces({MediaType.APPLICATION_JSON, "application/javascript"})
public final Response authentication(@Context final HttpServletRequest request,
@Consumes({MediaType.APPLICATION_JSON})
@Operation(operationId = "postAuthentication",
summary = "Verifies user or application authentication",
description = "Takes a user's login ID and password and checks them against the user rolls.\n\n" +
"If the user is found and authenticated, a session is created.\n\n" +
"Otherwise the system will return an 'authentication failed' message.\n\n",
tags = {"Authentication"},
responses = {
@ApiResponse(responseCode = "200", description = "User authentication successful",
content = @Content(mediaType = "application/json",
schema = @Schema(implementation = ResponseEntityUserMapView.class))),
@ApiResponse(responseCode = "401", description = "User not authenticated"),
@ApiResponse(responseCode = "403", description = "Forbidden request"),
@ApiResponse(responseCode = "500", description = "Unexpected error")
}
)
public final Response authentication(
@Context final HttpServletRequest request,
@Context final HttpServletResponse response,
@RequestBody(description = "This method takes a user's credentials and language preferences to authenticate them.\n\n" +
"Requires a POST body consisting of a JSON object containing the following properties:\n\n" +
"| **Property** | **Value** | **Description** |\n" +
"|--------------|-----------|-----------------------------------------------|\n" +
"| `userId` | String | **Required.** ID of user attempting to log in |\n" +
"| `password` | String | User password |\n" +
"| `language` | String | Preferred language for user |\n" +
"| `country` | String | Country where user is located |\n",
required = true,
content = @Content(
schema = @Schema(implementation = AuthenticationForm.class)
))
final AuthenticationForm authenticationForm) {

Response res = null;
Expand Down Expand Up @@ -168,6 +215,20 @@ public final Response authentication(@Context final HttpServletRequest request,
@JSONP
@NoCache
@Produces({MediaType.APPLICATION_JSON, "application/javascript"})
@Operation(operationId = "getLogInUser",
summary = "Retrieves user data",
description = "Provides information about any users that are currently in a session.\n\n" +
"This retrieved data will be formatted into a JSON response body.\n\n",
tags = {"Authentication"},
responses = {
@ApiResponse(responseCode = "200", description = "User data successfully collected",
content = @Content(
schema = @Schema(implementation = ResponseEntityUserView.class)
)),
@ApiResponse(responseCode = "400", description = "Bad request"),
@ApiResponse(responseCode = "401", description = "Unauthorized request"),
@ApiResponse(responseCode = "404", description = "User not found")
})
@Path("logInUser")
public final Response getLoginUser(@Context final HttpServletRequest request){
Response res = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,17 @@
import com.liferay.portal.model.User;
import com.liferay.portal.util.PortalUtil;
import com.liferay.util.LocaleUtil;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.ExampleObject;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.ExternalDocumentation;
import org.elasticsearch.common.collect.Map;
import org.glassfish.jersey.server.JSONP;

Expand Down Expand Up @@ -98,6 +109,8 @@ protected CreateJsonWebTokenResource(final LoginServiceAPI loginService,
@JSONP
@NoCache
@Produces({MediaType.APPLICATION_JSON, "application/javascript"})
@Deprecated
@Hidden
public final Response getApiToken(@Context final HttpServletRequest request,
@Context final HttpServletResponse response,
final CreateTokenForm createTokenForm) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.dotcms.rest.api.v1.authentication;

import com.dotcms.rest.ResponseEntityView;

public class ResponseEntityUserMapView extends ResponseEntityView<AuthenticationForm> {
public ResponseEntityUserMapView(AuthenticationForm entity) {
super(entity);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package com.dotcms.rest.api.v1.authentication;

import com.dotcms.rest.ResponseEntityView;

public class ResponseEntityUserView extends ResponseEntityView<AuthenticationForm> {
public ResponseEntityUserView(AuthenticationForm entity) {
super(entity);
}
}
Loading