TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-06-11 22:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(console): add customer portal link (#3837)

Browse Source 
* feat: add customer portal link

* add customer portal to environment.json from backend

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Max Peintner 2022-06-24 13:18:54 +02:00 committed by GitHub
parent f4e91f0b5b
commit 70a108deeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 65 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/admin/start/config.go
View File

@ -51,6 +51,7 @@ type Config struct {
DefaultInstance command.InstanceSetup
AuditLogRetention time.Duration
SystemAPIUsers map[string]*internal_authz.SystemAPIUser
CustomerPortal string
}
func MustNewConfig(v *viper.Viper) *Config {

2
cmd/admin/start/start.go
View File

@ -194,7 +194,7 @@ func startAPIs(ctx context.Context, router *mux.Router, commands *command.Comman
return fmt.Errorf("unable to start oidc provider: %w", err)
}
c, err := console.Start(config.Console, config.ExternalSecure, oidcProvider.IssuerFromRequest, instanceInterceptor.Handler)
c, err := console.Start(config.Console, config.ExternalSecure, oidcProvider.IssuerFromRequest, instanceInterceptor.Handler, config.CustomerPortal)
if err != nil {
return fmt.Errorf("unable to start console: %w", err)
}

13
console/src/app/modules/nav/nav.component.html
View File

@ -70,6 +70,19 @@
<span> {{ 'MENU.SETTINGS' | translate }} </span>
</div>
</a>
<a
*ngIf="customerPortalLink"
class="nav-item external-link"
[href]="customerPortalLink"
target="_blank"
rel="noreferrer"
>
<div class="c_label">
<span> {{ 'MENU.CUSTOMERPORTAL' | translate }} </span>
</div>
<i class="las la-external-link-alt"></i>
</a>
</ng-template>
<template [ngTemplateOutlet]="shortcutKeyRef"></template>

11
console/src/app/modules/nav/nav.component.scss
View File

@ -63,6 +63,7 @@
font-weight: 500;
margin: 0.25rem 2px;
white-space: nowrap;
position: relative;
.c_label {
display: flex;
@ -75,6 +76,16 @@
}
}
&.external-link {
padding-right: 2rem;
i {
position: absolute;
right: 8px;
font-size: 1.2rem;
}
}
&:hover {
background: if($is-dark-theme, #ffffff40, #00000010);
}

17
console/src/app/modules/nav/nav.component.ts
View File

@ -1,9 +1,10 @@
import { animate, keyframes, style, transition, trigger } from '@angular/animations';
import { BreakpointObserver } from '@angular/cdk/layout';
import { HttpClient } from '@angular/common/http';
import { Component, ElementRef, Input, OnDestroy, ViewChild } from '@angular/core';
import { FormControl } from '@angular/forms';
import { Router } from '@angular/router';
import { BehaviorSubject, map, Observable, Subject } from 'rxjs';
import { BehaviorSubject, map, Observable, Subject, take } from 'rxjs';
import { Org } from 'src/app/proto/generated/zitadel/org_pb';
import { LabelPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { User } from 'src/app/proto/generated/zitadel/user_pb';
@ -87,6 +88,7 @@ export class NavComponent implements OnDestroy {
private destroy$: Subject<void> = new Subject();
public BreadcrumbType: any = BreadcrumbType;
public customerPortalLink: string = '';
constructor(
public authenticationService: AuthenticationService,
@ -94,9 +96,22 @@ export class NavComponent implements OnDestroy {
public mgmtService: ManagementService,
private router: Router,
private breakpointObserver: BreakpointObserver,
private http: HttpClient,
private shortcutService: KeyboardShortcutsService,
) {
this.hideAdminWarn = localStorage.getItem('hideAdministratorWarning') === 'true' ? true : false;
this.loadEnvironment();
}
public loadEnvironment(): void {
this.http
.get('./assets/environment.json')
.pipe(take(1))
.subscribe((data: any) => {
if (data && data.customer_portal) {
this.customerPortalLink = data.customer_portal;
}
});
}
public toggleAdminHide(): void {

7
console/src/assets/environment.json
View File

@ -1 +1,6 @@
{ "api": "https://zitadel.cloud", "issuer": "https://zitadel.cloud/oauth/v2", "clientid": "163447659854627073@zitadel" }
{
"api": "https://bringmos-jv1jqo.zitadel.app",
"issuer": "https://bringmos-jv1jqo.zitadel.app",
"clientid": "163706959596355841@zitadel",
"customer_portal": "https://zitadel.cloud"
}

3
console/src/assets/i18n/de.json
View File

@ -68,7 +68,8 @@
"PRIVACY": "Datenschutz",
"TOS": "AGB",
"OPENSHORTCUTSTOOLTIP": "Tippe ? um die Tastaturkürzel anzuzeigen",
"SETTINGS": "Einstellungen"
"SETTINGS": "Einstellungen",
"CUSTOMERPORTAL": "Customer Portal"
},
"ACTIONS": {
"ACTIONS": "Aktionen",

3
console/src/assets/i18n/en.json
View File

@ -68,7 +68,8 @@
"PRIVACY": "Privacy",
"TOS": "Terms of Service",
"OPENSHORTCUTSTOOLTIP": "Type ? to show keyboard shortcuts",
"SETTINGS": "Settings"
"SETTINGS": "Settings",
"CUSTOMERPORTAL": "Customer Portal"
},
"ACTIONS": {
"ACTIONS": "Actions",

3
console/src/assets/i18n/it.json
View File

@ -68,7 +68,8 @@
"PRIVACY": "Informativa sulla privacy",
"TOS": "Termini di servizio",
"OPENSHORTCUTSTOOLTIP": "Premi ? per mostrare le scorciatoie da tastiera",
"SETTINGS": "Impostazioni"
"SETTINGS": "Impostazioni",
"CUSTOMERPORTAL": "Customer Portal"
},
"ACTIONS": {
"ACTIONS": "Azioni",

20
internal/api/ui/console/console.go
View File

@ -84,7 +84,7 @@ func (f *file) Stat() (_ fs.FileInfo, err error) {
return f, nil
}
func Start(config Config, externalSecure bool, issuer op.IssuerFromRequest, instanceHandler func(http.Handler) http.Handler) (http.Handler, error) {
func Start(config Config, externalSecure bool, issuer op.IssuerFromRequest, instanceHandler func(http.Handler) http.Handler, customerPortal string) (http.Handler, error) {
fSys, err := fs.Sub(static, "static")
if err != nil {
return nil, err
@ -106,7 +106,7 @@ func Start(config Config, externalSecure bool, issuer op.IssuerFromRequest, inst
return
}
url := http_util.BuildOrigin(r.Host, externalSecure)
environmentJSON, err := createEnvironmentJSON(url, issuer(r), instance.ConsoleClientID())
environmentJSON, err := createEnvironmentJSON(url, issuer(r), instance.ConsoleClientID(), customerPortal)
if err != nil {
http.Error(w, fmt.Sprintf("unable to marshal env for console: %v", err), http.StatusInternalServerError)
return
@ -127,15 +127,17 @@ func csp() *middleware.CSP {
return &csp
}
func createEnvironmentJSON(api, issuer, clientID string) ([]byte, error) {
func createEnvironmentJSON(api, issuer, clientID, customerPortal string) ([]byte, error) {
environment := struct {
API string `json:"api,omitempty"`
Issuer string `json:"issuer,omitempty"`
ClientID string `json:"clientid,omitempty"`
API string `json:"api,omitempty"`
Issuer string `json:"issuer,omitempty"`
ClientID string `json:"clientid,omitempty"`
CustomerPortal string `json:"customer_portal,omitempty"`
}{
API: api,
Issuer: issuer,
ClientID: clientID,
API: api,
Issuer: issuer,
ClientID: clientID,
CustomerPortal: customerPortal,
}
return json.Marshal(environment)
}