Merge pull request #36 from jadmsaadaot/SUBMIT-task#24

handle user registration by registration link

submit-api/src/submit_api/models/queries/account_user.py

@@ -22,7 +22,6 @@ class UserQueries:
     @classmethod
     def get_by_guid(cls, guid: str):
         """Find user by guid"""
-        print(guid)
         result = (db.session.query(AccountUser)
                   .filter(AccountUser.auth_guid == guid)
                   .first())

submit-web/src/components/Shared/Loader.tsx → submit-web/src/components/Shared/PageLoader.tsx

@@ -1,7 +1,6 @@
 import { CircularProgress } from "@mui/material";
-import React from "react";
 
-export const Loader = () => {
+export const PageLoader = () => {
   return (
     <div
       style={{

submit-web/src/routeTree.gen.ts

@@ -13,6 +13,7 @@ import { createFileRoute } from '@tanstack/react-router'
 // Import Routes
 
 import { Route as rootRoute } from './routes/__root'
+import { Route as RegistrationImport } from './routes/registration'
 import { Route as OidcCallbackImport } from './routes/oidc-callback'
 import { Route as ErrorImport } from './routes/error'
 import { Route as AuthenticatedImport } from './routes/_authenticated'
@@ -39,6 +40,11 @@ const AuthenticatedDashboardAboutpageLazyImport = createFileRoute(
 
 // Create/Update Routes
 
+const RegistrationRoute = RegistrationImport.update({
+  path: '/registration',
+  getParentRoute: () => rootRoute,
+} as any)
+
 const OidcCallbackRoute = OidcCallbackImport.update({
   path: '/oidc-callback',
   getParentRoute: () => rootRoute,
@@ -169,6 +175,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof OidcCallbackImport
       parentRoute: typeof rootRoute
     }
+    '/registration': {
+      id: '/registration'
+      path: '/registration'
+      fullPath: '/registration'
+      preLoaderRoute: typeof RegistrationImport
+      parentRoute: typeof rootRoute
+    }
     '/_authenticated/_dashboard': {
       id: '/_authenticated/_dashboard'
       path: ''
@@ -279,6 +292,7 @@ export const routeTree = rootRoute.addChildren({
   }),
   ErrorRoute,
   OidcCallbackRoute,
+  RegistrationRoute,
 })
 
 /* prettier-ignore-end */
@@ -292,7 +306,8 @@ export const routeTree = rootRoute.addChildren({
         "/",
         "/_authenticated",
         "/error",
-        "/oidc-callback"
+        "/oidc-callback",
+        "/registration"
       ]
     },
     "/": {
@@ -314,6 +329,9 @@ export const routeTree = rootRoute.addChildren({
     "/oidc-callback": {
       "filePath": "oidc-callback.tsx"
     },
+    "/registration": {
+      "filePath": "registration.tsx"
+    },
     "/_authenticated/_dashboard": {
       "filePath": "_authenticated/_dashboard.tsx",
       "parent": "/_authenticated",

submit-web/src/routes/_authenticated.tsx

@@ -1,4 +1,4 @@
-import { Loader } from "@/components/Shared/Loader";
+import { PageLoader } from "@/components/Shared/PageLoader";
 import { useAccount } from "@/store/accountStore";
 import { createFileRoute, Navigate, Outlet } from "@tanstack/react-router";
 import { useEffect } from "react";
@@ -23,7 +23,7 @@ function Auth() {
   }, [isAuthenticated, isLoading, signinRedirect, setAccount, proponent_id]);
 
   if (isLoading) {
-    return <Loader />;
+    return <PageLoader />;
   }
 
   if (!isAuthenticated) {

submit-web/src/routes/oidc-callback.tsx

@@ -1,4 +1,4 @@
-import { Loader } from "@/components/Shared/Loader";
+import { PageLoader } from "@/components/Shared/PageLoader";
 import { useGetUserByGuid } from "@/hooks/api/useAccounts";
 import { createFileRoute, Navigate } from "@tanstack/react-router";
 import { useEffect, useState } from "react";
@@ -45,5 +45,5 @@ function OidcCallback() {
     );
   }
 
-  return <Loader />;
+  return <PageLoader />;
 }

submit-web/src/routes/registration.tsx

@@ -0,0 +1,32 @@
+import { PageLoader } from "@/components/Shared/PageLoader";
+import { notify } from "@/components/Shared/Snackbar/snackbarStore";
+import { OidcConfig } from "@/utils/config";
+import { createFileRoute, Navigate } from "@tanstack/react-router";
+import { useEffect } from "react";
+import { useAuth } from "react-oidc-context";
+
+export const Route = createFileRoute("/registration")({
+  component: Registration,
+});
+
+function Registration() {
+  const { isAuthenticated, signinRedirect } = useAuth();
+  const { proponent_id } = Route.useSearch<{
+    proponent_id: string;
+  }>();
+
+  useEffect(() => {
+    if (!proponent_id) {
+      notify.error("registration link is invalid");
+    } else if (!isAuthenticated) {
+      signinRedirect({
+        redirect_uri: `${OidcConfig.redirect_uri}?proponent_id=${proponent_id}`,
+      });
+    }
+  }, [proponent_id, isAuthenticated, signinRedirect]);
+
+  if (isAuthenticated || !proponent_id) {
+    return <Navigate to={"/error"} />;
+  }
+  return <PageLoader />;
+}

submit-web/src/store/accountStore.ts

@@ -3,12 +3,14 @@ import { create } from "zustand";
 interface AccountStoreState {
   proponentId: string;
   accountId: number;
+  isLoading: boolean;
   setAccount: (account: Partial<AccountStoreState>) => void;
 }
 
 export const useAccount = create<AccountStoreState>((set) => ({
   proponentId: "",
   accountId: 0,
+  isLoading: true,
   setAccount: (account: Partial<AccountStoreState>) =>
     set((prev) => ({ ...prev, ...account })),
 }));

submit-web/src/utils/config.ts

@@ -32,6 +32,7 @@ export const AppConfig = {
   environment: APP_ENVIRONMENT,
   version: APP_VERSION,
   appTitle: APP_TITLE,
+  appUrl: APP_URL,
 };
 
 export const OidcConfig = {