thewca · FinnIckler · Oct 22, 2023 · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023
diff --git a/Frontend/package.json b/Frontend/package.json
@@ -15,7 +15,7 @@
   "scripts": {
     "build:types": "TYPES_ONLY=true node src/build.mjs",
     "build:dev": "NODE_ENV=\"development\" ASSET_PATH=\"/dist\" API_URL=\"http://localhost:3001/api/v1\" AUTH_URL=\"http://localhost:3001/jwt\" node src/build.mjs",
-    "build:staging": "POLL_URL=\"https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/staging\" NODE_ENV=\"staging\" ASSET_PATH=\"https://d1qizdh27al0a7.cloudfront.net/staging/dist\" API_URL=\"https://staging.registration.worldcubeassociation.org/api/v1\" WCA_URL=\"https://staging.worldcubeassociation.org\" node src/build.mjs",
+    "build:staging": "POLL_URL=\"https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/staging\" NODE_ENV=\"production\" ASSET_PATH=\"https://d1qizdh27al0a7.cloudfront.net/staging/dist\" API_URL=\"https://staging.registration.worldcubeassociation.org/api/v1\" WCA_URL=\"https://staging.worldcubeassociation.org\" node src/build.mjs",
     "build:prod": "POLL_URL=\"https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/prod\" NODE_ENV=\"production\" ASSET_PATH=\"https://d1qizdh27al0a7.cloudfront.net/dist\" API_URL=\"https://registration.worldcubeassociation.org/api/v1\" WCA_URL=\"https://worldcubeassociation.org\" node src/build.mjs",
     "watch": "node src/watch.mjs",
     "lint": "eslint src --ext .js,.jsx,.ts,.tsx",

diff --git a/Frontend/src/api/mocks/get_jwt.ts b/Frontend/src/api/mocks/get_jwt.ts
@@ -8,7 +8,7 @@ export default async function getJWTMock(): Promise<string> {
   const secret = new TextEncoder().encode('jwt-test-secret')
   const alg = 'HS256'
   const issuedAt = Date.now()
-  const jwt = await new jose.SignJWT({ data: { user_id: user } })
+  const jwt = await new jose.SignJWT({ user_id: user })
     .setProtectedHeader({ alg })
     .setIssuedAt(issuedAt)
     .setJti(Base64.stringify(md5(`${secret}:${issuedAt}`)))

diff --git a/Frontend/src/index.dev.jsx b/Frontend/src/index.dev.jsx
@@ -15,6 +15,7 @@ import Registrations from './pages/registrations'
 import Schedule from './pages/schedule'
 import TestLogin from './pages/test/login'
 import TestLogout from './pages/test/logout'
+import { BASE_ROUTE } from './routes'
 import App from './ui/App'
 import Competition from './ui/Competition'
 import CustomTab from './ui/CustomTab'
@@ -60,7 +61,7 @@ const router = createBrowserRouter([
         ),
       },
       {
-        path: '/competitions/:competition_id',
+        path: `${BASE_ROUTE}/:competition_id`,
         element: (
           <Container>
             <Competition>
@@ -73,35 +74,35 @@ const router = createBrowserRouter([
         ),
         children: [
           {
-            path: '/competitions/:competition_id',
+            path: `${BASE_ROUTE}/:competition_id`,
             element: <HomePage />,
           },
           {
-            path: '/competitions/:competition_id/events',
+            path: `${BASE_ROUTE}/:competition_id/events`,
             element: <Events />,
           },
           {
-            path: '/competitions/:competition_id/schedule',
+            path: `${BASE_ROUTE}/:competition_id/schedule`,
             element: <Schedule />,
           },
           {
-            path: '/competitions/:competition_id/register',
+            path: `${BASE_ROUTE}/:competition_id/register`,
             element: <Register />,
           },
           {
-            path: '/competitions/:competition_id/tabs/:tab_id',
+            path: `${BASE_ROUTE}/:competition_id/tabs/:tab_id`,
             element: <CustomTab />,
           },
           {
-            path: '/competitions/:competition_id/registrations',
+            path: `${BASE_ROUTE}/:competition_id/registrations`,
             element: <Registrations />,
           },
           {
-            path: '/competitions/:competition_id/:user_id/edit',
+            path: `${BASE_ROUTE}/:competition_id/:user_id/edit`,
             element: <RegistrationEdit />,
           },
           {
-            path: '/competitions/:competition_id/registrations/edit',
+            path: `${BASE_ROUTE}/:competition_id/registrations/edit`,
             element: <RegistrationAdministration />,
           },
         ],

diff --git a/Frontend/src/index.jsx b/Frontend/src/index.jsx
@@ -2,85 +2,10 @@
 import '@thewca/wca-components/dist/index.esm.css'
 import React from 'react'
 import { createRoot } from 'react-dom/client'
-import { createBrowserRouter, Outlet, RouterProvider } from 'react-router-dom'
-import { Container } from 'semantic-ui-react'
-import Events from './pages/events'
-import HomePage from './pages/home'
-import Register from './pages/register'
-import RegistrationAdministration from './pages/registration_administration'
-import RegistrationEdit from './pages/registration_edit'
-import Registrations from './pages/registrations'
-import Schedule from './pages/schedule'
-import App from './ui/App'
-import Competition from './ui/Competition'
-import CustomTab from './ui/CustomTab'
-import FlashMessage from './ui/messages/flashMessage'
-import PermissionsProvider from './ui/providers/PermissionsProvider'
-import UserProvider from './ui/providers/UserProvider'
-import PageTabs from './ui/Tabs'
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
+import routes from './routes'
 
-const router = createBrowserRouter([
-  {
-    path: '/competitions',
-    element: (
-      <App>
-        <FlashMessage />
-        <UserProvider>
-          <Outlet />
-        </UserProvider>
-      </App>
-    ),
-    children: [
-      {
-        path: '/competitions/:competition_id',
-        element: (
-          <Container>
-            <Competition>
-              <PermissionsProvider>
-                <PageTabs />
-                <Outlet />
-              </PermissionsProvider>
-            </Competition>
-          </Container>
-        ),
-        children: [
-          {
-            path: '/competitions/:competition_id',
-            element: <HomePage />,
-          },
-          {
-            path: '/competitions/:competition_id/events',
-            element: <Events />,
-          },
-          {
-            path: '/competitions/:competition_id/schedule',
-            element: <Schedule />,
-          },
-          {
-            path: '/competitions/:competition_id/register',
-            element: <Register />,
-          },
-          {
-            path: '/competitions/:competition_id/tabs/:tab_id',
-            element: <CustomTab />,
-          },
-          {
-            path: '/competitions/:competition_id/registrations',
-            element: <Registrations />,
-          },
-          {
-            path: '/competitions/:competition_id/:user_id/edit',
-            element: <RegistrationEdit />,
-          },
-          {
-            path: '/competitions/:competition_id/registrations/edit',
-            element: <RegistrationAdministration />,
-          },
-        ],
-      },
-    ],
-  },
-])
+const router = createBrowserRouter(routes)
 
 // Render the React component into the body of the monolith
 const root = createRoot(document.querySelector('#registration-app'))

diff --git a/Frontend/src/pages/registration_administration/components/RegistrationAdministrationList.jsx b/Frontend/src/pages/registration_administration/components/RegistrationAdministrationList.jsx
@@ -5,6 +5,7 @@ import { Link } from 'react-router-dom'
 import { Checkbox, Popup, Table } from 'semantic-ui-react'
 import { CompetitionContext } from '../../../api/helper/context/competition_context'
 import { getAllRegistrations } from '../../../api/registration/get/get_registrations'
+import { BASE_ROUTE } from '../../../routes'
 import { setMessage } from '../../../ui/events/messages'
 import LoadingMessage from '../../../ui/messages/loadingMessage'
 import styles from './list.module.scss'
@@ -276,7 +277,7 @@ function RegistrationAdministrationTable({
                 </Table.Cell>
                 <Table.Cell>
                   <Link
-                    to={`/competitions/${competition_id}/${registration.user.id}/edit`}
+                    to={`${BASE_ROUTE}/${competition_id}/${registration.user.id}/edit`}
                   >
                     Edit
                   </Link>

diff --git a/Frontend/src/routes.jsx b/Frontend/src/routes.jsx
@@ -0,0 +1,84 @@
+import React from 'react'
+import { Outlet } from 'react-router-dom'
+import { Container } from 'semantic-ui-react'
+import Events from './pages/events'
+import HomePage from './pages/home'
+import Register from './pages/register'
+import RegistrationAdministration from './pages/registration_administration'
+import RegistrationEdit from './pages/registration_edit'
+import Registrations from './pages/registrations'
+import Schedule from './pages/schedule'
+import App from './ui/App'
+import Competition from './ui/Competition'
+import CustomTab from './ui/CustomTab'
+import FlashMessage from './ui/messages/flashMessage'
+import PermissionsProvider from './ui/providers/PermissionsProvider'
+import UserProvider from './ui/providers/UserProvider'
+import PageTabs from './ui/Tabs'
+
+export const BASE_ROUTE = '/competitions/v2'
+
+const routes = [
+  {
+    path: BASE_ROUTE,
+    element: (
+      <App>
+        <FlashMessage />
+        <UserProvider>
+          <Outlet />
+        </UserProvider>
+      </App>
+    ),
+    children: [
+      {
+        path: `${BASE_ROUTE}/:competition_id`,
+        element: (
+          <Container>
+            <Competition>
+              <PermissionsProvider>
+                <PageTabs />
+                <Outlet />
+              </PermissionsProvider>
+            </Competition>
+          </Container>
+        ),
+        children: [
+          {
+            path: `${BASE_ROUTE}/:competition_id`,
+            element: <HomePage />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/events`,
+            element: <Events />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/schedule`,
+            element: <Schedule />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/register`,
+            element: <Register />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/tabs/:tab_id`,
+            element: <CustomTab />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/registrations`,
+            element: <Registrations />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/:user_id/edit`,
+            element: <RegistrationEdit />,
+          },
+          {
+            path: `${BASE_ROUTE}/:competition_id/registrations/edit`,
+            element: <RegistrationAdministration />,
+          },
+        ],
+      },
+    ],
+  },
+]
+
+export default routes
diff --git a/Frontend/src/ui/Competition.jsx b/Frontend/src/ui/Competition.jsx
@@ -8,6 +8,7 @@ import { useNavigate, useParams } from 'react-router-dom'
 import { Button, Image } from 'semantic-ui-react'
 import getCompetitionInfo from '../api/competition/get/get_competition_info'
 import { CompetitionContext } from '../api/helper/context/competition_context'
+import { BASE_ROUTE } from '../routes'
 import styles from './competition.module.scss'
 import LoadingMessage from './messages/loadingMessage'
 
@@ -64,7 +65,7 @@ export default function Competition({ children }) {
                   onClick={(_, data) => {
                     if (!data.disabled) {
                       if (competitionInfo.use_wca_registration) {
-                        navigate(`/competitions/${competitionInfo.id}/register`)
+                        navigate(`${BASE_ROUTE}/${competitionInfo.id}/register`)
                       } else {
                         window.location =
                           competitionInfo.external_registration_page

diff --git a/Frontend/src/ui/Tabs.jsx b/Frontend/src/ui/Tabs.jsx
@@ -4,6 +4,7 @@ import { useLocation, useNavigate } from 'react-router-dom'
 import { Menu, Tab } from 'semantic-ui-react'
 import { CompetitionContext } from '../api/helper/context/competition_context'
 import { PermissionsContext } from '../api/helper/context/permission_context'
+import { BASE_ROUTE } from '../routes'
 import styles from './tabs.module.scss'
 
 function pathMatch(name, pathname) {
@@ -50,7 +51,7 @@ export default function PageTabs() {
             name="register"
             className={styles.tabItem}
             onClick={() =>
-              navigate(`/competitions/${competitionInfo.id}/register`)
+              navigate(`${BASE_ROUTE}/${competitionInfo.id}/register`)
             }
           >
             <UiIcon name="sign in alt" />
@@ -68,7 +69,7 @@ export default function PageTabs() {
             name="registrations"
             className={styles.tabItem}
             onClick={() =>
-              navigate(`/competitions/${competitionInfo.id}/registrations/edit`)
+              navigate(`${BASE_ROUTE}/${competitionInfo.id}/registrations/edit`)
             }
           >
             <UiIcon name="list ul" />
@@ -86,7 +87,7 @@ export default function PageTabs() {
             name="competitors"
             className={styles.tabItem}
             onClick={() =>
-              navigate(`/competitions/${competitionInfo.id}/registrations`)
+              navigate(`${BASE_ROUTE}/${competitionInfo.id}/registrations`)
             }
           >
             <UiIcon name="users" />
@@ -103,7 +104,7 @@ export default function PageTabs() {
             key="tab-info"
             name="info"
             className={styles.tabItem}
-            onClick={() => navigate(`/competitions/${competitionInfo.id}`)}
+            onClick={() => navigate(`${BASE_ROUTE}/${competitionInfo.id}`)}
           >
             <UiIcon name="info" />
             General Info
@@ -119,7 +120,7 @@ export default function PageTabs() {
             name="events"
             className={styles.tabItem}
             onClick={() =>
-              navigate(`/competitions/${competitionInfo.id}/events`)
+              navigate(`${BASE_ROUTE}/${competitionInfo.id}/events`)
             }
           >
             <CubingIcon event={competitionInfo.main_event_id} selected />
@@ -135,7 +136,7 @@ export default function PageTabs() {
             name="schedule"
             className={styles.tabItem}
             onClick={() =>
-              navigate(`/competitions/${competitionInfo.id}/schedule`)
+              navigate(`${BASE_ROUTE}/${competitionInfo.id}/schedule`)
             }
           >
             <UiIcon name="calendar" />
@@ -152,7 +153,7 @@ export default function PageTabs() {
               name={`tabs-${tab.id}`}
               className={styles.tabItem}
               onClick={() =>
-                navigate(`/competitions/${competitionInfo.id}/tabs/${tab.id}`)
+                navigate(`${BASE_ROUTE}/${competitionInfo.id}/tabs/${tab.id}`)
               }
             >
               {tab.name}

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -12,7 +12,7 @@ def validate_token
     token = request.headers['Authorization'].split[1]
     begin
       decoded_token = (JWT.decode token, JwtOptions.secret, true, { algorithm: JwtOptions.algorithm })[0]
-      @current_user = decoded_token['data']['user_id']
+      @current_user = decoded_token['user_id']
     rescue JWT::VerificationError, JWT::InvalidJtiError
       Metrics.jwt_verification_error_counter.increment
       render json: { error: ErrorCodes::INVALID_TOKEN }, status: :unauthorized

diff --git a/app/controllers/registration_controller.rb b/app/controllers/registration_controller.rb
@@ -64,8 +64,8 @@ def validate_create_request
 
     user_can_create_registration!
 
-    can_compete, reasons = UserApi.can_compete?(@user_id)
-    raise RegistrationError.new(:unauthorized, reasons) unless can_compete
+    can_compete = UserApi.can_compete?(@user_id)
+    raise RegistrationError.new(:unauthorized, ErrorCodes::USER_PROFILE_INCOMPLETE) unless can_compete
 
     validate_events!
     raise RegistrationError.new(:unprocessable_entity, ErrorCodes::GUEST_LIMIT_EXCEEDED) if params.key?(:guests) && @competition.guest_limit_exceeded?(params[:guests])
@@ -171,12 +171,12 @@ def payment_ticket
     refresh = params[:refresh]
     if refresh || @registration.payment_ticket.nil?
       amount, currency_code = @competition.payment_info
-      ticket, account_id = PaymentApi.get_ticket(@registration[:attendee_id], amount, currency_code)
+      ticket = PaymentApi.get_ticket(@registration[:attendee_id], amount, currency_code)
       @registration.init_payment_lane(amount, currency_code, ticket)
     else
       ticket = @registration.payment_ticket
     end
-    render json: { client_secret_id: ticket, connected_account_id: account_id }
+    render json: { id: ticket }
   end
 
   def validate_payment_ticket_request