Просмотр исходного кода

Merge pull request #1972 from overleaf/jel-remove-oauth-email-settings-check

Remove oauthFallback check for OAuth emails

GitOrigin-RevId: 85b7e007df0c48212cca98f5253c588e9f39802a
Jessica Lawshe 7 лет назад
Родитель
Сommit
e33ad09802
1 измененных файлов с 18 добавлено и 26 удалено
  1. 18 26
      services/web/app/src/Features/User/ThirdPartyIdentityManager.js

+ 18 - 26
services/web/app/src/Features/User/ThirdPartyIdentityManager.js

@@ -115,20 +115,16 @@ const ThirdPartyIdentityManager = (module.exports = {
             to: res.email,
             provider: oauthProviders[providerId].name
           }
-          if (settings.oauthFallback) {
-            return callback(null, res)
-          } else {
-            EmailHandler.sendEmail(
-              'emailThirdPartyIdentifierLinked',
-              emailOptions,
-              error => {
-                if (error != null) {
-                  logger.warn(error)
-                }
-                return callback(null, res)
+          EmailHandler.sendEmail(
+            'emailThirdPartyIdentifierLinked',
+            emailOptions,
+            error => {
+              if (error != null) {
+                logger.warn(error)
               }
-            )
-          }
+              return callback(null, res)
+            }
+          )
         } else if (retry) {
           // if already retried then throw error
           callback(new Error('update failed'))
@@ -181,20 +177,16 @@ const ThirdPartyIdentityManager = (module.exports = {
             to: res.email,
             provider: oauthProviders[providerId].name
           }
-          if (settings.oauthFallback) {
-            return callback(null, res)
-          } else {
-            EmailHandler.sendEmail(
-              'emailThirdPartyIdentifierUnlinked',
-              emailOptions,
-              error => {
-                if (error != null) {
-                  logger.warn(error)
-                }
-                return callback(null, res)
+          EmailHandler.sendEmail(
+            'emailThirdPartyIdentifierUnlinked',
+            emailOptions,
+            error => {
+              if (error != null) {
+                logger.warn(error)
               }
-            )
-          }
+              return callback(null, res)
+            }
+          )
         }
       }
     )