adjust for rpi auth routes becoming standard auth routes

Author: Jeddf

package.json

@@ -11,7 +11,7 @@
     "karma": "cross-env BABEL_ENV=test karma start test/unit/karma.conf.js",
     "test": "yarn unit && yarn cypress",
     "lint": "eslint --ext .js,.vue src test/unit/specs",
-    "cypress": "yarn build && concurrently --kill-others --success first \"node cypress-spa-server.js > /dev/null\" \"cypress open --browser chrome\"",
+    "cypress": "yarn build && concurrently --kill-others --success first \"node cypress-spa-server.js > /dev/null\" \"cypress run --browser chrome\"",
     "cypress:open": "cypress open",
     "cypress:install": "cypress install"
   },

src/common/cd-header.vue

@@ -133,11 +133,10 @@ import '@coderdojo/cd-common/dist/cd-common.min';
 export default {
   name: 'cd-header',
   data() {
-    const rpiAuthFlag = window.localStorage.getItem('rpiAuth') === 'true';
     return {
-      loginPath: rpiAuthFlag ? '/rpi/login' : '/login',
-      logoutPath: rpiAuthFlag ? '/rpi/logout' : '/logout',
-      registerPath: rpiAuthFlag ? '/rpi/register' : '/register/user',
+      loginPath: '/login',
+      logoutPath: '/logout',
+      registerPath: '/register',
       navigationLinks: [
         {
           href: 'https://coderdojo.com/about/',

src/events/cd-event-list.vue

@@ -116,7 +116,7 @@
           /* eslint-enable no-alert */
           this.loadUserDojoRole();
         } else {
-          location.href = `/register/account?referer=${this.$route.path}`;
+          location.href = `/register?referer=${this.$route.path}`;
         }
       },
     },

src/router/index.js

@@ -111,7 +111,7 @@ const router = new Router({
           component: AccountType,
         },
         {
-                    path: '/home',
+          path: '/home',
           name: 'Home',
           component: Home,
           beforeEnter: loggedInNavGuard,

src/router/loggedInCDFNavGuard.js

@@ -5,8 +5,7 @@ const fn = {
     if (user && user.login) {
       return next();
     }
-    const rpiAuthFlag = window.localStorage.getItem('rpiAuth') === 'true';
-    return window.location.replace(`/${rpiAuthFlag ? 'rpi' : 'cdf'}/login?referer=${from}`);
+    return window.location.replace(`/login?referer=${from}`);
   },
 };
 export default async function (to, from, next) {