added following new line char

This commit is contained in:
array-in-a-matrix 2024-07-04 20:27:10 -04:00
parent 5c99fa6ee8
commit 1cc84e88ef
4 changed files with 14 additions and 16 deletions

View file

@ -20,11 +20,11 @@ proc createAuthenticationRoutes*() =
# creates new user with provided info
# TODO: sanitization + check if username and email are unique
if @"username".isEmptyOrWhitespace() or @"email".isEmptyOrWhitespace() or @"password".isEmptyOrWhitespace():
resp Http403, "Not all required parameters are provided."
resp Http403, "Not all required parameters are provided.\n"
var user = newUser(@"username", @"email", @"password")
db.insert(user)
resp Http200, user.token
resp Http200, user.token & "\n"
#[
request parameters:
@ -44,7 +44,7 @@ proc createAuthenticationRoutes*() =
if not request.headers["Authorization"].isEmptyOrWhitespace():
if not db.validToken(user, request.headers["Authorization"]):
resp Http403, "Invalid token."
resp Http403, "Invalid token.\n"
db.genNewToken(user)
@ -52,12 +52,12 @@ proc createAuthenticationRoutes*() =
try:
db.select(user, "username = ?", @"username")
except NotFoundError:
resp Http403, "Incorrect username or password." # fails if username is wrong but mentions password to obfuscates if a user exists or not
resp Http403, "Incorrect username or password.\n" # fails if username is wrong but mentions password to obfuscates if a user exists or not
echo user.password
echo @"password"
echo $Sha3_512.secureHash(@"password")
if user.password == $Sha3_512.secureHash(@"password"):
db.genNewToken(user)
else:
resp Http403, "Incorrect username or password." # fails if password is wrong but mentions username to obfuscates if a user exists or not
resp Http200, user.token
resp Http403, "Incorrect username or password.\n" # fails if password is wrong but mentions username to obfuscates if a user exists or not
resp Http200, user.token & "\n"

View file

@ -19,7 +19,7 @@ proc createDeletionRoutes*() =
resp Http403, "Invalid token."
# TODO: delete all user's files
db.delete(user)
resp Http200, "User has been deleted."
resp Http200, "User has been deleted.\n"
#[
request parameters:
@ -32,16 +32,16 @@ proc createDeletionRoutes*() =
delete "/api/v1/file":
var user = newUser()
if not db.validToken(user, request.headers["Authorization"]):
resp Http403, "Invalid token."
resp Http403, "Invalid token.\n"
var file = newFile()
try:
db.select(file, "File.name = ?", request.headers["name"])
except NotFoundError:
resp Http404, "File does not exist"
resp Http404, "File does not exist.\n"
db.delete(file)
resp Http200, "File has been deleted."
resp Http200, "File has been deleted.\n"
#[
request parameters:

View file

@ -20,7 +20,7 @@ proc createUploadRoutes*() =
# fills the new `user` var with saved user data from database
var user = newUser()
if not db.validToken(user, request.headers["Authorization"]):
resp Http403, "Invalid token."
resp Http403, "Invalid token.\n"
# pull request form data arguments
let fileData = request.formData["file"].body
@ -35,7 +35,7 @@ proc createUploadRoutes*() =
except KeyError:
fileTags = "[]"
except: # "except JsonError:" doesn't work for some reason
resp Http400, "Bad JSON"
resp Http400, "Bad JSON.\n"
# create needed directories if they don't exist already
let directory = "uploads/" & user.username & "/"
@ -50,4 +50,4 @@ proc createUploadRoutes*() =
# write the file from memory
writeFile(filePath, fileData)
resp Http200, "File uploaded."
resp Http200, "File uploaded.\n"

View file

@ -1,4 +1,4 @@
import std/[strutils, os, json]
import std/[strutils, os, json, strformat]
import jester
import norm/[model, sqlite]
import checksums/sha3
@ -34,8 +34,6 @@ routes:
# let index = parseInt(@"index")
# resp """indexedImages[index]["tags"]"""
# template respJson*(node: JsonNode) =
# resp $node, "application/json"
extend auth, ""
extend delete, ""
extend download, ""