Feature#482 by moses-codes · Pull Request #564 · Together-100Devs/Together

moses-codes · 2025-06-16T23:31:17Z

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. Additionally, please include reasoning if tests have failed.

This PR includes several changes, including:

Expansion of Discord OAuth2 scopes to include 'guilds.members.read', in order to GET the server name of the current user (e.g. memberInfo.nick). Obtaining this information requires an additional fetch request
Provided initial values/fallbacks for the displayName value if global nor server nickname are available.
Tweaked the mock data in /server/test/unit/validateBodyBockData.js to provide a five minute buffer to event creation, in order to prevent race condition (the tests running successfully within one minute)
A recent push to main which removed the dotenv package (chore: remove dotenv #562) has broken one of the test suites. Jest used dotenv to read the .env variables, so the entire test suite in server/test/acceptance does not run as a result.

Type of change

Please select everything applicable. Please, do not delete any lines.

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to not work as expected)
This change requires a documentation update
This change requires an update to testing

Issue

Is this related to a specific issue? If so, please specify: closes Change displayName in OAuth strategy #482

Checklist:

This PR is up to date with the main branch, and merge conflicts have been resolved
I have executed npm run test and npm run test:e2e and all tests have passed successfully or I have included details within my PR on the failure.
I have executed npm run lint and resolved any outstanding errors. Most issues can be solved by executing npm run format
My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
My changes generate no new warnings

alcpereira

Thanks for this great contribution!

To finish this work, we need some tests on this feature. At least unit tests for the isolated logic of the naming fallback, and later some e2e tests once we fix the MOCK_USER discussion.

alcpereira · 2025-06-17T14:07:49Z

server/test/unit/validateBodyMockData.js

-  smallestUnit: "minute",
-  roundingMode: "ceil",
-});
+const timeNow = Temporal.Now.plainTimeISO()


Worth adding a comment here.

alcpereira · 2025-06-27T17:53:46Z

server/config/passport.js

-          profile.discriminator.length === 4
-            ? `${profile.username}#${profile.discriminator}`
-            : profile.username;
+        // console.log('Scopes:', currentReq);


I guess this is a leftover from development.

alcpereira · 2025-06-27T17:55:08Z

server/config/passport.js

+          console.log(error);
+          console.log("User guild name could not be found.");


Suggested change

console.log(error);

console.log("User guild name could not be found.");

console.log("User guild name could not be found with the error: ", error);

alcpereira · 2025-06-27T20:34:43Z

server/config/passport.js

+        );
+        const guildDisplayName = guildMember?.nick || profile.username;
+
+        console.log(guildDisplayName);


Suggested change

console.log(guildDisplayName);

alcpereira · 2025-06-27T20:34:58Z

server/config/passport.js

+          console.log("User guild name could not be found.");
+        }
+
+        const guildMember = profile.guilds.find(


Isn't it the same thing as is100Dever?

alcpereira · 2025-06-27T20:35:22Z

server/config/passport.js

+            }
+          );
+          const devMemberData = await devMemberInfo.json();
+          // console.log(devMemberData.nick, devMemberData.user)


Suggested change

// console.log(devMemberData.nick, devMemberData.user)

alcpereira · 2025-06-27T20:52:57Z

server/config/passport.js

-            : profile.username;
+        // console.log('Scopes:', currentReq);
+
+        let displayName = profile.global_name ?? profile.username;


I think we need to document this whole bit of code, or even move it to its own function.

If I understand correctly there are:

profile.global_name: Regular "Display Name" in Discord (My Accounts tab)

profile.username: Full Discord username (My Accounts tab)

devMemberData.nick: A specific Discord nickname for the server (Profiles > Per- server Profiles tab)

If the user is not from 100devs, we should not even fetch the endpoint users/@me/guilds/735923219315425401/member

Make it clear about the logic of the fallback, I guess it should be (Server nick > Display Name > User name).

Now that I think of it, this definitely needs documentation and tests!

alcpereira · 2025-06-27T20:54:08Z

server/config/passport.js

+          // console.log(devMemberData.nick, devMemberData.user)
+          if (devMemberData.nick) {
+            displayName = devMemberData.nick;
+          } else if (profile.discriminator.length === 4) {


This has been deprecated in 2024 (here). We can completely remove this bit of code.

bump packages that won't break production; removed package and updated files using said package

check if user is moderator, allow to delete any event API unit tests add verification of deleting to integration test add unit tests add unit test for non moderator to delete their own event add moderator to discord mocking clear db refactor: change cra to vite and monorepo setup typo: to have been called with add passport discord mocking to routes tests add is moderator flag to mocked moderator refactor for preventing non moderator deletion test refactors add moderator logic to passport add ismoderator flag to passport discord mocking flip moderator logic update tests Updated the landing page 'Contributing Together' portion. fix: callback auth path issue export responses from passport discord mocking passport call mock discord responses create test users in the tests map auth headers to database users passport discord mocking call directly again remove logs from events.js remove ismoderator flag from pasport discort mocking add frontend validation fix: remove spaces in .env.example keys add isModerator flag to mock user passport: set profile to false, remove update ismoderator status event modal: update variable name add comment to server/middleware/auth.js Co-authored-by: alcpereira <48070464+alcpereira@users.noreply.github.com> remove bla bla

This reverts commit 4d3c947.

Add trust proxy setting to enable HTTPS detection behidn Fly.io proxy. Fixes issue Together-100Devs#466

This reverts commit d40983b which had reverted the original cookie max age feature. The cookie max age functionality is needed for proper session management. Addresses issue Together-100Devs#599

add intelagense to codeowners

move the help text from the wiki to the docs

Delete client/src/setupProxy.js Added title and aria-label attributes to CalendarHeader.jsx Revert "Added title and aria-label attributes to CalendarHeader.jsx" This reverts commit 39c52a6. client/src/features/calendarHeader/CalendarHeader.jsx reverted adding title/aria-label attributes to calendarHeader.jsx Remove http-proxy-middleware from client and update codebase Undo title and aria-label changes for CalendarHeader.jsx

Complete requested changes Edit Discord 0Auth2 Docs Edit Discord 0Auth2 Docs Fixed button screenshot Trying to get image to load correctly Finish Discord 0Auth2 Setup instructions Note to check login Fix redirect button image Fix localhost link

made sure that only title will be visible for mobile with truncate and ellapsis

changes Co-authored-by: Devin Lane <devin.c.lane@gmail.com>

changed constant for reccurring days destructured constant coreectly adjusted e2e test createform changed note text on form regardding recurring events cleaned up variable names and xport of constants removed empty space added JSDOC to constants.js feature 531 corrected JSDOC implementation

fixed Together-100Devs#643

…into feature#482

DevinCLane · 2025-09-25T18:45:18Z

This conversation has moved over to #658, so i'm closing this PR

feat: add server display name logic

7f26325

moses-codes force-pushed the feature#482 branch from b89677c to 7f26325 Compare June 25, 2025 18:51

alcpereira requested changes Jun 27, 2025

View reviewed changes

emmebravo and others added 23 commits June 30, 2025 12:39

build: bump packages

dfd3361

bump packages that won't break production; removed package and updated files using said package

chore: upgrade tailwind from v3 to v4

da50ac4

test: fix missing env variable for backend test

1aa2ba2

build: update cypress to latest version

8df61fb

added comments + removed redundant code

455c254

moved server name logic into separate function

e930a98

feat: set cookie with 7 day max age

4d3c947

added testcase for "nick" property

9eb5777

chore: change root package name to lowercase

89a7d24

setup fly.io automatic deploys with github actions

1db9501

Revert "feat: set cookie with 7 day max age"

d40983b

This reverts commit 4d3c947.

Fix: Discord OAuth redirect issue

b8d327b

Add trust proxy setting to enable HTTPS detection behidn Fly.io proxy. Fixes issue Together-100Devs#466

add codeowners file

f4c3518

feat: restore cookie with 7 day max age

5aede3e

This reverts commit d40983b which had reverted the original cookie max age feature. The cookie max age functionality is needed for proper session management. Addresses issue Together-100Devs#599

Update CODEOWNERS with eric

2dc56e5

add intelagense to codeowners

fix: capitalize 'D' in all instances of 100Devs Together-100Devs#604

6289b57

fixed a tringy

f01a530

chore: update packages versions that are vulnerable

f449366

docs: move to the main repo

b36d3c3

move the help text from the wiki to the docs

docs: fix broken links after move

1d542ee

tests for no nick property, no server data

88013e2

moses-codes requested review from DevinCLane, emmebravo, funbunch and merrua as code owners August 12, 2025 18:42

moses-codes requested a review from intelagense as a code owner August 12, 2025 18:42

adel-abdulazeem and others added 15 commits August 12, 2025 13:12

fix: typo WelcomUserModel comp Cant => Can't

1cadae9

feat(ui): add cursor pointer and hover effects to all buttons

6552a3a

Edit Discord 0Auth2 Docs

65da49a

Complete requested changes Edit Discord 0Auth2 Docs Edit Discord 0Auth2 Docs Fixed button screenshot Trying to get image to load correctly Finish Discord 0Auth2 Setup instructions Note to check login Fix redirect button image Fix localhost link

added contributing guidelines to readme

16f0001

Bugfix | Issue - 550 | Added mobile first styles for the application and

983d944

made sure that only title will be visible for mobile with truncate and ellapsis

doc/editing 03 development process

3699aee

changes Co-authored-by: Devin Lane <devin.c.lane@gmail.com>

Remove broken cyclic button from README

9f8a46d

fixed Together-100Devs#643

feat: add server display name logic

ac41504

added comments + removed redundant code

7f8b15f

moved server name logic into separate function

ed43d9c

added testcase for "nick" property

250c4e0

tests for no nick property, no server data

9c0a2ef

Merge branch 'feature#482' of https://github.com/moses-codes/Together …

771e860

…into feature#482

adjusted logic to fit proper user flow

07c6da6

moses-codes mentioned this pull request Sep 25, 2025

feat: check for server nickname property #658

Open

13 tasks

DevinCLane closed this Sep 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature#482#564

Feature#482#564
moses-codes wants to merge 39 commits intoTogether-100Devs:mainfrom
moses-codes:feature#482

moses-codes commented Jun 16, 2025

Uh oh!

alcpereira left a comment

Uh oh!

alcpereira Jun 17, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

alcpereira Jun 27, 2025

Uh oh!

DevinCLane commented Sep 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants

		console.log(error);
		console.log("User guild name could not be found.");

Conversation

moses-codes commented Jun 16, 2025

Description

Type of change

Issue

Checklist:

Uh oh!

alcpereira left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DevinCLane commented Sep 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

18 participants