Fix getting host
This commit is contained in:
parent
4e48320cf1
commit
36d9861517
|
@ -24,7 +24,9 @@ FROM alpine:latest
|
|||
WORKDIR /root/
|
||||
RUN mkdir app dashboard
|
||||
COPY --from=node-builder /authorizer/app/build app/build
|
||||
COPY --from=node-builder /authorizer/app/favicon_io app/favicon_io
|
||||
COPY --from=node-builder /authorizer/dashboard/build dashboard/build
|
||||
COPY --from=node-builder /authorizer/dashboard/favicon_io dashboard/favicon_io
|
||||
COPY --from=go-builder /authorizer/build build
|
||||
COPY templates templates
|
||||
EXPOSE 8080
|
||||
|
|
|
@ -9,9 +9,11 @@ const Dashboard = lazy(() => import('./pages/dashboard'));
|
|||
export default function Root() {
|
||||
const { token, loading, config } = useAuthorizer();
|
||||
|
||||
console.log(config);
|
||||
useEffect(() => {
|
||||
if (token) {
|
||||
const url = new URL(config.redirectURL || '/app');
|
||||
console.log('=> url', url);
|
||||
if (url.origin !== window.location.origin) {
|
||||
window.location.href = config.redirectURL || '/app';
|
||||
}
|
||||
|
|
|
@ -33,10 +33,8 @@ func AppHandler() gin.HandlerFunc {
|
|||
var stateObj State
|
||||
|
||||
if state == "" {
|
||||
|
||||
stateObj.AuthorizerURL = hostname
|
||||
stateObj.RedirectURL = stateObj.AuthorizerURL + "/app"
|
||||
|
||||
stateObj.RedirectURL = hostname + "/app"
|
||||
} else {
|
||||
decodedState, err := utils.DecryptB64(state)
|
||||
if err != nil {
|
||||
|
|
|
@ -10,12 +10,13 @@ import (
|
|||
|
||||
// GetHost returns hostname from request context
|
||||
func GetHost(c *gin.Context) string {
|
||||
scheme := "http"
|
||||
if c.Request.TLS != nil {
|
||||
scheme = "https"
|
||||
scheme := c.Request.Header.Get("X-Forwarded-Proto")
|
||||
if scheme != "https" {
|
||||
scheme = "http"
|
||||
}
|
||||
log.Println("=> url:", scheme+"://"+c.Request.Host)
|
||||
return scheme + "://" + c.Request.Host
|
||||
host := c.Request.Host
|
||||
log.Println("=> host:", scheme+"://"+host)
|
||||
return scheme + "://" + host
|
||||
}
|
||||
|
||||
// GetHostName function returns hostname and port
|
||||
|
|
Loading…
Reference in New Issue
Block a user