diff --git a/docker-compose.yml b/docker-compose.yml index b7f3d2f52..62b36a367 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -112,7 +112,7 @@ services: build: dockerfile: packages/hoppscotch-backend/Dockerfile context: . - target: prod + target: dev env_file: - ./.env restart: always @@ -122,7 +122,7 @@ services: - PORT=3000 volumes: # Uncomment the line below when modifying code. Only applicable when using the "dev" target. - # - ./packages/hoppscotch-backend/:/usr/src/app + - ./packages/hoppscotch-backend/:/usr/src/app - /usr/src/app/node_modules/ depends_on: hoppscotch-db: diff --git a/packages/hoppscotch-backend/src/team-collection/team-collection.controller.ts b/packages/hoppscotch-backend/src/team-collection/team-collection.controller.ts index 4da0eec9c..7fa3d1fae 100644 --- a/packages/hoppscotch-backend/src/team-collection/team-collection.controller.ts +++ b/packages/hoppscotch-backend/src/team-collection/team-collection.controller.ts @@ -13,7 +13,7 @@ import { throwHTTPErr } from 'src/utils'; export class TeamCollectionController { constructor(private readonly teamCollectionService: TeamCollectionService) {} - @Get('search/:teamID/:searchQuery') + @Get('search/:teamID') @RequiresTeamRole( TeamMemberRole.VIEWER, TeamMemberRole.EDITOR, @@ -21,11 +21,12 @@ export class TeamCollectionController { ) @UseGuards(JwtAuthGuard, RESTTeamMemberGuard) async searchByTitle( - @Param('searchQuery') searchQuery: string, + @Query('searchQuery') searchQuery: string, @Param('teamID') teamID: string, @Query('take') take: string, @Query('skip') skip: string, ) { + console.log('searchQuery', searchQuery); const res = await this.teamCollectionService.searchByTitle( searchQuery, teamID, diff --git a/packages/hoppscotch-backend/src/utils.ts b/packages/hoppscotch-backend/src/utils.ts index 34095eb63..f201a37b3 100644 --- a/packages/hoppscotch-backend/src/utils.ts +++ b/packages/hoppscotch-backend/src/utils.ts @@ -261,29 +261,28 @@ export function checkEnvironmentAuthProvider( * Source: https://stackoverflow.com/a/32648526 */ export function escapeSqlLikeString(str: string) { - if (typeof str != 'string') - return str; + if (typeof str != 'string') return str; - return str.replace(/[\0\x08\x09\x1a\n\r"'\\\%]/g, function (char) { - switch (char) { - case "\0": - return "\\0"; - case "\x08": - return "\\b"; - case "\x09": - return "\\t"; - case "\x1a": - return "\\z"; - case "\n": - return "\\n"; - case "\r": - return "\\r"; - case "\"": - case "'": - case "\\": - case "%": - return "\\"+char; // prepends a backslash to backslash, percent, - // and double/single quotes - } - }); + return str.replace(/[\0\x08\x09\x1a\n\r"'\\\%]/g, function (char) { + switch (char) { + case '\0': + return '\\0'; + case '\x08': + return '\\b'; + case '\x09': + return '\\t'; + case '\x1a': + return '\\z'; + case '\n': + return '\\n'; + case '\r': + return '\\r'; + case '"': + case "'": + case '\\': + case '%': + return '\\' + char; // prepends a backslash to backslash, percent, + // and double/single quotes + } + }); } diff --git a/packages/hoppscotch-common/src/components/importExport/ImportExportSteps/FileImport.vue b/packages/hoppscotch-common/src/components/importExport/ImportExportSteps/FileImport.vue index 4750b1a42..7b58d5833 100644 --- a/packages/hoppscotch-common/src/components/importExport/ImportExportSteps/FileImport.vue +++ b/packages/hoppscotch-common/src/components/importExport/ImportExportSteps/FileImport.vue @@ -67,7 +67,7 @@ defineProps<{ const t = useI18n() const toast = useToast() -const ALLOWED_FILE_SIZE_LIMIT = 10 // 10 MB +const ALLOWED_FILE_SIZE_LIMIT = 100 // 10 MB const importFilesCount = ref(0)