diff --git a/app.py b/app.py index fa54bed7ffe51a3931e528d31fb8c8168df1d3c2..5c11c3c36d5d6ca81b8f47817ea3701663dd9d0b 100644 --- a/app.py +++ b/app.py @@ -26,11 +26,7 @@ def create_app(test_config=None): try: timestamp = datetime.datetime.fromtimestamp(session['timestamp']) client_id = session['client_id'] - user_id = session['user_id'] - user_name = session['user_name'] user_nickname = session['user_nickname'] - user_email = session['user_email'] - user_groups = session['user_groups'] except (KeyError, OverflowError): session.clear() abort(401) @@ -39,11 +35,7 @@ def create_app(test_config=None): session.clear() abort(401) resp = Response('Ok', 200) - resp.headers['OAUTH-USER-ID'] = user_id - resp.headers['OAUTH-USER-NAME'] = user_name resp.headers['OAUTH-USER-NICKNAME'] = user_nickname - resp.headers['OAUTH-USER-EMAIL'] = user_email - resp.headers['OAUTH-USER-GROUPS'] = ','.join(user_groups) return resp def get_oauth(**kwargs): @@ -91,11 +83,7 @@ def create_app(test_config=None): session.clear() session['timestamp'] = datetime.datetime.now().timestamp() session['client_id'] = request.headers['X-CLIENT-ID'] - session['user_id'] = userinfo['id'] - session['user_name'] = userinfo['name'] session['user_nickname'] = userinfo['nickname'] - session['user_email'] = userinfo['email'] - session['user_groups'] = userinfo['groups'] return redirect(redirect_url) @app.route('/logout') diff --git a/test_app.py b/test_app.py index c1cd3faf78c3f9f9b1337db22294931889d42393..d3557b2eebaa5377196cdf716d307a0e5acfb8b6 100644 --- a/test_app.py +++ b/test_app.py @@ -40,11 +40,7 @@ def mock_request(self, method, url, **kwargs): if method == 'GET' and url == 'https://127.0.0.123:4567/userinfo': if kwargs['headers']['Authorization'] != 'Bearer 2YotnFZFEjr1zCsicMWpAA': raise Exception() - return MockResponse(200, {'id': 1234, - 'name': 'Test User', - 'nickname': 'testuser', - 'email': 'test@example.com', - 'groups': ['uffd_access', 'users']}) + return MockResponse(200, {'nickname': 'testuser'}) print(repr(method), repr(url), repr(kwargs)) raise Exception() @@ -106,11 +102,7 @@ class TestCases(unittest.TestCase): with self.client.session_transaction() as session: self.assertGreaterEqual(session['timestamp'], (datetime.datetime.now() - datetime.timedelta(seconds=60)).timestamp()) self.assertEqual(session['client_id'], 'test_client_id') - self.assertEqual(session['user_id'], 1234) - self.assertEqual(session['user_name'], 'Test User') self.assertEqual(session['user_nickname'], 'testuser') - self.assertEqual(session['user_email'], 'test@example.com') - self.assertEqual(set(session['user_groups']), set(['uffd_access', 'users'])) self.assertNotIn('state', session) self.assertNotIn('url', session) @@ -142,28 +134,16 @@ class TestCases(unittest.TestCase): with self.client.session_transaction() as session: session['timestamp'] = datetime.datetime.now().timestamp() session['client_id'] = 'test_client_id' - session['user_id'] = 1234 - session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' - session['user_email'] = 'test@example.com' - session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/auth', headers=headers) self.assertEqual(r.status_code, 200) - self.assertEqual(r.headers['OAUTH-USER-ID'], '1234') - self.assertEqual(r.headers['OAUTH-USER-NAME'], 'Test User') self.assertEqual(r.headers['OAUTH-USER-NICKNAME'], 'testuser') - self.assertEqual(r.headers['OAUTH-USER-EMAIL'], 'test@example.com') - self.assertIn(r.headers['OAUTH-USER-GROUPS'], ['uffd_access,users', 'users,uffd_access']) def test_auth_session_timeout(self): with self.client.session_transaction() as session: session['timestamp'] = (datetime.datetime.now() - datetime.timedelta(days=3)).timestamp() session['client_id'] = 'test_client_id' - session['user_id'] = 1234 - session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' - session['user_email'] = 'test@example.com' - session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/auth', headers=headers) self.assertEqual(r.status_code, 401) @@ -171,11 +151,7 @@ class TestCases(unittest.TestCase): with self.client.session_transaction() as session: session['timestamp'] = (datetime.datetime.now() - datetime.timedelta(days=3)).timestamp() session['client_id'] = 'other_client_id' - session['user_id'] = 1234 - session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' - session['user_email'] = 'test@example.com' - session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/auth', headers=headers) self.assertEqual(r.status_code, 401) @@ -183,11 +159,7 @@ class TestCases(unittest.TestCase): with self.client.session_transaction() as session: session['timestamp'] = datetime.datetime.now().timestamp() session['client_id'] = 'test_client_id' - session['user_id'] = 1234 - session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' - session['user_email'] = 'test@example.com' - session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/logout', headers=headers) self.assertEqual(r.status_code, 200) with self.client.session_transaction() as session: @@ -203,11 +175,7 @@ class TestCases(unittest.TestCase): with self.client.session_transaction() as session: session['timestamp'] = datetime.datetime.now().timestamp() session['client_id'] = 'test_client_id' - session['user_id'] = 1234 - session['user_name'] = 'Test User' session['user_nickname'] = 'testuser' - session['user_email'] = 'test@example.com' - session['user_groups'] = ['uffd_access', 'users'] r = self.client.get(path='/logout', headers=headers, query_string={'redirect_url': 'https://127.0.0.123:7654/app/logout'}) self.assertEqual(r.status_code, 302) self.assertEqual(r.location, 'https://127.0.0.123:7654/app/logout')