Redirecting user to same page after login. #467

mspalti · 2019-08-28T18:18:10Z

Simple update to log-in component. This seems to be all that we need. My first effort on the angular side so let me know if I failed to see something.

artlowel · 2019-08-29T10:58:05Z

Thanks @mspalti!

It seems to work if you go to e.g. a collection homepage and log in from there. On master that would redirect you to the home page, in this branch it doesn't.

However if I'm not logged in, and I enter http://localhost:3000/submit in my browser's address bar, I get redirected to /login and I enter my info. On the master I get redirected to /submit, on this branch it keeps showing the loading screen indefinitely. I don't immediately see the reason why this change should have that effect. Perhaps you have an idea @atarix83 ? In any case I'd appreciate your review on this PR

mspalti · 2019-08-29T18:00:37Z

Oh, I see. The log-in component is shared. When you follow the /submit route (or any other guarded route) you are redirected to the login page, and in that case, we do not want to reset the redirectUrl (to be '/login'), rather we should use the existing value.

The naive solution (which does seem to work) is to not set the redirectUrl if the current url is '/login'

If that's too brittle, perhaps we could reset the redirectUrl only when the current value is an empty string and not an actual route.

mspalti · 2019-08-29T23:19:32Z

OK. Given what I currently see, I think the best idea is probably to set the redirectUrl in the submit method only if the AuthState.redirectUrl value is empty. I've added this to the PR. (Of course, we could also hard-code the '/login' path and use that instead, or something else.)

mspalti · 2019-08-30T00:03:35Z

While working on a different PR (lacking any of the code changes here) I noticed that when logged in and editing an item, selecting the withdraw or make private option triggers a new login dialog because of the route guard. Also, after logging in, the page redirect fails to work; it works if I click the login button a second time.

I verified the same behavior when running the code in this PR.

Followup: I looked into this a bit more. When I click on "withdraw" the REST api sees an invalid token signature and returns null authentication, after which the angular client redirects to the login page. Looking in Chrome devtools, it seems that the authorization token is not sent in the withdraw request.

mspalti · 2019-09-04T01:06:19Z

Revised again for the following:

The log-in component calls authService to set the redirect url when using the drop-down login in larger layout windows.
In larger windows, when the authentication guard causes a redirect to the full screen login, the redirect url (/'login') is NOT set by the log-in component. Instead the url set by the authentication guard is used.
When in a mobile layout, the login component calls authService and sets the redirect url to the previous url in history (provided the previous url is not '/login').

Much of this is based on the AuthService.LOGIN_ROUTE. I'm not checking to see if the current redirect url isEmpty(), as I was in the previous commit.

artlowel · 2019-09-04T16:26:26Z

src/app/shared/log-in/log-in.component.ts

    this.isAuthenticated = this.store.pipe(select(isAuthenticated));

+    // for mobile login, set the redirect url to the previous route
+    this.windowService.isXs().pipe(take(1))


If I understand correctly, we need to determine whether we're on an XS screen, because on XS screens the login component is rendered as a separate page, rather than a dropdown at the top of another page?

If that's the case I'd prefer if you added an input to this component:

@Input() isStandalonePage: boolean

or something to that effect, and use that to determine whether or not to set the redirect url.

That way, if we ever change it so that e.g. the page is also used on SM screens, we won't have to update this logic.

Yes, that's the idea. Although looking more closely I see that the separate login page is used for both xs and sm screens. I should have checked that sooner.

I've implemented the Input(), passing "true" from the login-page template and "false" from auth-nav-menu template. Checked the result and it seems to be working.

mspalti · 2019-09-04T21:10:53Z

So I think this line in the AuthenticatedGuard class might be redundant now, but does no harm.

https://github.com/mspalti/dspace-angular/blob/f54a3a4d6b3319af83857b7af02e076f7de6037e/src/app/core/auth/authenticated.guard.ts#L65

atarix83 · 2019-09-05T13:57:29Z

@mspalti I'm sorry if I'm just answering now.
I can explain where is the issue.
The redirectUrl of the AuthState it was thought to keep track to the previous page before /login page. Indeed it is valued in the AuthGuard when a not-authenticated user try to access to a page that needs autentication (e.g. /submit). In this way after user is logged in, he is redirected to the previous route.
probably the simply way to resolve this issue should be to change redirectToPreviousUrl because is the cause of redirect to home page when the redirect url is empty

mspalti · 2019-09-05T21:45:31Z

Hi @atarix83

Thanks for the feedback. I see what you mean about the authentication guard. Based on further testing I don't think the snippet I mentioned is redundant!

So if I understand things correctly, there seem to be at least 4 contexts. Setting the redirectUrl for:

authentication guard logins (e.g. /submit) -- done in the guard
logins for expired tokens -- done in the AuthInterceptor
logins initiated from the application menu
logins initiated from a standalone login page (e.g. mobile)

The last two seem to require taking into account UI state. Specifically, for login requests initiated from the app menu the redirect url is the current page, for login requests from a standalone login page the redirect url is the previous page before the login.

@artlowel suggested passing in the standalone page status as component input. I've experimented a bit more, and think that the next step may be to add a doAuthentication method to AuthService that takes the login type, email, and password. Before dispatching the request, the method can set the correct redirect url. I thought about calling a method from ngOnInit, but that's not helpful when the component is embedded in the application menu. The call needs to happen when the user submits.

I'll update the PR with this suggestion.

mspalti · 2019-09-06T00:55:44Z

The latest idea (the doAuthentication() method in AuthService) works for me in each of the login scenarios. It would be nice if this method could just set the redirectUrl and not also dispatch the authentication action but I just wasn't sure that approach would be safe.

I also thought about passing the isStandalonePage boolean to redirectToPreviousUrl as an optional param. Still considering that idea.

mspalti · 2019-09-06T11:31:20Z

@atarix83, I can see that your recommendation is the best idea. If the redirectToPreviousUrl method is passed the new isStandalonePage value from the log-in component, then when the redirect url is empty (because not previously set in authentication guard, etc. ) we can get the redirect url from history.

I'll update redirectToPreviousUrl with the code from my test authentication method. If that works then I think this will be ready for review.

mspalti · 2019-09-09T18:50:23Z

@atarix83 @artlowel

I made the change to redirectToPreviousUrl and it seems to work as expected. This should be ready for review.

Unfortunately the travis build keeps failing with a typescript import error. Initially I guessed this might have something to do with angular modules, but that seems unlikely after more investigation. On my machine, I can build the project (yarn run build, etc) from the terminal and in Intellij. The ONLY import that is affected on travis is the new relative import of RouteService, and this import worked previously when I used it in the component (see passing build listed above).

mspalti · 2019-09-09T19:03:05Z

Actually, the travis error appeared on Friday... the same import had worked fine on Thursday.

… the user is returned to the same page after login).

… been set already.

… url. Also added check for mobile layout that forces setting of the redirect url.

Minor typedoc and import updates.

…nent is being used in the standalone login page or the drop-down.

…patches auth request.

…f no redirect url is found in the store. Removed unused import that was causing merge conflict. Once again try to fix merge conflict. Added routeService to server module providers. Changed order of providers. Minor change to ServerAuthService to make method signature consistent with AuthService. Try adding RouteService to browser-app module to see if that fixes travis build. One more try at getting the CI build to work. Removed change to browser module.

…base, test now passes.

mspalti · 2019-09-09T20:59:25Z

OK. I just needed to rebase to pick up the new path to RouteService. Tests now passing.

mspalti · 2019-09-10T18:01:27Z

src/app/core/auth/auth.service.ts

@@ -337,7 +339,7 @@ export class AuthService {
  /**
   * Redirect to the route navigated before the login
   */
-  public redirectToPreviousUrl() {
+  public redirectToPreviousUrl(isStandalonePage: boolean) {


Would it be a good idea to rename this method to something like redirectAfterLoginSuccess -- especially since the redirect is actually not to previous url in all cases?

Yes, I think that's better.

@mspalti please consider that in the auth service SSR instance there the same redirectToPreviousUrl that needs to be fixed too

Updated the method name.

artlowel

It looks good, so I'll approve it now.

Feel free to still change the name of that method if you like.

atarix83 · 2019-09-13T08:21:14Z

src/app/shared/log-in/log-in.component.ts

@@ -1,9 +1,9 @@
-import { filter, map, takeWhile } from 'rxjs/operators';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {filter, map, takeWhile } from 'rxjs/operators';


In this file some imports have spaces before/after curly braces but some imports don't have. in general spaces there should be

Thanks! I updated typescript settings in intellij to add the spaces & fixed these

mspalti · 2019-09-16T23:21:18Z

@atarix83 , you mentioned the SSR authService. Up to this point I have only changed the method signature, mostly because I didn't understand how redirection works in server rendered code.

Now that I've looked more, I think I basically understand how the redirectUrl is obtained and used server side. But I don't think browser history is similarly available, which means that my fix is not possible. And I'm not sure that this matters. It seems like user-initiated logins (and redirects) will always take place when the app is running in the browser.

Let me know if I missed something!

mspalti · 2019-09-17T19:37:46Z

I looked at transfer state and saw that, of course, the current url is added to history in state.

Using that history in the SSR authService is helpful when a page is reloaded by an authenticated user. The server side knows to render the current page (and not home). So I am making this change.

atarix83

@mspalti thanks for the changes
It looks good to me now

tdonohue · 2019-09-19T15:29:55Z

This is at +2, so merging. Thanks @mspalti !

mspalti · 2019-10-22T16:56:02Z

Relates to #451

mspalti added the needs review label Aug 28, 2019

artlowel reviewed Sep 4, 2019

View reviewed changes

mspalti added 10 commits September 9, 2019 12:39

Modified the log-in component to set the redirectUrl in AuthState (so…

6360d5a

… the user is returned to the same page after login).

Fixed the unit test (and added a typedoc)

db326a7

Modified log-in component to set the redirect url only if one has not…

c6156c5

… been set already.

Modifed log-in component to use LOGIN_ROUTE when setting the redirect…

fcaf018

… url. Also added check for mobile layout that forces setting of the redirect url.

Modified mobile log-in to use history as provided by the store.

54fc57d

Minor typedoc and import updates.

Added @input to the log-in component that indicates whether the compo…

f0813fc

…nent is being used in the standalone login page or the drop-down.

Proposed authentication service method that sets redirect url and dis…

0935bd4

…patches auth request.

A little cleanup in unit tests.

c3102b9

Removed the router injection that slipped into auth service during re…

6425f6e

…base, test now passes.

mspalti commented Sep 10, 2019

View reviewed changes

artlowel approved these changes Sep 12, 2019

View reviewed changes

atarix83 reviewed Sep 13, 2019

View reviewed changes

Changed method name.

8fe617b

mspalti added 3 commits September 17, 2019 12:44

Added new auth redirect code for ssr.

e70b9c5

Minor update of the imports in unit test.

73dd014

Removed unnecessary import in unit test.

ca04873

atarix83 approved these changes Sep 19, 2019

View reviewed changes

tdonohue merged commit d85cc0a into DSpace:master Sep 19, 2019

mspalti mentioned this pull request Oct 18, 2019

Login action always redirects to homepage #451

Closed

LotteHofstede mentioned this pull request Nov 12, 2019

Redirecting after login breaks query parameters #510

Closed

tdonohue added this to the 7.0beta1 milestone Jan 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Redirecting user to same page after login. #467

Redirecting user to same page after login. #467

mspalti commented Aug 28, 2019 •

edited

Loading

artlowel commented Aug 29, 2019

mspalti commented Aug 29, 2019 •

edited

Loading

mspalti commented Aug 29, 2019

mspalti commented Aug 30, 2019 •

edited

Loading

mspalti commented Sep 4, 2019 •

edited

Loading

artlowel Sep 4, 2019

mspalti Sep 4, 2019 •

edited

Loading

mspalti commented Sep 4, 2019

atarix83 commented Sep 5, 2019

mspalti commented Sep 5, 2019

mspalti commented Sep 6, 2019 •

edited

Loading

mspalti commented Sep 6, 2019

mspalti commented Sep 9, 2019

mspalti commented Sep 9, 2019

mspalti commented Sep 9, 2019

mspalti Sep 10, 2019

artlowel Sep 12, 2019

atarix83 Sep 13, 2019

atarix83 Sep 13, 2019

mspalti Sep 16, 2019

artlowel left a comment •

edited

Loading

atarix83 Sep 13, 2019

mspalti Sep 16, 2019

mspalti commented Sep 16, 2019

mspalti commented Sep 17, 2019

atarix83 left a comment

tdonohue commented Sep 19, 2019

mspalti commented Oct 22, 2019

Redirecting user to same page after login. #467

Redirecting user to same page after login. #467

Conversation

mspalti commented Aug 28, 2019 • edited Loading

artlowel commented Aug 29, 2019

mspalti commented Aug 29, 2019 • edited Loading

mspalti commented Aug 29, 2019

mspalti commented Aug 30, 2019 • edited Loading

mspalti commented Sep 4, 2019 • edited Loading

Choose a reason for hiding this comment

mspalti Sep 4, 2019 • edited Loading

Choose a reason for hiding this comment

mspalti commented Sep 4, 2019

atarix83 commented Sep 5, 2019

mspalti commented Sep 5, 2019

mspalti commented Sep 6, 2019 • edited Loading

mspalti commented Sep 6, 2019

mspalti commented Sep 9, 2019

mspalti commented Sep 9, 2019

mspalti commented Sep 9, 2019

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

artlowel left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mspalti commented Sep 16, 2019

mspalti commented Sep 17, 2019

atarix83 left a comment

Choose a reason for hiding this comment

tdonohue commented Sep 19, 2019

mspalti commented Oct 22, 2019

mspalti commented Aug 28, 2019 •

edited

Loading

mspalti commented Aug 29, 2019 •

edited

Loading

mspalti commented Aug 30, 2019 •

edited

Loading

mspalti commented Sep 4, 2019 •

edited

Loading

mspalti Sep 4, 2019 •

edited

Loading

mspalti commented Sep 6, 2019 •

edited

Loading

artlowel left a comment •

edited

Loading