format the code by review

Author: yihong0618

lib/config.js

@@ -31,24 +31,42 @@ const DEFAULT_CONFIG = {
       'swift'
     ],
     urls: {
-      base:            'https://leetcode.com',
-      graphql:         'https://leetcode.com/graphql',
-      login:           'https://leetcode.com/accounts/login/',
-      // third part login base urls. TODO facebook google 
-      github_login:    'https://leetcode.com/accounts/github/login/?next=%2F',
-      facebook_login:  'https://leetcode.com/accounts/facebook/login/?next=%2F',
-      linkedin_login:  'https://leetcode.com/accounts/linkedin_oauth2/login/?next=%2F',
-      problems:        'https://leetcode.com/api/problems/$category/',
-      problem:         'https://leetcode.com/problems/$slug/description/',
-      test:            'https://leetcode.com/problems/$slug/interpret_solution/',
-      session:         'https://leetcode.com/session/',
-      submit:          'https://leetcode.com/problems/$slug/submit/',
-      submissions:     'https://leetcode.com/api/submissions/$slug',
-      submission:      'https://leetcode.com/submissions/detail/$id/',
-      verify:          'https://leetcode.com/submissions/detail/$id/check/',
-      favorites:       'https://leetcode.com/list/api/questions',
-      favorite_delete: 'https://leetcode.com/list/api/questions/$hash/$id',
-      plugin:          'https://raw.githubusercontent.com/leetcode-tools/leetcode-cli-plugins/master/plugins/$name.js'
+      // base urls
+      base:                      'https://leetcode.com',
+      graphql:                   'https://leetcode.com/graphql',
+      login:                     'https://leetcode.com/accounts/login/',
+      // third part login base urls. TODO facebook google
+      github_login:              'https://leetcode.com/accounts/github/login/?next=%2F',
+      facebook_login:            'https://leetcode.com/accounts/facebook/login/?next=%2F',
+      linkedin_login:            'https://leetcode.com/accounts/linkedin_oauth2/login/?next=%2F',
+      // redirect urls
+      leetcode_redirect:         'https://leetcode.com/',
+      github_tf_redirect:        'https://github.com/sessions/two-factor',
+      // simulate login urls
+      github_login_request:      'https://github.com/login',
+      github_session_request:    'https://github.com/session',
+      github_tf_session_request: 'https://github.com/sessions/two-factor',
+      linkedin_login_request:    'https://www.linkedin.com',
+      linkedin_session_request:  'https://www.linkedin.com/uas/login-submit',
+      // questions urls
+      problems:                  'https://leetcode.com/api/problems/$category/',
+      problem:                   'https://leetcode.com/problems/$slug/description/',
+      test:                      'https://leetcode.com/problems/$slug/interpret_solution/',
+      session:                   'https://leetcode.com/session/',
+      submit:                    'https://leetcode.com/problems/$slug/submit/',
+      submissions:               'https://leetcode.com/api/submissions/$slug',
+      submission:                'https://leetcode.com/submissions/detail/$id/',
+      verify:                    'https://leetcode.com/submissions/detail/$id/check/',
+      favorites:                 'https://leetcode.com/list/api/questions',
+      favorite_delete:           'https://leetcode.com/list/api/questions/$hash/$id',
+      plugin:                    'https://raw.githubusercontent.com/leetcode-tools/leetcode-cli-plugins/master/plugins/$name.js'
+    },
+    // login methods enum
+    login_methods: {
+      LeetCode: 'LeetCode',
+      Cookie:   'Cookie',
+      GitHub:   'Github',
+      LinkedIn: 'LinkedIn'
     }
   },
 

lib/plugins/leetcode.js

@@ -555,8 +555,8 @@ function parseCookie(cookie, cb) {
 function requestLeetcodeAndSave(request, leetcodeUrl, user, cb, party) {
   request.get({url: leetcodeUrl}, function(e, resp, body) {
     const redirectUri = resp.request.uri.href;
-    if (redirectUri !== 'https://leetcode.com/') {
-      return cb(`${party} login failed or ${party} did not link to LeetCode`);
+    if (redirectUri !== config.sys.urls.leetcode_redirect) {
+      return cb(`${party} login failed or ${party} did not connect to LeetCode`);
     }
     const cookieData = parseCookie(resp.request.headers.cookie, cb);
     user.sessionId = cookieData.sessionId;
@@ -575,15 +575,16 @@ plugin.cookieLogin = function(user, cb) {
 };
 
 plugin.githubLogin = function(user, cb) {
-  const leetcodeUrl = config.sys.urls.github_login;
+  const urls = config.sys.urls
+  const leetcodeUrl = urls.github_login;
   const _request = request.defaults({jar: true});
-  _request('https://github.com/login', function(e, resp, body) {
+  _request(urls.github_login_request, function(e, resp, body) {
     const authenticityToken = body.match(/name="authenticity_token" value="(.*?)"/);
     if (authenticityToken === null) {
       return cb('Get GitHub token failed');
     }
     const options = {
-      url:     'https://github.com/session',
+      url:     urls.github_session_request,
       method:  'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -601,16 +602,16 @@ plugin.githubLogin = function(user, cb) {
       if (resp.statusCode !== 200) {
         return cb('GitHub login failed');
       }
-      if (resp.request.uri.href == 'https://github.com/sessions/two-factor') {
-        cb('Your Github are using two-factor authentication');
+      if (resp.request.uri.href === urls.github_tf_redirect) {
+        cb('Your GitHub are using two-factor authentication');
         // read two-factor code must be sync.
         const twoFactorcode = require('prompt-sync')()('Please enter your two-factor code: ');
         const authenticityTokenTwoFactor = body.match(/name="authenticity_token" value="(.*?)"/);
         if (authenticityTokenTwoFactor === null) {
           return cb('Get GitHub two-factor token failed');
         }
         const optionsTwoFactor = {
-          url:     'https://github.com/sessions/two-factor',
+          url:     urls.github_tf_session_request,
           method:  'POST',
           headers: {
             'Content-Type': 'application/x-www-form-urlencoded',
@@ -623,27 +624,28 @@ plugin.githubLogin = function(user, cb) {
           },
         };
         _request(optionsTwoFactor, function(e, resp, body) {
-          if (resp.request.uri.href === 'https://github.com/sessions/two-factor') {
-            return cb('Wrong two-factor code please check');
+          if (resp.request.uri.href === urls.github_tf_session_request) {
+            return cb('Invalid two-factor code please check');
           }
-          requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, 'GitHub');
+          requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, config.sys.login_methods.GitHub);
         });
       } else {
-        requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, 'GitHub');
+        requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, config.sys.login_methods.GitHub);
       }
     });
   });
 };
 
 plugin.linkedinLogin = function(user, cb) {
-  const leetcodeUrl = config.sys.urls.linkedin_login;
+  const urls = config.sys.urls
+  const leetcodeUrl = urls.linkedin_login;
   const _request = request.defaults({
     jar:     true,
     headers: {
       'User-Agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36'
     }
   });
-  _request('https://www.linkedin.com', function(e, resp, body) {
+  _request(urls.linkedin_login_request, function(e, resp, body) {
     if ( resp.statusCode !== 200) {
       return cb('Get LinkedIn session failed');
     }
@@ -652,7 +654,7 @@ plugin.linkedinLogin = function(user, cb) {
       return cb('Get LinkedIn token failed');
     }
     const options = {
-      url:     'https://www.linkedin.com/uas/login-submit',
+      url:     urls.linkedin_session_request,
       method:  'POST',
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
@@ -669,7 +671,7 @@ plugin.linkedinLogin = function(user, cb) {
       if (resp.statusCode !== 200) {
         return cb('LinkedIn login failed');
       }
-      requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, 'LinkedIn');
+      requestLeetcodeAndSave(_request, leetcodeUrl, user, cb, config.sys.login_methods.LinkedIn);
     });
   });
 };