Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-10-31 10:13:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix Users API Token API path (#526)

Browse Source 
* Fix Users API Token API path

* Change CRLF to LF

* Fix route generation when route contains /api
This commit is contained in:
sephrat
2021-06-16 20:31:09 +02:00
committed by GitHub
parent f5ede73eb6
commit db3c8f7b4b
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev/scripts/app_routes_gen.py
View File

@@ -29,7 +29,7 @@ JS_DIR.mkdir(exist_ok=True, parents=True)
class RouteObject: class RouteObject:
def __init__(self, route_string) -> None: def __init__(self, route_string) -> None:
self.prefix = "/" + route_string.split("/")[1] self.prefix = "/" + route_string.split("/")[1]
self.route = route_string.replace(self.prefix, "") self.route = "/" + route_string.split("/", 2)[2]
self.js_route = self.route.replace("{", "${") self.js_route = self.route.replace("{", "${")
self.parts = route_string.split("/")[1:] self.parts = route_string.split("/")[1:]
self.var = re.findall(r"\{(.*?)\}", route_string) self.var = re.findall(r"\{(.*?)\}", route_string)

4
dev/scripts/output/app_routes.py
View File

@@ -46,7 +46,7 @@ class AppRoutes:
self.themes = "/api/themes" self.themes = "/api/themes"
self.themes_create = "/api/themes/create" self.themes_create = "/api/themes/create"
self.users = "/api/users" self.users = "/api/users"
self.users_api_tokens = "/api/users-tokens" self.users_api_tokens = "/api/users/api-tokens"
self.users_self = "/api/users/self" self.users_self = "/api/users/self"
self.users_sign_ups = "/api/users/sign-ups" self.users_sign_ups = "/api/users/sign-ups"
self.utils_download = "/api/utils/download" self.utils_download = "/api/utils/download"
@@ -127,7 +127,7 @@ class AppRoutes:
return f"{self.prefix}/themes/{id}" return f"{self.prefix}/themes/{id}"
def users_api_tokens_token_id(self, token_id): def users_api_tokens_token_id(self, token_id):
return f"{self.prefix}/users-tokens/{token_id}" return f"{self.prefix}/users/api-tokens/{token_id}"
def users_id(self, id): def users_id(self, id):
return f"{self.prefix}/users/{id}" return f"{self.prefix}/users/{id}"

4
frontend/src/api/apiRoutes.js
View File

@@ -42,7 +42,7 @@ export const API_ROUTES = {
themes: `${prefix}/themes`, themes: `${prefix}/themes`,
themesCreate: `${prefix}/themes/create`, themesCreate: `${prefix}/themes/create`,
users: `${prefix}/users`, users: `${prefix}/users`,
usersApiTokens: `${prefix}/users-tokens`, usersApiTokens: `${prefix}/users/api-tokens`,
usersSelf: `${prefix}/users/self`, usersSelf: `${prefix}/users/self`,
usersSignUps: `${prefix}/users/sign-ups`, usersSignUps: `${prefix}/users/sign-ups`,
utilsDownload: `${prefix}/utils/download`, utilsDownload: `${prefix}/utils/download`,
@@ -76,7 +76,7 @@ export const API_ROUTES = {
siteSettingsCustomPagesId: id => `${prefix}/site-settings/custom-pages/${id}`, siteSettingsCustomPagesId: id => `${prefix}/site-settings/custom-pages/${id}`,
tagsTag: tag => `${prefix}/tags/${tag}`, tagsTag: tag => `${prefix}/tags/${tag}`,
themesId: id => `${prefix}/themes/${id}`, themesId: id => `${prefix}/themes/${id}`,
usersApiTokensTokenId: token_id => `${prefix}/users-tokens/${token_id}`, usersApiTokensTokenId: token_id => `${prefix}/users/api-tokens/${token_id}`,
usersId: id => `${prefix}/users/${id}`, usersId: id => `${prefix}/users/${id}`,
usersIdFavorites: id => `${prefix}/users/${id}/favorites`, usersIdFavorites: id => `${prefix}/users/${id}/favorites`,
usersIdFavoritesSlug: (id, slug) => `${prefix}/users/${id}/favorites/${slug}`, usersIdFavoritesSlug: (id, slug) => `${prefix}/users/${id}/favorites/${slug}`,