Skip to content

fix: Atlassian Crowd integration doesn't work - #31391

Merged
kodiakhq[bot] merged 10 commits into
developfrom
fix/crowd-integration
Jan 12, 2024
Merged

fix: Atlassian Crowd integration doesn't work#31391
kodiakhq[bot] merged 10 commits into
developfrom
fix/crowd-integration

Conversation

@matheusbsilva137

@matheusbsilva137 matheusbsilva137 commented Jan 5, 2024

Copy link
Copy Markdown
Contributor

Proposed changes (including videos or screenshots)

  • Fix atlassian-crowd-patched package usage. It does not work as async, so we should use its functions' callback params instead in order to retrieve its results;
  • Fix "LDAP Connection Successful" toast message being displayed incorrectly when testing Atlassian Crowd connection;
  • Fix login page authentication errors not being displayed when Atlassian Crowd integration is enabled;
  • Link Crowd user to RC by username or email on authentication (when id is not provided by Atlassian Crowd).

Issue(s)

Fixes #29285
Fixes #30932

Steps to test or reproduce

Further comments

Introduced by #28680
SUP-418

@changeset-bot

changeset-bot Bot commented Jan 5, 2024

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 40e17bd

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 30 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@codecov

codecov Bot commented Jan 5, 2024

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (2f8c98f) 49.58% compared to head (40e17bd) 59.86%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##           develop   #31391       +/-   ##
============================================
+ Coverage    49.58%   59.86%   +10.27%     
============================================
  Files         3311     1795     -1516     
  Lines        81396    34929    -46467     
  Branches     16696     7273     -9423     
============================================
- Hits         40361    20909    -19452     
+ Misses       36330    12410    -23920     
+ Partials      4705     1610     -3095     
Flag Coverage Δ
e2e 53.18% <ø> (+0.02%) ⬆️
e2e-api ?
unit 76.54% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

@matheusbsilva137
matheusbsilva137 marked this pull request as ready for review January 5, 2024 23:27
tapiarafael
tapiarafael previously approved these changes Jan 9, 2024

@matheusbsilva137 matheusbsilva137 left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found and fixed another issue with our Atlassian Crowd integration. This new crowd package doesn't always return users' ids on authentication (which were expected on our side), so we'd never consider a crowd authenticated user as new. That's because we'd apply a mongo filter such as _id: undefined, which could return any user -- so they'd instead take over someone else's account in the workspace 😬
I've added a new fallback for this case by linking a crowd authenticated user to a RC user by crowd_username or email.
Thanks @janainaCoelhoRocketchat for noticing that

@dionisio-bot dionisio-bot Bot added the stat: ready to merge PR tested and approved waiting for merge label Jan 12, 2024
@dionisio-bot dionisio-bot Bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jan 12, 2024
@kodiakhq
kodiakhq Bot merged commit 1499e89 into develop Jan 12, 2024
@kodiakhq
kodiakhq Bot deleted the fix/crowd-integration branch January 12, 2024 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

stat: ready to merge PR tested and approved waiting for merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Can't integrate with Crowd 6.2.1: Atlassian Crowd Login broken

4 participants