Skip to content

chore: Passport Drupal OAuth #40610

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

Merged
yash-rajpal merged 1 commit into from
May 19, 2026
+28 −12
Merged

chore: Passport Drupal OAuth #40610

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 28 additions & 12 deletions apps/meteor/app/drupal/server/lib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import type { OauthConfig } from '@rocket.chat/core-typings';
import type { OAuthConfiguration } from '@rocket.chat/core-typings';
import { Meteor } from 'meteor/meteor';
import passport from 'passport';
import _ from 'underscore';

import { CustomOAuth } from '../../custom-oauth/server/custom_oauth_server';
import { addPassportCustomOAuth } from '../../../server/lib/oauth/addPassportCustomOAuth';
import { settings } from '../../settings/server';

// Drupal Server CallBack URL needs to be http(s)://{rocketchat.server}[:port]/_oauth/drupal
// In RocketChat -> Administration the URL needs to be http(s)://{drupal.server}/

const config: OauthConfig = {
serverURL: '',
const config: Partial<OAuthConfiguration> = {
identityPath: '/oauth2/UserInfo',
authorizePath: '/oauth2/authorize',
tokenPath: '/oauth2/token',
Expand All @@ -23,11 +21,29 @@ const config: OauthConfig = {
accessTokenParam: 'access_token',
};

const Drupal = new CustomOAuth('drupal', config);
const configureDrupalOAuth = () => {
passport.unuse('drupal');
const enabled = settings.get<boolean>('Accounts_OAuth_Drupal');
if (!enabled) {
return;
}

const serverURL = settings.get<string>('API_Drupal_URL').trim().replace(/\/*$/, '');
Comment thread
yash-rajpal marked this conversation as resolved.
const clientId = settings.get<string>('Accounts_OAuth_Drupal_id');
const clientSecret = settings.get<string>('Accounts_OAuth_Drupal_secret');

if (!clientId || !clientSecret || !serverURL) {
return;
}

addPassportCustomOAuth('drupal', { ...config, serverURL, clientId, clientSecret });
};

Meteor.startup(() => {
settings.watch<string>('API_Drupal_URL', (value) => {
config.serverURL = value;
Drupal.configure(config);
});
const updateConfig = _.debounce(configureDrupalOAuth, 300);

settings.watchMultiple(
['Accounts_OAuth_Drupal', 'API_Drupal_URL', 'Accounts_OAuth_Drupal_id', 'Accounts_OAuth_Drupal_secret'],
updateConfig,
);
});
Loading