fix(Project): state issue when changing project url

LibreTexts · Sep 17, 2024 · d8ad4bb · d8ad4bb
1 parent ad158d6
commit d8ad4bb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/client/src/components/projects/AdminChangeURL.tsx b/client/src/components/projects/AdminChangeURL.tsx
@@ -9,10 +9,11 @@ import api from "../../api";
 interface AdminChangeURLProps {
     projectID: string;
     currentURL?: string;
+    onSave: (newURL: string) => void;
     onClose: () => void;
 }
 
-const AdminChangeURL: React.FC<AdminChangeURLProps> = ({ projectID, currentURL, onClose }) => {
+const AdminChangeURL: React.FC<AdminChangeURLProps> = ({ projectID, currentURL, onSave, onClose }) => {
     const { handleGlobalError } = useGlobalError();
     const { addNotification } = useNotifications();
     const { control, getValues, trigger, watch } = useForm<{ url: string }>({ defaultValues: { url: currentURL || "" } });
@@ -36,7 +37,7 @@ const AdminChangeURL: React.FC<AdminChangeURLProps> = ({ projectID, currentURL,
                 type: "success"
             });
 
-            onClose();
+            onSave(url);
         } catch (err) {
             console.error(err);
             handleGlobalError(err);

diff --git a/client/src/components/projects/ProjectPropertiesModal.tsx b/client/src/components/projects/ProjectPropertiesModal.tsx
@@ -643,6 +643,10 @@ const ProjectPropertiesModal: React.FC<ProjectPropertiesModalProps> = ({
       <AdminChangeURL
         projectID={projectID}
         currentURL={getValues("projectURL") as string}
+        onSave={(newURL) => {
+          setValue("projectURL", newURL);
+          closeAllModals();
+        }}
         onClose={() => closeAllModals()}
       />
     )

diff --git a/server/api/projects.js b/server/api/projects.js
@@ -707,8 +707,8 @@ async function updateProject(req, res) {
       /* If the Project URL is a LibreTexts link, gather more information */
 
       // If attempting to change a workbench project url, ensure user is a superadmin
-      const user = await User.findOne({ uuid: req.user.decoded.uuid }).lean();
-      if (!user || (project.didCreateWorkbench && user.roles.filter((role) => role.org === process.env.ORG_ID && role.role === 'superadmin').length === 0)) {
+      const isSuperadmin = req.user.roles?.filter((role) => role.org === process.env.ORG_ID && role.role === 'superadmin').length > 0;
+      if (project.didCreateWorkbench && !isSuperadmin) {
         return res.status(403).send({
           err: true,
           errMsg: conductorErrors.err8,

diff --git a/server/api/validators/central-identity.ts b/server/api/validators/central-identity.ts
@@ -28,7 +28,7 @@ export const VerificationStatusUpdateWebhookValidator = z.object({
 export const CheckUserApplicationAccessValidator = z.object({
   params: z.object({
     id: z.string().uuid(),
-    applicationId: z.coerce.number().positive().int().or(z.literal('dev'))
+    applicationId: z.coerce.number().positive().int()
   }),
 });