chore: LinkedIn custom OAuth

apps/meteor/app/custom-oauth/server/customOAuth.ts

@@ -65,7 +65,7 @@ export class CustomOAuthStrategy extends Strategy {
 			clientSecret: config.clientSecret,
 			callbackURL: `${settings.get<string>('Site_Url')}/oauth/${name}/callback`,
 			state: true,
-			pkce: true,
+			pkce: config.pkce ?? true,
 			scope: config.scope,
 		};
 

apps/meteor/app/linkedin/server/index.ts

@@ -0,0 +1 @@
+import './lib';

apps/meteor/app/linkedin/server/lib.ts

@@ -0,0 +1,48 @@
+import type { OAuthConfiguration } from '@rocket.chat/core-typings';
+import { Meteor } from 'meteor/meteor';
+import passport from 'passport';
+
+import { addPassportCustomOAuth } from '../../../server/lib/oauth/addPassportCustomOAuth';
+import { settings } from '../../settings/server';
+
+const config: Partial<OAuthConfiguration> = {
+	serverURL: 'https://www.linkedin.com',
+	authorizePath: '/oauth/v2/authorization',
+	tokenPath: '/oauth/v2/accessToken',
+	identityPath: 'https://api.linkedin.com/v2/userinfo',
+	scope: 'openid email profile',
+	tokenSentVia: 'header',
+	addAutopublishFields: {
+		forLoggedInUser: ['services.linkedin'],
+		forOtherUsers: ['services.linkedin.name'],
+	},
+	pkce: false,
+	emailField: 'email',
+};
+
+const serviceKey = 'linkedin';
+
+const configureLinkedInOAuth = (): void => {
+	passport.unuse(serviceKey);
+
+	const enabled = settings.get<boolean>('Accounts_OAuth_Linkedin');
+	if (!enabled) {
+		return;
+	}
+
+	const clientId = settings.get<string>('Accounts_OAuth_Linkedin_id');
+	const clientSecret = settings.get<string>('Accounts_OAuth_Linkedin_secret');
+
+	if (!clientId || !clientSecret) {
+		return;
+	}
+
+	addPassportCustomOAuth(serviceKey, { ...config, clientId, clientSecret });
+};
+
+Meteor.startup(() => {
+	settings.watchMultiple(
+		['Accounts_OAuth_Linkedin', 'Accounts_OAuth_Linkedin_id', 'Accounts_OAuth_Linkedin_secret'],
+		configureLinkedInOAuth,
+	);
+});

apps/meteor/server/configuration/accounts_meld.js

@@ -18,10 +18,6 @@ export async function configureAccounts() {
 			}
 		}
 
-		if (serviceName === 'linkedin') {
-			serviceData.email = serviceData.emailAddress;
-		}
-
 		if (serviceData.email) {
 			const user = await Users.findOneByEmailAddress(serviceData.email);
 			if (user != null && user.services?.[serviceName]?.id !== serviceData.id) {

apps/meteor/server/importPackages.ts

@@ -33,6 +33,7 @@ import '../app/importer-slack-users/server';
 import '../app/integrations/server';
 import '../app/irc/server';
 import '../app/lib/server';
+import '../app/linkedin/server';
 import '../app/token-login/server';
 import '../app/mailer/server/api';
 import '../app/markdown/server';

packages/core-typings/src/ILoginServiceConfiguration.ts

@@ -38,6 +38,7 @@ export type OAuthConfiguration = {
 		forLoggedInUser: string[];
 		forOtherUsers: string[];
 	};
+	pkce?: boolean;
 };
 
 export type FacebookOAuthConfiguration = Omit<Partial<OAuthConfiguration>, 'clientId'> & {