Merge branch 'master' of ssh.dev.azure.com:v3/HackKu/HackKu%202020/backend

app/routing/routers/auth/forms.routes.js

@@ -15,99 +15,96 @@
  *      /auth/register
  */
 const index = {
+  prefix: '/auth',
 
-    prefix: '/auth',
-
-    middleware: [
+  middleware: [],
 
+  get: {
+    '/:provider/register': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'middleware::auth:ProviderRegistrationEnabled',
+      'controller::auth:Forms.registration_provider_get'
+    ],
+    '/register': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'middleware::auth:ProviderRegistrationEnabled',
+      'controller::auth:Forms.registration_provider_get'
     ],
 
-    get: {
-        '/:provider/register': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'middleware::auth:ProviderRegistrationEnabled',
-            'controller::auth:Forms.registration_provider_get',
-        ],
-        '/register': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'middleware::auth:ProviderRegistrationEnabled',
-            'controller::auth:Forms.registration_provider_get',
-        ],
-        
-        '/:provider/login': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'controller::auth:Forms.login_provider_get',
-        ],
-        '/login': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'controller::auth:Forms.login_provider_get',
-        ],
-        
-        '/:provider/logout': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:UserOnly',
-            'controller::auth:Forms.logout_provider_clean_session',
+    '/:provider/login': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'controller::auth:Forms.login_provider_get'
+    ],
+    '/login': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'controller::auth:Forms.login_provider_get'
+    ],
 
-            // Note, this separation is between when the auth action has happened properly
-            // and before the user is allowed to continue. You can use it to add your own
-            // custom middleware for auth flow handling.
+    '/:provider/logout': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:UserOnly',
+      'controller::auth:Forms.logout_provider_clean_session',
 
-            'controller::auth:Forms.logout_provider_present_success',
-        ],
-        '/logout': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:UserOnly',
-            'controller::auth:Forms.logout_provider_clean_session',
-            'controller::auth:Forms.logout_provider_present_success',
-        ],
-    },
+      // Note, this separation is between when the auth action has happened properly
+      // and before the user is allowed to continue. You can use it to add your own
+      // custom middleware for auth flow handling.
 
-    post: {
-        '/:provider/register': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'middleware::auth:ProviderRegistrationEnabled',
-            'controller::auth:Forms.registration_provider_create_user',
-            'controller::auth:Forms.registration_provider_present_user_created',
-        ],
-        '/register': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'middleware::auth:ProviderRegistrationEnabled',
-            'controller::auth:Forms.registration_provider_create_user',
-            'controller::auth:Forms.registration_provider_present_user_created',
-        ],
-        
-        '/:provider/login': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'controller::auth:Forms.login_provider_authenticate_user',
-            'controller::auth:Forms.login_provider_present_success',
-        ],
-        '/login': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:GuestOnly',
-            'controller::auth:Forms.login_provider_authenticate_user',
-            'controller::auth:Forms.login_provider_present_success',
-        ],
+      'controller::auth:Forms.logout_provider_present_success'
+    ],
+    '/logout': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:UserOnly',
+      'controller::auth:Forms.logout_provider_clean_session',
+      'controller::auth:Forms.logout_provider_present_success'
+    ]
+  },
 
-        '/:provider/logout': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:UserOnly',
-            'controller::auth:Forms.logout_provider_clean_session',
-            'controller::auth:Forms.logout_provider_present_success',
-        ],
-        '/logout': [
-            'middleware::auth:ProviderRoute',
-            'middleware::auth:UserOnly',
-            'controller::auth:Forms.logout_provider_clean_session',
-            'controller::auth:Forms.logout_provider_present_success',
-        ],
-    },
-}
+  post: {
+    '/:provider/register': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'middleware::auth:ProviderRegistrationEnabled',
+      'controller::auth:Forms.registration_provider_create_user',
+      'controller::auth:Forms.registration_provider_present_user_created'
+    ],
+    '/register': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'middleware::auth:ProviderRegistrationEnabled',
+      'controller::auth:Forms.registration_provider_create_user',
+      'controller::auth:Forms.registration_provider_present_user_created'
+    ],
 
-module.exports = exports = index
+    '/:provider/login': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'controller::auth:Forms.login_provider_authenticate_user',
+      'controller::auth:Forms.login_provider_present_success'
+    ],
+    '/login': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:GuestOnly',
+      'controller::auth:Forms.login_provider_authenticate_user',
+      'controller::auth:Forms.login_provider_present_success'
+    ],
+
+    '/:provider/logout': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:UserOnly',
+      'controller::auth:Forms.logout_provider_clean_session',
+      'controller::auth:Forms.logout_provider_present_success'
+    ],
+    '/logout': [
+      'middleware::auth:ProviderRoute',
+      'middleware::auth:UserOnly',
+      'controller::auth:Forms.logout_provider_clean_session',
+      'controller::auth:Forms.logout_provider_present_success'
+    ]
+  }
+};
+
+module.exports = exports = index;

app/routing/routers/index.routes.js

@@ -5,62 +5,59 @@
  * defined here, but no logic should occur.
  */
 const index = {
+  /*
+   * Define the prefix applied to each of these routes.
+   * For example, if prefix is '/auth':
+   *      '/' becomes '/auth'
+   *      '/login' becomes '/auth/login'
+   */
+  prefix: '/',
 
-    /*
-     * Define the prefix applied to each of these routes.
-     * For example, if prefix is '/auth':
-     *      '/' becomes '/auth'
-     *      '/login' becomes '/auth/login'
-     */
-    prefix: '/',
+  /*
+   * Define middleware that should be applied to all
+   * routes defined in this file. Middleware should be
+   * included using its non-prefixed canonical name.
+   *
+   * You can pass arguments along to a middleware by
+   * specifying it as an array where the first element
+   * is the canonical name of the middleware and the
+   * second element is the argument passed to the
+   * handler's exec() method.
+   */
+  middleware: [
+    // 'MiddlewareName', // Or without arguments
+  ],
 
-    /*
-     * Define middleware that should be applied to all
-     * routes defined in this file. Middleware should be
-     * included using its non-prefixed canonical name.
-     *
-     * You can pass arguments along to a middleware by
-     * specifying it as an array where the first element
-     * is the canonical name of the middleware and the
-     * second element is the argument passed to the
-     * handler's exec() method.
-     */
-    middleware: [
-        // 'MiddlewareName', // Or without arguments
-    ],
+  /*
+   * Define GET routes.
+   * These routes are registered as GET methods.
+   * Handlers for these routes should be specified as
+   * an array of canonical references to controller methods
+   * or middleware that are applied in order.
+   */
+  get: {
+    // handlers should be a list of either controller:: or middleware:: references
+    // e.g. middleware::HomeLogger
+    // e.g. controller::Home.welcome
+    '/': ['controller::Home.welcome'],
 
-    /*
-     * Define GET routes.
-     * These routes are registered as GET methods.
-     * Handlers for these routes should be specified as
-     * an array of canonical references to controller methods
-     * or middleware that are applied in order.
-     */
-    get: {
-        // handlers should be a list of either controller:: or middleware:: references
-        // e.g. middleware::HomeLogger
-        // e.g. controller::Home.welcome
-        '/': [ 'controller::Home.welcome' ],
+    // Placeholder for auth dashboard. You'd replace this with
+    // your own route protected by 'middleware::auth:UserOnly'
+    '/dash': ['controller::Home.toApp'],
+    '/login': ['middleware::auth:GuestOnly', 'controller::Home.get_login'],
+    '/test-json': ['controller::Export.json_export'],
+    '/test-markdown': ['controller::Export.markdown_export'],
+    '/test-html': ['controller::Export.html_export']
+  },
 
-        // Placeholder for auth dashboard. You'd replace this with
-        // your own route protected by 'middleware::auth:UserOnly'
-        '/dash': [ 'controller::Home.welcome' ],
-        '/login': [ 'middleware::auth:GuestOnly', 'controller::Home.get_login' ],
-        '/test-json' : [ 'controller::Export.json_export' ],
-        '/test-markdown' : [ 'controller::Export.markdown_export' ],
-        '/test-html' : [ 'controller::Export.html_export' ]
-    },
+  /*
+   * Define POST routes.
+   * These routes are registered as POST methods.
+   * Handlers for these routes should be specified as
+   * an array of canonical references to controller methods
+   * or middleware that are applied in order.
+   */
+  post: {}
+};
 
-    /*
-     * Define POST routes.
-     * These routes are registered as POST methods.
-     * Handlers for these routes should be specified as
-     * an array of canonical references to controller methods
-     * or middleware that are applied in order.
-     */
-    post: {
-
-    },
-}
-
-module.exports = exports = index
+module.exports = exports = index;