Add Session context and redirects #9908

marshmalien · 2021-04-14T19:38:41Z

SUMMARY

Issues:
#8272 #9197 #8155 #9311

When user is logged out due to inactivity, redirect to the Login Page with a warning alert stating that their session expired.
When a user logs in on one tab, redirect from login page to home on the other tabs.
Clear session state when it expires and/or when a user logs out.
Redirect users to direct link destination after authentication

~~@AlexSCorey is looking at possibly rolling #9915 (SSO login redirect override URL is not working) into this PR~~

ISSUE TYPE

Feature Pull Request

COMPONENT NAME

UI

softwarefactory-project-zuul · 2021-04-14T19:50:38Z

Build succeeded.

awx-api-lint : SUCCESS in 2m 32s
awx-api : SUCCESS in 7m 10s
awx-ui : SUCCESS in 11m 29s
awx-swagger : SUCCESS in 7m 13s
awx-detect-schema-change : SUCCESS in 7m 12s (non-voting)
awx-ansible-modules : SUCCESS in 4m 42s

nixocio · 2021-04-15T12:25:07Z

awx/ui_next/src/components/AppContainer/AppContainer.jsx

-          )} seconds due to inactivity.`
-        )}
+        <Trans>You will be logged out in</Trans> {sessionCountdown}{' '}
+        <Trans>seconds due to inactivity.</Trans>


Based on another open PR t macro will be preferred syntax to select translation. See: #9897

I think we're OK with <Trans> (and in fact I prefer it in some cases) -- though the full sentence including the sessionCountdown should appear inside one <Trans> so it can all be translated together

This also needs plural because when we get to 1 left we want You will be logged out in 1 second due to inactivity

👍 Updated timeout message to use Plural macro.

nixocio · 2021-04-15T12:26:07Z

awx/ui_next/src/contexts/Session.jsx

+  return context;
+}
+
+// export default SessionContext;


Suggested change

// export default SessionContext;

// export default SessionContext;

Suggested change

// export default SessionContext;

nixocio · 2021-04-15T12:27:18Z

I triggered an e2e test run.

nixocio

I tested this code with different scenarios, and all of them worked. I like the usage of context API to this solution. I left minor comments. If e2e tests are green 🚢

nixocio · 2021-04-15T14:11:54Z

awx/ui_next/src/contexts/Session.jsx

+  }, [history, sessionTimeout]);
+
+  const handleSessionContinue = useCallback(async () => {
+    MeAPI.read();


Suggested change

MeAPI.read();

await MeAPI.read();

nixocio · 2021-04-15T14:22:03Z

awx/ui_next/src/contexts/Session.jsx

+    clearInterval(sessionIntervalId.current);
+  }, []);
+
+  const value = useMemo(


jakemcdermott

👍

jakemcdermott · 2021-04-15T14:48:52Z

@AlexSCorey is looking at possibly rolling #9915 (SSO login redirect override URL is not working) into this PR

@marshmalien

That sounds good to me (there's probably overlap with that issue and this PR). If we end up moving that work to this PR I'll take another look.

softwarefactory-project-zuul · 2021-04-15T21:40:39Z

Build succeeded.

awx-api-lint : SUCCESS in 2m 23s
awx-api : SUCCESS in 9m 42s
awx-ui : SUCCESS in 12m 56s
awx-swagger : SUCCESS in 9m 57s
awx-detect-schema-change : SUCCESS in 7m 02s (non-voting)
awx-ansible-modules : SUCCESS in 4m 58s

softwarefactory-project-zuul · 2021-04-16T16:00:57Z

Build succeeded.

awx-api-lint : SUCCESS in 3m 38s
awx-api : SUCCESS in 6m 26s
awx-ui : SUCCESS in 11m 47s
awx-swagger : SUCCESS in 7m 07s
awx-detect-schema-change : SUCCESS in 7m 12s (non-voting)
awx-ansible-modules : SUCCESS in 4m 19s

keithjgrant · 2021-04-16T17:41:12Z

awx/ui_next/src/contexts/Session.jsx

+    clearInterval(sessionIntervalId.current);
+  }, []);
+
+  const value = useMemo(


Why the useMemo here?

tiagodread · 2021-04-19T16:40:11Z

To test:

Redirect to edit form with direct link (or any other link)
Redirect to the job output with direct link
Redirect to 404 when the resource was deleted

unlikelyzero · 2021-04-19T23:41:07Z

worth connecting #5278 (comment)

AlexSCorey · 2021-04-20T13:56:58Z

@AlexSCorey is looking at possibly rolling #9915 (SSO login redirect override URL is not working) into this PR

@marshmalien

That sounds good to me (there's probably overlap with that issue and this PR). If we end up moving that work to this PR I'll take another look.

I have decided not to roll my SSO work into this PR. Both PRs work in Login.jsx but besides that there isn't much overlap in logic

tiagodread · 2021-04-26T21:38:47Z

@marshmalien This looks pretty nice, we've found some feedback while verifying this:

Note: that the Idle Time Force Log Out was changed to 60 sec to test

Trying to visit a specific link without being logged, after the login step the user is seeing the dashboard except if you do a hard refresh before pasting the link and performing the login. (Note that on the video below before the second attempt I did a hard refresh before log in)

session1-2021-04-26_18.12.06.mp4

This is similar to the first item, but in this case, the user is not being redirected to a specific link trying to log in with social auth provider such as Google Oauth2 (Note that in the second login attempt I did a hard refresh):

session4-2021-04-26_18.31.17.mp4

If the session times out on the tab I’m logged into and i’m on a certain resource (ie templates list), when I log in back I can see the last page visited in the main tab, however, in the second tab (template list) the session modal is stuck in 1 sec on template list page.

session2-2021-04-26_18.15.12.mp4

Trying to login with an auth provider such as Google Oauth2 Settings, the session modal is being displayed right after the login step and the counter is stuck in 10 seconds:

session3-2021-04-26_18.25.22.mp4

We had 293 failures in e2e tests, I'm looking at the moment but seems to be the same issue.

tiagodread · 2021-05-04T18:15:39Z

@marshmalien any update about this PR?

tiagodread · 2021-05-19T13:16:05Z

@marshmalien I was looking into the e2e tests to understand what could be breaking the tests and I didn't found any reason why the Session modal is being displayed right after the login step, when all the cookies are being set

test-2021-05-19_10.12.56.mp4

softwarefactory-project-zuul · 2021-05-21T15:32:57Z

Build succeeded.

awx-api-lint : SUCCESS in 7m 17s
awx-api : SUCCESS in 11m 14s
awx-ui : SUCCESS in 15m 32s
awx-swagger : SUCCESS in 11m 26s
awx-detect-schema-change : SUCCESS in 11m 15s (non-voting)
awx-ansible-modules : SUCCESS in 8m 54s

softwarefactory-project-zuul · 2021-05-26T21:55:03Z

Build succeeded.

awx-api-lint : SUCCESS in 2m 27s
awx-api : SUCCESS in 9m 36s
awx-ui : SUCCESS in 12m 22s
awx-swagger : SUCCESS in 6m 50s
awx-detect-schema-change : SUCCESS in 7m 44s (non-voting)
awx-ansible-modules : SUCCESS in 4m 28s

nixocio

We got in a call and we went over the different scenarios for third party auth providers. Good job @marshmalien.

nixocio · 2021-05-27T12:48:53Z

awx/ui_next/src/App.jsx

@@ -26,6 +28,7 @@ import Metrics from './screens/Metrics';

 import getRouteConfig from './routeConfig';
 import SubscriptionEdit from './screens/Setting/Subscription/SubscriptionEdit';
+import { SESSION_REDIRECT_URL } from './constants';


softwarefactory-project-zuul · 2021-06-01T18:59:04Z

Build succeeded.

awx-api-lint : SUCCESS in 2m 39s
awx-api : SUCCESS in 6m 21s
awx-ui : SUCCESS in 14m 52s
awx-swagger : SUCCESS in 6m 38s
awx-detect-schema-change : SUCCESS in 6m 53s (non-voting)
awx-ansible-modules : SUCCESS in 4m 01s

tiagodread

Verified that all issues found were fixed
Verified that all sub issues and added evidencies on each of them
Fixed all broken e2e tests

softwarefactory-project-zuul · 2021-06-02T21:17:47Z

Build succeeded (gate pipeline).

awx-api-lint : SUCCESS in 2m 08s
awx-api : SUCCESS in 6m 23s
awx-ui : SUCCESS in 12m 43s
awx-swagger : SUCCESS in 6m 25s
awx-detect-schema-change : SUCCESS in 6m 26s (non-voting)
awx-ansible-modules : SUCCESS in 3m 58s
awx-push-new-schema : SUCCESS in 6m 33s (non-voting)

marshmalien added type:bug component:ui type:feature prioritized on a feature board labels Apr 14, 2021

marshmalien requested review from jakemcdermott, AlexSCorey, keithjgrant and nixocio April 14, 2021 19:39

nixocio reviewed Apr 15, 2021

View reviewed changes

nixocio approved these changes Apr 15, 2021

View reviewed changes

nixocio reviewed Apr 15, 2021

View reviewed changes

awx/ui_next/src/contexts/Session.jsx Outdated

clearInterval(sessionIntervalId.current);

}, []);

const value = useMemo(

Copy link

Contributor

nixocio Apr 15, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯

jakemcdermott approved these changes Apr 15, 2021

View reviewed changes

marshmalien force-pushed the session-work branch from 17c5f4f to 99e82eb Compare April 15, 2021 21:27

marshmalien force-pushed the session-work branch from 99e82eb to 7a4d31d Compare April 16, 2021 15:46

keithjgrant reviewed Apr 16, 2021

View reviewed changes

tiagodread assigned tiagodread, one-t and akus062381 Apr 19, 2021

tiagodread mentioned this pull request Apr 19, 2021

Fixes SSO Redirect #9943

Merged

unlikelyzero mentioned this pull request Apr 19, 2021

Most Detail views don't update when URL changes #5278

Closed

marshmalien force-pushed the session-work branch 2 times, most recently from 61e0ece to 29f81c1 Compare April 20, 2021 20:34

ansible deleted a comment from softwarefactory-project-zuul bot Apr 26, 2021

tiagodread added state:needs_devel and removed state:needs_test labels May 5, 2021

marshmalien force-pushed the session-work branch from d41967a to f5e68dd Compare May 21, 2021 15:16

marshmalien force-pushed the session-work branch from f5e68dd to c03cd71 Compare May 26, 2021 21:42

nixocio approved these changes May 27, 2021

View reviewed changes

nixocio added state:needs_test and removed state:needs_devel labels May 27, 2021

marshmalien added 4 commits June 1, 2021 13:28

Add Session context and redirect on auth

a097602

Remove useMemo from session context

811fa51

Redirect user after authenticating through social auth

951f6d4

Update .po strings

92f5675

marshmalien force-pushed the session-work branch from c03cd71 to 92f5675 Compare June 1, 2021 18:43

tiagodread approved these changes Jun 2, 2021

View reviewed changes

tiagodread added mergeit and removed state:needs_test labels Jun 2, 2021

softwarefactory-project-zuul bot merged commit fef2435 into ansible:devel Jun 2, 2021

renovate bot mentioned this pull request Jun 18, 2021

chore(deps): update dependency awxkit to v19.2.1 osism-archive/container-image-manager#77

Merged

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Session context and redirects #9908

Add Session context and redirects #9908

marshmalien commented Apr 14, 2021 •

edited

Loading

softwarefactory-project-zuul bot commented Apr 14, 2021

nixocio Apr 15, 2021 •

edited

Loading

keithjgrant Apr 15, 2021

AlexSCorey Apr 16, 2021

marshmalien Apr 16, 2021

nixocio Apr 15, 2021

nixocio commented Apr 15, 2021

nixocio left a comment

nixocio Apr 15, 2021

nixocio Apr 15, 2021

jakemcdermott left a comment

jakemcdermott commented Apr 15, 2021

softwarefactory-project-zuul bot commented Apr 15, 2021

softwarefactory-project-zuul bot commented Apr 16, 2021

keithjgrant Apr 16, 2021

tiagodread commented Apr 19, 2021

unlikelyzero commented Apr 19, 2021

AlexSCorey commented Apr 20, 2021

tiagodread commented Apr 26, 2021

tiagodread commented May 4, 2021

tiagodread commented May 19, 2021

softwarefactory-project-zuul bot commented May 21, 2021

softwarefactory-project-zuul bot commented May 26, 2021

nixocio left a comment

nixocio May 27, 2021

softwarefactory-project-zuul bot commented Jun 1, 2021

tiagodread left a comment

softwarefactory-project-zuul bot commented Jun 2, 2021

	// export default SessionContext;
	// export default SessionContext;

Add Session context and redirects #9908

Add Session context and redirects #9908

Conversation

marshmalien commented Apr 14, 2021 • edited Loading

SUMMARY

ISSUE TYPE

COMPONENT NAME

softwarefactory-project-zuul bot commented Apr 14, 2021

nixocio Apr 15, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

nixocio commented Apr 15, 2021

nixocio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakemcdermott left a comment

Choose a reason for hiding this comment

jakemcdermott commented Apr 15, 2021

softwarefactory-project-zuul bot commented Apr 15, 2021

softwarefactory-project-zuul bot commented Apr 16, 2021

Choose a reason for hiding this comment

tiagodread commented Apr 19, 2021

unlikelyzero commented Apr 19, 2021

AlexSCorey commented Apr 20, 2021

tiagodread commented Apr 26, 2021

tiagodread commented May 4, 2021

tiagodread commented May 19, 2021

softwarefactory-project-zuul bot commented May 21, 2021

softwarefactory-project-zuul bot commented May 26, 2021

nixocio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Jun 1, 2021

tiagodread left a comment

Choose a reason for hiding this comment

softwarefactory-project-zuul bot commented Jun 2, 2021

marshmalien commented Apr 14, 2021 •

edited

Loading

nixocio Apr 15, 2021 •

edited

Loading