Skip to content

bugfix/fix the invalid uri error when slash character at the and of the request URI #25

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 25, 2025
Merged

bugfix/fix the invalid uri error when slash character at the and of the request URI #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion force-app/main/default/classes/libak_RestRouter.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ public abstract class libak_RestRouter {
.replaceAll('\\*', '\\.+')
.replaceAll('\\:(.+?)/', '\\.+/')
.replaceAll('\\:(.+?)$', '\\.+');
return Pattern.matches('(?i)' + routeTemplateRegEx, requestURI);
return Pattern.matches('(?i)' + routeTemplateRegEx, requestURI.replaceAll('(\\/+)$', ''));
}
}
46 changes: 44 additions & 2 deletions force-app/main/default/classes/tests/libak_TestRestFramework.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
@IsTest
public with sharing class libak_TestRestFramework {

public static final String URI_TEMPLATE = '/testRestFramework/:uriParam';
public static final String URI_TEMPLATE_WITH_PARAMS = '/testRestFramework/:uriParam';
public static final String URI_TEMPLATE_WITHOUT_PARAMS = '/testRestFramework';

@IsTest
static void testHandleRequestPositive(){
Expand All @@ -23,6 +24,46 @@ public with sharing class libak_TestRestFramework {
);
}

@IsTest
static void testHandleRequestWithoutParamsPositive(){
RestRequest request = new RestRequest();
request.requestURI = '/testRestFramework';
RestContext.request = request;
RestContext.response = new RestResponse();

Test.startTest();

libak_RestFramework.handleRequest(RestRouterInstance.class);

Test.stopTest();

System.assertEquals(
libak_RestFramework.HTTP_CODE_METHOD_NOT_ALLOWED,
RestContext.response.statusCode,
'The status code of response should be 405'
);
}

@IsTest
static void testHandleRequestWithoutParamsWithSlashAtTheEnd(){
RestRequest request = new RestRequest();
request.requestURI = '/testRestFramework/';
RestContext.request = request;
RestContext.response = new RestResponse();

Test.startTest();

libak_RestFramework.handleRequest(RestRouterInstance.class);

Test.stopTest();

System.assertEquals(
libak_RestFramework.HTTP_CODE_METHOD_NOT_ALLOWED,
RestContext.response.statusCode,
'The status code of response should be 405'
);
}

@IsTest
static void testHandleRequestWrongRouter(){
RestRequest request = new RestRequest();
Expand Down Expand Up @@ -56,7 +97,8 @@ public with sharing class libak_TestRestFramework {
private class RestRouterInstance extends libak_RestRouter {
override public libak_RestRouter setRoutes() {
this.routeToRestProcessorType = new Map<String, Type>{
URI_TEMPLATE => libak_RestProcessor.class
URI_TEMPLATE_WITH_PARAMS => libak_RestProcessor.class,
URI_TEMPLATE_WITHOUT_PARAMS => libak_RestProcessor.class
};
return this;
}
Expand Down