TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 17:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: enable insecure console

Browse Source
This commit is contained in:
Elio Bischof
2022-06-14 11:55:18 +02:00
parent dd2f31683c
commit e6c10ae937
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
console/src/app/services/grpc.service.ts
View File

@@ -72,6 +72,7 @@ export class GrpcService {
issuer: data.issuer, issuer: data.issuer,
redirectUri: window.location.origin + this.platformLocation.getBaseHrefFromDOM() + 'auth/callback', redirectUri: window.location.origin + this.platformLocation.getBaseHrefFromDOM() + 'auth/callback',
postLogoutRedirectUri: window.location.origin + this.platformLocation.getBaseHrefFromDOM() + 'signedout', postLogoutRedirectUri: window.location.origin + this.platformLocation.getBaseHrefFromDOM() + 'signedout',
requireHttps: data.secure,
}; };
this.authenticationService.initConfig(authConfig); this.authenticationService.initConfig(authConfig);

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

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