Revision 56922
Added by Konstantinos Triantafyllou almost 5 years ago
| modules/uoa-services-library/trunk/ng-openaire-library/src/app/utils/properties/env-properties.ts | ||
|---|---|---|
| 89 | 89 |
//base url for OpenAIRE portal |
| 90 | 90 |
baseOpenaireLink; |
| 91 | 91 |
|
| 92 |
// after login redirect Link |
|
| 93 |
afterLoginRedirectLink; |
|
| 94 |
|
|
| 92 | 95 |
//landing Pages |
| 93 | 96 |
|
| 94 | 97 |
searchLinkToPublication; |
| modules/uoa-services-library/trunk/ng-openaire-library/src/app/login/userMini.component.ts | ||
|---|---|---|
| 81 | 81 |
@Input() logInUrl; |
| 82 | 82 |
@Input() logOutUrl; |
| 83 | 83 |
@Input() cookieDomain; |
| 84 |
@Input() communityId = null; |
|
| 85 |
public redirectUrl: string = ""; |
|
| 84 |
@Input() redirectUrl: string; |
|
| 86 | 85 |
sub:any; |
| 87 | 86 |
|
| 88 | 87 |
constructor( private router: Router, private route: ActivatedRoute, private location: Location) {}
|
| ... | ... | |
| 104 | 103 |
} |
| 105 | 104 |
|
| 106 | 105 |
initialize(){
|
| 107 |
this.redirectUrl = this.location.path(); |
|
| 106 |
if(!this.redirectUrl) {
|
|
| 107 |
this.redirectUrl = location.pathname; |
|
| 108 |
} |
|
| 108 | 109 |
if(Session.isLoggedIn()){
|
| 109 | 110 |
this.loggedIn = true; |
| 110 | 111 |
this.user = Session.getUser(); |
| ... | ... | |
| 134 | 135 |
} |
| 135 | 136 |
|
| 136 | 137 |
logIn(){
|
| 137 |
if(this.communityId && this.communityId === 'connect') {
|
|
| 138 |
Session.setReloadUrl(location.protocol +"//"+location.host, '/myCommunities', null); |
|
| 139 |
} |
|
| 140 |
else {
|
|
| 141 |
Session.setReloadUrl(location.protocol +"//"+location.host, location.pathname, location.search); |
|
| 142 |
} |
|
| 138 |
Session.setReloadUrl(location.protocol +"//"+location.host, this.redirectUrl, location.search); |
|
| 143 | 139 |
window.location.href = this.logInUrl; |
| 144 | 140 |
} |
| 145 | 141 |
|
| modules/uoa-services-library/trunk/ng-openaire-library/src/app/sharedComponents/navigationBar.component.html | ||
|---|---|---|
| 69 | 69 |
</ng-container> |
| 70 | 70 |
</ng-container> |
| 71 | 71 |
<ng-container *ngIf="userMenu"> |
| 72 |
<user-mini mobileView=true [communityId]="(communityId)?communityId:properties.adminToolsCommunity" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
|
|
| 72 |
<user-mini mobileView=true [redirectUrl]="(communityId)?null:properties.afterLoginRedirectLink" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
|
|
| 73 | 73 |
</ng-container> |
| 74 | 74 |
</ul> |
| 75 | 75 |
</div> |
| ... | ... | |
| 196 | 196 |
<!-- </div> --> |
| 197 | 197 |
<!-- <div *ngIf="userMenu" class="uk-navbar-right"> --> |
| 198 | 198 |
<!-- <div *ngIf="userMenu" class="uk-navbar-right"> --> |
| 199 |
<user-mini *ngIf="userMenu" [communityId]="(communityId)?communityId:properties.adminToolsCommunity" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
|
|
| 199 |
<user-mini *ngIf="userMenu" [redirectUrl]="(communityId)?null:properties.afterLoginRedirectLink" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
|
|
| 200 | 200 |
|
| 201 | 201 |
</div> |
| 202 | 202 |
</nav> |
Also available in: Unified diff
Add property afterLoginRedirect and use it user-mini to redirect after login.