Merge branch 'develop' into multitenancy

Author: walker-sean

src/backend/src/services/users.services.ts

@@ -234,12 +234,16 @@ export default class UsersService {
       const firstName = payload['given_name'] ?? payload['email']!.split('@')[0]; // Defaults to id of email
       const lastName = payload['family_name'] ?? ''; // Defaults to no last name
 
+      const nonHuskyEmail = payload['email']!.includes('@husky.neu.edu')
+        ? payload['email'].replace(/@husky\.neu\.edu/i, '@northeastern.edu')
+        : payload['email'];
+
       const createdUser = await prisma.user.create({
         data: {
           firstName,
           lastName,
           googleAuthId: userId,
-          email: payload['email'],
+          email: nonHuskyEmail,
           emailId,
           userSettings: { create: {} }
         },