From 32aeeac09ae99bca91f155ce5ad61d6779cb8ecf Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Dec 02 2017 12:20:18 +0000
Subject: Make all parts of hubs require login


This makes everything in hubs require the user to login,
except for the new index.html page that provides a brief
overview of hubs, and login / signup links.

This also comments out the IRC icon in the topbar too.

fixes #473 #471

---

diff --git a/hubs/templates/index.html b/hubs/templates/index.html
new file mode 100644
index 0000000..e0f1292
--- /dev/null
+++ b/hubs/templates/index.html
@@ -0,0 +1,25 @@
+{% extends "master.html" %}
+
+{% block title %}Fedora Hubs{% endblock %}
+
+
+{% block fullcontent %}
+<div class="jumbotron">
+    <div class="container-narrow">
+        <h1 class="display-4">Welcome to Fedora Hubs</h1>
+        <p class="lead">
+            Fedora Hubs is the communication and collaboration center
+            for Fedora contributors of all types. Use Hubs to check your
+            involvements across Fedora and discover new teams to help out.
+            For new contributors, Hubs is a place to get started
+            collaborating with others.
+        </p>
+        <hr class="my-4">
+        <p class="text-right">Fedora Hubs uses the Fedora Account System (FAS) for authentication</p>
+        <p class="lead text-right">
+            <a class="btn btn-secondary btn-lg" href="https://admin.fedoraproject.org/accounts/user/new">Create a FAS Account</a>
+            <a class="btn btn-lg btn-primary" href="{{ url_for('login', next=request.args.get('next')) }}">Login with FAS</a>
+        </p>
+    </div>
+</div>
+{% endblock fullcontent %}
diff --git a/hubs/templates/master.html b/hubs/templates/master.html
index de8d6cb..5165328 100644
--- a/hubs/templates/master.html
+++ b/hubs/templates/master.html
@@ -27,20 +27,23 @@
   </button>
 
   <div class="col-md-4">
+    {% if g.auth.logged_in %}
     <div class="form mx-auto" autocomplete="off">
         <form id="bloodhound" class="input-group">
           <input class="typeahead form-control" name="term" type="text" placeholder="Search hubs..." autocomplete="off"/>        
         </form>
-      </div>
+    </div>
+    {% endif %}
   </div>
   <div class="collapse navbar-collapse" id="navbar-top-menu">
     {% if g.auth.logged_in %}
     <ul class="navbar-nav ml-auto">
-      <li class="nav-item mr-4">
+      {# Comment out the IRC Icon for now #}
+      {# <li class="nav-item mr-4">
         <span class="navbar-text">
           <img class="chaticon float-xs-right m-r-2" src="{{ url_for('static', filename='img/irc_icon.png') }}" alt="IRC Chats">
         </span>
-      </li>
+      </li> #}
       <li class="nav-item dropdown">
         <a href="#" class="nav-link dropdown-toggle" id="navbar-dropdown-user" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <img src="{{ g.auth.avatar }}" class="avatar" alt="User Icon"/>
@@ -51,9 +54,8 @@
       </li>
     </ul>
     {% else %}
-    <span class="navbar-text ml-auto">
-      Not logged in.  Click to
-      <a href="{{ url_for('login', next=request.url) }}">login</a>.
+    <span class="ml-auto">
+      <a class="btn btn-sm btn-primary" href="{{ url_for('login', next=request.args.get('next')) }}">Login</a>
     </span>
     {% endif %}
 
diff --git a/hubs/tests/views/test_hub_view.py b/hubs/tests/views/test_hub_view.py
index 52efd30..146b137 100644
--- a/hubs/tests/views/test_hub_view.py
+++ b/hubs/tests/views/test_hub_view.py
@@ -1,5 +1,7 @@
 from __future__ import unicode_literals
 
+from six.moves.urllib.parse import urlparse
+
 from hubs.models import Hub, User
 from hubs.tests import APPTest, FakeAuthorization
 
@@ -7,12 +9,12 @@ from hubs.tests import APPTest, FakeAuthorization
 class HubViewTestCase(APPTest):
 
     def test_hub_logged_out(self):
-        response = self.check_url("/ralph/")
-        self.assertIn("Not logged in.", response.get_data(as_text=True))
-        self.assertEqual(response.context["page_title"], "ralph")
-        state = response.context["initial_state"]
-        self.assertEqual(state["urls"]["hubConfig"], "/api/hubs/ralph/config")
-        self.assertFalse(state["currentUser"]["logged_in"])
+        """
+        test that if we try to look at a hub when not
+        logged in, we get directed to the /
+        """
+        response = self.check_url("/ralph/", code=302)
+        self.assertEqual(urlparse(response.location).path, "/")
 
     def test_hub_logged_in(self):
         user = FakeAuthorization('ralph')
@@ -23,13 +25,6 @@ class HubViewTestCase(APPTest):
         state = response.context["initial_state"]
         self.assertTrue(state["currentUser"]["logged_in"])
 
-    def test_hub_preview(self):
-        hub = Hub.by_name('ralph')
-        hub.config.visibility = "preview"
-        # Preview hubs are accessible to anonymous users (but some
-        # widgets may be restricted).
-        self.check_url("/ralph/")
-
     def test_hub_private(self):
         hub = Hub.by_name('ralph')
         hub.config.visibility = "private"
diff --git a/hubs/tests/views/test_root.py b/hubs/tests/views/test_root.py
index b34e9c0..1288c6b 100644
--- a/hubs/tests/views/test_root.py
+++ b/hubs/tests/views/test_root.py
@@ -9,9 +9,10 @@ from hubs.tests import APPTest, FakeAuthorization, auth_set
 class RootTestCase(APPTest):
 
     def test_index_logged_out(self):
-        result = self.app.get('/', follow_redirects=False)
-        self.assertEqual(result.status_code, 302)
-        self.assertEqual(urlparse(result.location).path, "/login")
+        response = self.check_url("/", code=200)
+        self.assertIn(
+            'Create a FAS Account',
+            response.get_data(as_text=True))
 
     def test_index_logged_in(self):
         user = FakeAuthorization('ralph')
@@ -34,16 +35,16 @@ class RootTestCase(APPTest):
                 "/openidc/Authorization")
 
     def test_groups_logged_out(self):
-        result = self.app.get('/groups', follow_redirects=False)
+        result = self.app.get('/groups/', follow_redirects=False)
         # assert the status code of the response
         self.assertEqual(result.status_code, 302)
         # this will redirect to fedora.login
-        self.assertEqual(urlparse(result.location).path, "/login")
+        self.assertEqual(urlparse(result.location).path, "/")
 
     def test_groups_logged_in(self):
         user = FakeAuthorization('ralph')
         with auth_set(app, user):
-            result = self.app.get('/groups', follow_redirects=True)
+            result = self.app.get('/groups/', follow_redirects=True)
             # assert the status code of the response
             self.assertEqual(result.status_code, 200)
             self.assertIn("ZOMG -  is the Hub Of The Month!",
diff --git a/hubs/utils/views.py b/hubs/utils/views.py
index a769dc8..2a4efd5 100644
--- a/hubs/utils/views.py
+++ b/hubs/utils/views.py
@@ -215,7 +215,7 @@ def login_required(function):
         """ Decorated function, actually does the work. """
         if not authenticated():
             return flask.redirect(flask.url_for(
-                'login', next=flask.request.url))
+                'index', next=flask.request.url))
 
         return function(*args, **kwargs)
 
diff --git a/hubs/views/hub.py b/hubs/views/hub.py
index c1e0a07..cc4025a 100644
--- a/hubs/views/hub.py
+++ b/hubs/views/hub.py
@@ -5,12 +5,13 @@ import hubs.models
 
 from hubs.app import app
 from hubs.utils.views import (
-    get_hub, get_sse_url, require_hub_access, get_user_details,
+    get_hub, get_sse_url, require_hub_access, get_user_details, login_required
     )
 
 
 @app.route('/<name>/')
 @require_hub_access("view")
+@login_required
 def hub(name):
     hub = get_hub(name, load_config=True)
     global_config = {
diff --git a/hubs/views/root.py b/hubs/views/root.py
index 132647d..cae9996 100644
--- a/hubs/views/root.py
+++ b/hubs/views/root.py
@@ -4,22 +4,23 @@ import flask
 import hubs.models
 
 from hubs.app import app, OIDC
-from hubs.utils.views import authenticated, is_safe_url
+from hubs.utils.views import authenticated, is_safe_url, login_required
 
 
 @app.route('/')
 def index():
-    if not authenticated():
-        return flask.redirect(flask.url_for('login'))
-
-    return flask.redirect(flask.url_for('stream', name=flask.g.auth.nickname))
+    if authenticated():
+        return flask.redirect(flask.url_for('stream',
+                                            name=flask.g.auth.nickname))
+    return flask.render_template(
+        'index.html'
+    )
 
 
 @app.route('/groups')
+@app.route('/groups/')
+@login_required
 def groups():
-    if not authenticated():
-        return flask.redirect(flask.url_for('login'))
-
     # Get the list of promoted and non-promoted group hubs from the DB
     promoted_names = app.config.get('PROMOTED_GROUPS')
     groups = hubs.models.Hub.all_group_hubs()