junlelu
diff --git a/‎lib/config.js
Lines changed: 1 addition & 1 deletion b/‎lib/config.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/plugins/leetcode.js
Lines changed: 47 additions & 16 deletions b/‎lib/plugins/leetcode.js
Lines changed: 47 additions & 16 deletions
@@ -30,10 +30,10 @@ const DEFAULT_CONFIG = {
     ],
     urls: {
       base:            'https://leetcode.com',
+      graphql:         'https://leetcode.com/graphql',
       login:           'https://leetcode.com/accounts/login/',
       problems:        'https://leetcode.com/api/problems/$category/',
       problem:         'https://leetcode.com/problems/$slug/description/',
-      problem_detail:  'https://leetcode.com/graphql',
       test:            'https://leetcode.com/problems/$slug/interpret_solution/',
       session:         'https://leetcode.com/session/',
       submit:          'https://leetcode.com/problems/$slug/submit/',
 
@@ -91,10 +91,6 @@ plugin.getCategoryProblems = function(category, cb) {
       return cb(session.errors.EXPIRED);
     }
 
-    const user = session.getUser();
-    user.paid = json.is_paid;
-    session.saveUser(user);
-
     const problems = json.stat_status_pairs
         .filter(p => !p.stat.question__hide)
         .map(function(p) {
@@ -120,9 +116,9 @@ plugin.getCategoryProblems = function(category, cb) {
 plugin.getProblem = function(problem, cb) {
   log.debug('running leetcode.getProblem');
   const user = session.getUser();
-  //if (problem.locked && !user.paid) return cb('failed to load locked problem!');
+  if (problem.locked && !user.paid) return cb('failed to load locked problem!');
 
-  const opts = makeOpts(config.sys.urls.problem_detail);
+  const opts = makeOpts(config.sys.urls.graphql);
   opts.headers.Origin = config.sys.urls.base;
   opts.headers.Referer = problem.link;
 
@@ -373,7 +369,9 @@ plugin.getFavorites = function(cb) {
   log.debug('running leetcode.getFavorites');
   const opts = makeOpts(config.sys.urls.favorites);
 
+  const spin = h.spin('Retrieving user favorites');
   request(opts, function(e, resp, body) {
+    spin.stop();
     e = checkError(e, resp, 200);
     if (e) return cb(e);
 
@@ -382,6 +380,34 @@ plugin.getFavorites = function(cb) {
   });
 };
 
+plugin.getUser = function(cb) {
+  log.debug('running leetcode.getUser');
+  const opts = makeOpts(config.sys.urls.graphql);
+  opts.headers.Origin = config.sys.urls.base;
+  opts.headers.Referer = config.sys.urls.base;
+  opts.json = true;
+  opts.body = {
+    query: [
+      '{',
+      '  user {',
+      '    isCurrentUserPremium',
+      '  }',
+      '}'
+    ].join('\n'),
+    variables: {}
+  };
+
+  const spin = h.spin('Retrieving user profile');
+  request.post(opts, function(e, resp, body) {
+    spin.stop();
+    e = checkError(e, resp, 200);
+    if (e) return cb(e);
+
+    const user = body.data.user;
+    return cb(null, user);
+  });
+};
+
 function runSession(method, data, cb) {
   const opts = makeOpts(config.sys.urls.session);
   opts.json = true;
@@ -456,25 +482,30 @@ plugin.signin = function(user, cb) {
   });
 };
 
-plugin.getUser = function(user, cb) {
+plugin.initUser = function(user, cb) {
   plugin.getFavorites(function(e, favorites) {
-    if (e) return cb(e);
-
-    const favorite = favorites.favorites.private_favorites.find(function(f) {
-      return f.name === 'Favorite';
+    if (!e) {
+      const favorite = favorites.favorites.private_favorites.find(function(f) {
+        return f.name === 'Favorite';
+      });
+      user.hash = favorite.id_hash;
+      user.name = favorites.user_name;
+    }
+    plugin.getUser(function(e, _user) {
+      if (!e) {
+        user.paid = _user.isCurrentUserPremium;
+      }
+      session.saveUser(user);
+      return cb(null, user);
     });
-    user.hash = favorite.id_hash;
-    user.name = favorites.user_name;
-    session.saveUser(user);
-    return cb(null, user);
   });
 };
 
 plugin.login = function(user, cb) {
   log.debug('running leetcode.login');
   plugin.signin(user, function(e, user) {
     if (e) return cb(e);
-    plugin.getUser(user, cb);
+    plugin.initUser(user, cb);
   });
 };