Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Editor]: Allow logging out #1039

Merged
merged 11 commits into from
Nov 25, 2024
Merged

[Editor]: Allow logging out #1039

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cab7424
feat: add logout url logic
cmoinier Nov 14, 2024
c22bf1c
feat: implement logout in sidebar
cmoinier Nov 14, 2024
b514139
feat: add ut and e2e
cmoinier Nov 14, 2024
cd1cb35
feat: add translations
cmoinier Nov 14, 2024
ab0d566
fix: add logout url in ut fixture
cmoinier Nov 14, 2024
07f9e57
feat: shorten logout urls
cmoinier Nov 15, 2024
ca25e58
fix: use actual host instead
cmoinier Nov 18, 2024
69c6f3d
fix: change token name
cmoinier Nov 18, 2024
9aae019
fix: add avatar-based logout test
cmoinier Nov 18, 2024
562d37e
fix: add translation for alt
cmoinier Nov 18, 2024
08547bb
feat: replace window.location with window.origin
cmoinier Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,14 @@
<gn-ui-button
type="default"
class="w-10 h-10 flex justify-center items-center hover:cursor-pointer"
(click)="logOut()"
>
<img src="assets/system-shut.svg" alt="Log out" class="w-4 h-4" />
<img
src="assets/system-shut.svg"
alt="Log out"
cmoinier marked this conversation as resolved.
Show resolved Hide resolved
[title]="'editor.sidebar.logout' | translate"
class="w-4 h-4 hover:invert-[.5]"
/>
</gn-ui-button>
</div>
</ng-container>
Expand Down
24 changes: 22 additions & 2 deletions apps/metadata-editor/src/app/dashboard/sidebar/sidebar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'
import { TranslateModule } from '@ngx-translate/core'
import { DashboardMenuComponent } from '../dashboard-menu/dashboard-menu.component'
import { PlatformServiceInterface } from '@geonetwork-ui/common/domain/platform.service.interface'
import { AvatarServiceInterface } from '@geonetwork-ui/api/repository'
import {
AuthService,
AvatarServiceInterface,
} from '@geonetwork-ui/api/repository'
import { LetDirective } from '@ngrx/component'
import { UiElementsModule } from '@geonetwork-ui/ui/elements'
import { OrganizationsServiceInterface } from '@geonetwork-ui/common/domain/organizations.service.interface'
Expand Down Expand Up @@ -31,7 +34,8 @@ export class SidebarComponent implements OnInit {
constructor(
public platformService: PlatformServiceInterface,
private avatarService: AvatarServiceInterface,
public organisationsService: OrganizationsServiceInterface
public organisationsService: OrganizationsServiceInterface,
private authService: AuthService
) {}

ngOnInit(): void {
Expand All @@ -41,4 +45,20 @@ export class SidebarComponent implements OnInit {
(orgs, me) => orgs.filter((org) => org.name === me?.organisation)
)
}

logOut() {
fetch(this.authService.logoutUrl, {
method: 'GET',
})
.then((response) => {
if (response.ok) {
window.location.href = 'http://localhost:4200'
cmoinier marked this conversation as resolved.
Show resolved Hide resolved
} else {
console.error('Logout failed')
}
})
.catch((error) => {
console.error('Error during logout request:', error)
})
}
}