Merge pull request #1472 from CoderDojo/Fix-register-path

Add force_signup param to register path

Author: ChristinaVoss

web/controllers/rpi/index.js

@@ -6,7 +6,6 @@ const Boom = require('boom');
 const { URLSearchParams } = require('url');
 const {
   getRedirectUri,
-  getRegisterRedirectUri,
   getEditRedirectUri,
   getLogoutRedirectUri,
   getIdToken,
@@ -26,9 +25,7 @@ function getErrorRedirectUrl(message = oauthErrorMessage) {
   return `/?${errorUrlQueryParams}`;
 }
 
-function handleRPILogin(request, reply) {
-  let redirectQueryParams = {};
-  if (request.query.mgrt) redirectQueryParams = { mgrt: request.query.mgrt };
+function handleRPILogin(request, reply, redirectQueryParams = {}) {
   const state = crypto.randomBytes(20).toString('hex');
   setRpiStateCookie(reply, { state });
   const redirectUri = getRedirectUri(state, redirectQueryParams);
@@ -57,8 +54,8 @@ function handleRPIRegister(request, reply) {
   if (session && session.token) {
     return reply.redirect('/');
   }
-  const redirectUri = getRegisterRedirectUri();
-  reply.redirect(redirectUri);
+
+  handleRPILogin(request, reply, { login_options: 'force_signup' })
 }
 
 function handleRPIEdit(request, reply) {

web/lib/rpi-auth.js

@@ -12,7 +12,6 @@ const rpiZenAccountPassword = process.env.RPI_ZEN_ACCOUNT_PWORD;
 
 const profileOauthPath = '/oauth2/auth';
 const profileTokenPath = '/oauth2/token';
-const profileSignupPath = '/signup';
 const profileEditPath = '/profile/edit';
 const logoutPath = '/logout';
 const loginPath = '/login';
@@ -42,13 +41,6 @@ function getLogoutRedirectUri() {
   return `${profileServer}${logoutPath}?${params}`;
 }
 
-function getRegisterRedirectUri() {
-  const params = new URLSearchParams();
-  params.set('brand', brand);
-  params.set('returnTo', `${homeServer}${loginPath}`);
-  return `${profileServer}${profileSignupPath}?${params}`;
-}
-
 function getEditRedirectUri() {
   const params = new URLSearchParams();
   params.set('brand', brand);
@@ -125,7 +117,6 @@ module.exports = {
   decodeIdToken,
   getRedirectUri,
   getIdToken,
-  getRegisterRedirectUri,
   getLogoutRedirectUri,
   rpiZenAccountPassword,
   getEditRedirectUri,