From 69c5d86d45194da0db89ae477e472517289f6e8e Mon Sep 17 00:00:00 2001 From: william Date: Sat, 14 May 2022 21:19:56 -0400 Subject: [PATCH] #30 Generalize group token cookie path to allow the cookie in the group token controller --- .../dev/fyloz/colorrecipesexplorer/Constants.kt | 11 ++++++----- .../rest/account/GroupTokenController.kt | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/Constants.kt b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/Constants.kt index 5bb0754..66e863d 100644 --- a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/Constants.kt +++ b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/Constants.kt @@ -6,22 +6,23 @@ object Constants { object ControllerPaths { const val BASE_PATH = "/api" + const val ACCOUNT_BASE_PATH = "$BASE_PATH/account" const val COMPANY = "$BASE_PATH/company" const val GROUP_TOKEN = "$BASE_PATH/account/group/token" const val FILE = "$BASE_PATH/file" - const val GROUP = "$BASE_PATH/account/group" const val INVENTORY = "$BASE_PATH/inventory" const val MATERIAL = "$BASE_PATH/material" const val MATERIAL_TYPE = "$BASE_PATH/materialtype" const val MIX = "$BASE_PATH/recipe/mix" const val RECIPE = "$BASE_PATH/recipe" const val TOUCH_UP_KIT = "$BASE_PATH/touchupkit" - const val USER = "$BASE_PATH/account/user" - const val LOGIN = "$BASE_PATH/account/login" - const val GROUP_LOGIN = "$BASE_PATH/account/login/group" - const val LOGOUT = "$BASE_PATH/account/logout" + const val GROUP = "$ACCOUNT_BASE_PATH/group" + const val GROUP_LOGIN = "$ACCOUNT_BASE_PATH/login/group" + const val LOGIN = "$ACCOUNT_BASE_PATH/login" + const val LOGOUT = "$ACCOUNT_BASE_PATH/logout" + const val USER = "$ACCOUNT_BASE_PATH/user" } object CookieNames { diff --git a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/rest/account/GroupTokenController.kt b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/rest/account/GroupTokenController.kt index c8221b6..828192a 100644 --- a/src/main/kotlin/dev/fyloz/colorrecipesexplorer/rest/account/GroupTokenController.kt +++ b/src/main/kotlin/dev/fyloz/colorrecipesexplorer/rest/account/GroupTokenController.kt @@ -74,6 +74,6 @@ class GroupTokenController( companion object { private const val GROUP_TOKEN_COOKIE_HTTP_ONLY = true private const val GROUP_TOKEN_COOKIE_SAME_SITE = true - private const val GROUP_TOKEN_COOKIE_PATH = Constants.ControllerPaths.GROUP_LOGIN + private const val GROUP_TOKEN_COOKIE_PATH = Constants.ControllerPaths.ACCOUNT_BASE_PATH } }