PLT-3484 OAuth2 Service Provider (#3632)

* PLT-3484 OAuth2 Service Provider

* PM text review for OAuth 2.0 Service Provider

* PLT-3484 OAuth2 Service Provider UI tweaks (#3668)

* Tweaks to help text

* Pushing OAuth improvements (#3680)

* Re-arrange System Console for OAuth 2.0 Provider

webapp/routes/route_admin_console.jsx

@@ -24,7 +24,7 @@ import SessionSettings from 'components/admin_console/session_settings.jsx';
 import ConnectionSettings from 'components/admin_console/connection_settings.jsx';
 import EmailSettings from 'components/admin_console/email_settings.jsx';
 import PushSettings from 'components/admin_console/push_settings.jsx';
-import WebhookSettings from 'components/admin_console/webhook_settings.jsx';
+import CustomIntegrationsSettings from 'components/admin_console/custom_integrations_settings.jsx';
 import ExternalServiceSettings from 'components/admin_console/external_service_settings.jsx';
 import DatabaseSettings from 'components/admin_console/database_settings.jsx';
 import StorageSettings from 'components/admin_console/storage_settings.jsx';
@@ -137,10 +137,10 @@ export default (
             />
         </Route>
         <Route path='integrations'>
-            <IndexRedirect to='webhooks'/>
+            <IndexRedirect to='custom'/>
             <Route
-                path='webhooks'
-                component={WebhookSettings}
+                path='custom'
+                component={CustomIntegrationsSettings}
             />
             <Route
                 path='external'

webapp/routes/route_integrations.jsx

@@ -61,6 +61,22 @@ export default {
                     }
                 }
             ]
+        },
+        {
+            path: 'oauth2-apps',
+            indexRoute: {
+                getComponents: (location, callback) => {
+                    System.import('components/integrations/components/installed_oauth_apps.jsx').then(RouteUtils.importComponentSuccess(callback));
+                }
+            },
+            childRoutes: [
+                {
+                    path: 'add',
+                    getComponents: (location, callback) => {
+                        System.import('components/integrations/components/add_oauth_app.jsx').then(RouteUtils.importComponentSuccess(callback));
+                    }
+                }
+            ]
         }
     ]
 };

webapp/routes/route_root.jsx

@@ -130,6 +130,12 @@ export default {
                                             System.import('components/select_team/select_team.jsx').then(RouteUtils.importComponentSuccess(callback));
                                         }
                                     },
+                                    {
+                                        path: '*authorize',
+                                        getComponents: (location, callback) => {
+                                            System.import('components/authorize.jsx').then(RouteUtils.importComponentSuccess(callback));
+                                        }
+                                    },
                                     createTeamRoute
                                 ]
                             )