Merge branch 'develop' into fix/github-username-assignment

Author: raclim

client/components/Dropdown/DropdownMenu.test.tsx

@@ -0,0 +1,55 @@
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '../../test-utils';
+import { DropdownMenu, DropdownMenuAlignment } from './DropdownMenu';
+
+describe('DropdownMenu', () => {
+  const renderDropdown = () => {
+    render(
+      <DropdownMenu
+        aria-label="More options"
+        align={DropdownMenuAlignment.RIGHT}
+      >
+        <li role="menuitem">Item One</li>
+        <li role="menuitem">Item Two</li>
+        <li role="menuitem">Item Three</li>
+      </DropdownMenu>
+    );
+  };
+
+  it('should render the dropdown button', () => {
+    renderDropdown();
+
+    const button = screen.getByRole('button', { name: 'More options' });
+    expect(button).toBeInTheDocument();
+
+    expect(screen.queryByRole('menu')).not.toBeInTheDocument();
+  });
+
+  it('should open dropdown and render menu items when button is clicked', () => {
+    renderDropdown();
+
+    const button = screen.getByRole('button', { name: 'More options' });
+
+    fireEvent.click(button);
+
+    expect(screen.getByRole('menu')).toBeInTheDocument();
+
+    expect(screen.getByText('Item One')).toBeInTheDocument();
+    expect(screen.getByText('Item Two')).toBeInTheDocument();
+    expect(screen.getByText('Item Three')).toBeInTheDocument();
+  });
+
+  it('should close the menu after selecting an item', async () => {
+    renderDropdown();
+
+    const button = screen.getByRole('button', { name: 'More options' });
+    fireEvent.click(button);
+
+    const item = screen.getByText('Item One');
+    fireEvent.mouseUp(item);
+
+    await waitFor(() => {
+      expect(screen.queryByRole('menu')).not.toBeInTheDocument();
+    });
+  });
+});

client/i18n.js

@@ -18,7 +18,8 @@ import {
   uk,
   sv,
   tr,
-  enIN
+  enIN,
+  ne
 } from 'date-fns/locale';
 
 import { getPreferredLanguage } from './utils/language-utils';
@@ -41,7 +42,8 @@ export const availableLanguages = [
   'zh-CN',
   'zh-TW',
   'tr',
-  'ur'
+  'ur',
+  'ne'
 ];
 
 const detectedLanguage = getPreferredLanguage(
@@ -76,7 +78,8 @@ export function languageKeyToLabel(lang) {
     'zh-CN': '简体中文',
     'zh-TW': '正體中文',
     tr: 'Türkçe',
-    ur: 'اردو'
+    ur: 'اردو',
+    ne: 'नेपाली'
   };
   return languageMap[lang];
 }
@@ -98,7 +101,8 @@ export function languageKeyToDateLocale(lang) {
     'zh-CN': zhCN,
     'zh-TW': zhTW,
     tr,
-    ur: enIN
+    ur: enIN,
+    ne
   };
   return languageMap[lang];
 }

client/modules/IDE/actions/uploader.js

@@ -82,6 +82,23 @@ export function dropzoneCompleteCallback(file) {
         content: file.content
       };
       dispatch(handleCreateFile(formParams, false));
+    } else if (file.status === 'error' || file.xhr.status >= 400) {
+      let uploadFileErrorMessage = 'Uploading file to AWS failed.';
+      if (file.xhr?.response) {
+        const parser = new DOMParser();
+        const xmlDoc = parser.parseFromString(file.xhr.response, 'text/xml');
+        const message = xmlDoc.getElementsByTagName('Message')[0]?.textContent;
+        const code = xmlDoc.getElementsByTagName('Code')[0]?.textContent;
+        uploadFileErrorMessage = `${code}: ${message}`;
+      }
+      file.previewElement.classList.add('dz-error');
+      file.previewElement.classList.remove('dz-success');
+      const dzErrorMessageElement = file.previewElement?.querySelector(
+        '[data-dz-errormessage]'
+      );
+      if (dzErrorMessageElement) {
+        dzErrorMessageElement.textContent = uploadFileErrorMessage;
+      }
     }
   };
 }

client/modules/IDE/components/FileUploader.jsx

@@ -23,13 +23,36 @@ const StyledUploader = styled.div`
   .dz-preview.dz-image-preview {
     background-color: transparent;
   }
+  .dz-image img {
+    width: 100%;
+    height: auto;
+  }
+  .dz-details .dz-filename:hover {
+    overflow: hidden;
+  }
+  .dz-error-message span {
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+    display: block;
+  }
+  .dz-error-mark:hover {
+    cursor: pointer !important;
+  }
 `;
 
 function FileUploader() {
   const { t } = useTranslation();
   const dispatch = useDispatch();
   const userId = useSelector((state) => state.user.id);
-
+  const deleteUploadErrorFiles = (uploader, file) => {
+    if (file.status === 'error') {
+      file.previewElement.addEventListener('click', (e) => {
+        e.stopPropagation();
+        uploader.removeFile(file);
+      });
+    }
+  };
   useEffect(() => {
     const uploader = new Dropzone('div#uploader', {
       url: s3BucketHttps,
@@ -52,6 +75,7 @@ function FileUploader() {
     });
     uploader.on('complete', (file) => {
       dispatch(dropzoneCompleteCallback(file));
+      deleteUploadErrorFiles(uploader, file);
     });
     return () => {
       uploader.destroy();

client/modules/User/components/AccountForm.tsx

@@ -148,7 +148,7 @@ export function AccountForm() {
             <Field name="currentPassword">
               {(field) => (
                 <p className="form__field">
-                  <label htmlFor="current password" className="form__label">
+                  <label htmlFor="currentPassword" className="form__label">
                     {t('AccountForm.CurrentPassword')}
                   </label>
                   <input
@@ -172,7 +172,7 @@ export function AccountForm() {
             <Field name="newPassword">
               {(field) => (
                 <p className="form__field">
-                  <label htmlFor="new password" className="form__label">
+                  <label htmlFor="newPassword" className="form__label">
                     {t('AccountForm.NewPassword')}
                   </label>
                   <input

package-lock.json

@@ -124,6 +124,18 @@ const getVerifiedEmails = (githubEmails) =>
 const getPrimaryEmail = (githubEmails) =>
   (lodash.find(githubEmails, { primary: true }) || {}).value;
 
+/**
+ * Get primary email from Google OAuth profile.
+ * Returns the first email if available, or null if emails array is missing/empty.
+ */
+const getGooglePrimaryEmail = (googleEmails) => {
+  if (!Array.isArray(googleEmails) || googleEmails.length === 0) {
+    return null;
+  }
+  const primaryEmail = googleEmails[0]?.value?.trim();
+  return primaryEmail || null;
+};
+
 /**
  * Sign in with GitHub.
  */
@@ -234,14 +246,24 @@ passport.use(
     {
       clientID: process.env.GOOGLE_ID,
       clientSecret: process.env.GOOGLE_SECRET,
-      callbackURL: 'https://editor.p5js.org/auth/google/callback',
+      callbackURL: `${process.env.EDITOR_URL}/auth/google/callback`,
       passReqToCallback: true,
       scope: ['openid email']
     },
     async (req, accessToken, refreshToken, profile, done) => {
       try {
+        // Validate that emails array exists and has at least one element
+        const primaryEmail = getGooglePrimaryEmail(profile._json?.emails);
+        if (!primaryEmail) {
+          return done(null, false, {
+            msg:
+              'Unable to retrieve email from Google account. ' +
+              'Please ensure your Google account has an email address and try again.'
+          });
+        }
+
         const existingUser = await User.findOne({
-          google: profile._json.emails[0].value
+          google: primaryEmail
         }).exec();
 
         if (existingUser) {
@@ -258,18 +280,16 @@ passport.use(
           return done(null, existingUser);
         }
 
-        const primaryEmail = profile._json.emails[0].value;
-
         if (req.user) {
           if (!req.user.google) {
-            req.user.google = profile._json.emails[0].value;
+            req.user.google = primaryEmail;
             req.user.tokens.push({ kind: 'google', accessToken });
             req.user.verified = User.EmailConfirmation().Verified;
           }
           await req.user.save();
           return done(null, req.user);
         }
-        let username = profile._json.emails[0].value.split('@')[0];
+        let username = primaryEmail.split('@')[0];
         const existingEmailUser = await User.findByEmail(primaryEmail);
         const existingUsernameUser = await User.findByUsername(username, {
           caseInsensitive: true
@@ -285,7 +305,7 @@ passport.use(
             return done(null, false, { msg: accountSuspensionMessage });
           }
           existingEmailUser.email = existingEmailUser.email || primaryEmail;
-          existingEmailUser.google = profile._json.emails[0].value;
+          existingEmailUser.google = primaryEmail;
           existingEmailUser.username = existingEmailUser.username || username;
           existingEmailUser.tokens.push({
             kind: 'google',
@@ -301,7 +321,7 @@ passport.use(
 
         const user = new User();
         user.email = primaryEmail;
-        user.google = profile._json.emails[0].value;
+        user.google = primaryEmail;
         user.username = username;
         user.tokens.push({ kind: 'google', accessToken });
         user.name = profile._json.displayName;

server/config/passport.js

@@ -149,7 +149,8 @@ export async function copyObjectInS3RequestHandler(req, res) {
     const newUrl = await copyObjectInS3(url, req.user.id);
     res.json({ url: newUrl });
   } catch (error) {
-    res.status(500).json({ error: error.message });
+    console.error('Error copying object in S3:', error.message);
+    res.status(500).json({ error: 'Internal server error' });
   }
 }
 

server/controllers/aws.controller.js

@@ -523,7 +523,7 @@ describe('user.controller > auth management > updateSettings (email, username, p
 
   describe('and when there is any other error', () => {
     beforeEach(async () => {
-      User.findById = jest.fn().mockRejectedValue('db error');
+      User.findById = jest.fn().mockRejectedValue('Internal server error');
       requestBody = minimumValidRequest;
       request.setBody(requestBody);
       await updateSettings(
@@ -534,7 +534,9 @@ describe('user.controller > auth management > updateSettings (email, username, p
     });
     it('returns a 500 error', () => {
       expect(response.status).toHaveBeenCalledWith(500);
-      expect(response.json).toHaveBeenCalledWith({ error: 'db error' });
+      expect(response.json).toHaveBeenCalledWith({
+        error: 'Internal server error'
+      });
     });
   });
 });

server/controllers/user.controller/__tests__/authManagement/updateSettings.test.ts

@@ -87,7 +87,7 @@ describe('user.controller > helpers', () => {
       );
       expect(response.status).toHaveBeenCalledWith(500);
       expect(response.json).toHaveBeenCalledWith({
-        error: 'async error'
+        error: 'Internal server error'
       });
     });
   });