Skip to content

fix: Atlassian Crowd authorization #30898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
paulloft wants to merge 2 commits into from
Closed

fix: Atlassian Crowd authorization #30898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24f0512
Resolves #29285
Nov 8, 2023
53dc23c
fix ping
Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions apps/meteor/app/crowd/server/crowd.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,18 @@ export class CROWD {
};

this.crowdClient = new AtlassianCrowd(this.options);
this.crowdClient.user.authenticateSync = Meteor.wrapAsync(this.crowdClient.user.authenticate, this);
this.crowdClient.user.findSync = Meteor.wrapAsync(this.crowdClient.user.find, this);
this.crowdClient.searchSync = Meteor.wrapAsync(this.crowdClient.search, this);
this.crowdClient.pingSync = Meteor.wrapAsync(this.crowdClient.ping, this);
}

async checkConnection() {
await this.crowdClient.ping();
this.crowdClient.pingSync();
}

async fetchCrowdUser(crowdUsername: string) {
const userResponse = await this.crowdClient.user.find(crowdUsername);
fetchCrowdUser(crowdUsername: string) {
const userResponse = this.crowdClient.user.findSync(crowdUsername);

return {
displayname: userResponse['display-name'],
Expand Down Expand Up @@ -134,13 +138,13 @@ export class CROWD {
logger.debug('New user. User is not synced yet.');
}
logger.debug('Going to crowd:', crowdUsername);
const auth = await this.crowdClient.user.authenticate(crowdUsername, password);
const auth = this.crowdClient.user.authenticateSync(crowdUsername, password);

if (!auth) {
return;
}

const crowdUser: Record<string, any> = await this.fetchCrowdUser(crowdUsername);
const crowdUser: Record<string, any> = this.fetchCrowdUser(crowdUsername);

if (user && settings.get('CROWD_Allow_Custom_Username') === true) {
crowdUser.username = user.username;
Expand Down Expand Up @@ -211,7 +215,7 @@ export class CROWD {
let crowdUser = null;

try {
crowdUser = await this.fetchCrowdUser(crowdUsername);
crowdUser = this.fetchCrowdUser(crowdUsername);
} catch (err) {
logger.debug({ err });
logger.error({ msg: 'Could not sync user with username', crowd_username: crowdUsername });
Expand All @@ -238,7 +242,7 @@ export class CROWD {
continue;
}

crowdUser = await this.fetchCrowdUser(crowdUsername);
crowdUser = this.fetchCrowdUser(crowdUsername);
}

if (settings.get('CROWD_Allow_Custom_Username') === true) {
Expand Down