Browse Source

deleted email and lanaguage param in findOrRegister

sou 7 years ago
parent
commit
e8cc78fb7e
2 changed files with 3 additions and 19 deletions
  1. 2 2
      lib/models/external-account.js
  2. 1 17
      lib/routes/login-passport.js

+ 2 - 2
lib/models/external-account.js

@@ -68,7 +68,7 @@ class ExternalAccount {
    * @returns {Promise<ExternalAccount>}
    * @returns {Promise<ExternalAccount>}
    * @memberof ExternalAccount
    * @memberof ExternalAccount
    */
    */
-  static findOrRegister(providerType, accountId, usernameToBeRegistered, nameToBeRegistered, email, language) {
+  static findOrRegister(providerType, accountId, usernameToBeRegistered, nameToBeRegistered) {
 
 
     return this.findOne({ providerType, accountId })
     return this.findOne({ providerType, accountId })
       .then(account => {
       .then(account => {
@@ -92,7 +92,7 @@ class ExternalAccount {
 
 
             // create a new User with STATUS_ACTIVE
             // create a new User with STATUS_ACTIVE
             debug(`ExternalAccount '${accountId}' is not found, it is going to be registered.`);
             debug(`ExternalAccount '${accountId}' is not found, it is going to be registered.`);
-            return User.createUser(nameToBeRegistered, usernameToBeRegistered, email, undefined, language, User.STATUS_ACTIVE);
+            return User.createUser(nameToBeRegistered, usernameToBeRegistered, undefined, undefined, undefined, User.STATUS_ACTIVE);
           })
           })
           .then(newUser => {
           .then(newUser => {
             return this.associate(providerType, accountId, newUser);
             return this.associate(providerType, accountId, newUser);

+ 1 - 17
lib/routes/login-passport.js

@@ -256,9 +256,7 @@ module.exports = function(crowi, app) {
         'google',
         'google',
         response.id,
         response.id,
         response.displayName,
         response.displayName,
-        `${response.name.givenName} ${response.name.familyName}`,
-        response.emails[0].value,
-        googleLanguageCodeConverter(response.language)
+        `${response.name.givenName} ${response.name.familyName}`
       )
       )
       .catch((err) => {
       .catch((err) => {
         throw err;
         throw err;
@@ -280,20 +278,6 @@ module.exports = function(crowi, app) {
     })(req, res, next);
     })(req, res, next);
   };
   };
 
 
-  /**
-   * converts google language code to growi language code
-   * add more languages as growi supports them
-   * reference: https://developers.google.com/admin-sdk/directory/v1/languages
-   * @param {*} googleLanguageCode
-   */
-  const googleLanguageCodeConverter = googleLanguageCode => {
-    let languageCode = googleLanguageCode;
-    if (googleLanguageCode !== 'ja') {
-      languageCode = 'en-US';
-    }
-    return languageCode;
-  };
-
   return {
   return {
     loginFailure,
     loginFailure,
     loginWithLdap,
     loginWithLdap,