Revert "Add state to the workflow" (#303)

* Revert "Use nanoid instead of cuid for oauth code (#302)"

This reverts commit 7a64814.

* Revert "Add state to the workflow (#301)"

This reverts commit 764992d.

Author: DanielBrierton

nodebb-api.js

@@ -1,12 +1,7 @@
 'use strict';
 
 var querystring = require('querystring');
-var http;
-if (process.env.NODE_ENV !== 'production') {
-  http = require('http');
-} else {
-  http = require('https');
-}
+var http = require('https');
 var _ = require('lodash');
 var util = require('util');
 
@@ -42,7 +37,6 @@ module.exports = function (options) {
       path: base_path + 'users/' + target_user + '/external?' + qs
     }, function (err, res) {
       if (err) return handleErr(err, done);
-      if (!res.payload) return handleErr(new Error('unexpected error: ' + target_user + res), done);
       if (!res.payload.uid) return handleErr(new Error('user not found: ' + target_user), done);
       done(null, res.payload.uid);
     });
@@ -62,10 +56,8 @@ module.exports = function (options) {
       //   email: '[email protected]'
       // });
 
-      var payload = { username: data.alias ? data.alias : data.name, uid: uid, email: data.email };
-      if (data.uploadedpicture) payload.uploadedpicture = data.uploadedpicture;
-      if (data.picture) payload.picture = data.picture;
-      data = querystring.stringify(payload);
+      data = querystring.stringify(data);
+
       sendReq({
         path: base_path + 'users/' + target_user + '?_uid=' + querying_user,
         method: 'PUT',

oauth2.js

@@ -138,8 +138,7 @@ module.exports = function (options) {
           if (!args.user) {
             return done(null, {
               http$: {
-                // Redirect to the start of the flow, get a new code + crsf token
-                redirect: '/login?referer=' + encodeURIComponent(process.env.ADULT_FORUM + '/auth/CoderDojo')
+                redirect: '/login?redirect=' + args.redirect_uri
               }
             });
           } else {
@@ -152,7 +151,7 @@ module.exports = function (options) {
           if (err) return done(null, {error: err, http$: {status: 500}});
           done(null, {
             http$: {
-              redirect: args.redirect_uri + '?code=' + code + '&state=' + args.state
+              redirect: args.redirect_uri + '?code=' + code
             }
           });
         });

profiles.js

@@ -557,8 +557,8 @@ module.exports = function (options) {
                   var forumProfile = _.clone(profile);
                   forumProfile.username = forumProfile.name;
 
-                  forumProfile.uploadedpicture = protocol + '://' + hostname + '/api/2.0/profiles/' + profile.id + '/avatar_img';
-                  forumProfile.picture = protocol + '://' + hostname + '/api/2.0/profiles/' + profile.id + '/avatar_img';
+                  forumProfile.uploadedpicture = protocol + '://' + hostname + '/api/1.0/profiles/' + profile.id + '/avatar_img';
+                  forumProfile.picture = protocol + '://' + hostname + '/api/1.0/profiles/' + profile.id + '/avatar_img';
 
                   seneca.act({role: 'cd-nodebb-api', cmd: 'update', user: forumProfile, id: forumProfile.userId}, function (err, res) {
                     if (err) seneca.log.error(err);