-
- Downloads
feat: Add custom OAuth setting to allow merging users to others from distinct services (#28783)
* Merge OAuth users with existing users from distinct services when setting is enabled * Add changesets * Fix changesets * Apply requested changes --------- Co-authored-by:Diego Sampaio <chinello@gmail.com> Co-authored-by:
Rafael Tapia <rafael.tapia@rocket.chat> Co-authored-by:
kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> Co-authored-by:
Gabriel Casals <83978645+casalsgh@users.noreply.github.com>
Showing
- .changeset/dirty-singers-promise.md 6 additions, 0 deletions.changeset/dirty-singers-promise.md
- apps/meteor/app/custom-oauth/server/custom_oauth_server.js 7 additions, 2 deletionsapps/meteor/app/custom-oauth/server/custom_oauth_server.js
- apps/meteor/app/lib/server/functions/addOAuthService.ts 12 additions, 0 deletionsapps/meteor/app/lib/server/functions/addOAuthService.ts
- apps/meteor/app/lib/server/startup/oAuthServicesUpdate.js 3 additions, 0 deletionsapps/meteor/app/lib/server/startup/oAuthServicesUpdate.js
- apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json 2 additions, 0 deletionsapps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
- apps/meteor/server/startup/migrations/v300.ts 27 additions, 0 deletionsapps/meteor/server/startup/migrations/v300.ts
- packages/rest-typings/src/v1/settings.ts 1 addition, 0 deletionspackages/rest-typings/src/v1/settings.ts
Loading
Please register or sign in to comment