Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .github/workflows/partial-frontend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ jobs:
with:
fetch-depth: 0

- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
with:
node-version: lts/*

- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061
with:
version: 10
Expand Down
2 changes: 2 additions & 0 deletions backend/app/api/handlers/v1/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ type (
ButtonText string `json:"buttonText,omitempty"`
AutoRedirect bool `json:"autoRedirect,omitempty"`
AllowLocal bool `json:"allowLocal"`
Initialized bool `json:"initialized"`
}

TelemetryStatus struct {
Expand Down Expand Up @@ -166,6 +167,7 @@ func (ctrl *V1Controller) HandleBase(ready ReadyFunc, build Build) errchain.Hand
ButtonText: ctrl.config.OIDC.ButtonText,
AutoRedirect: ctrl.config.OIDC.AutoRedirect,
AllowLocal: ctrl.config.Options.AllowLocalLogin,
Initialized: ctrl.oidcProvider != nil,
},
Telemetry: TelemetryStatus{
Enabled: ctrl.config.Otel.Enabled,
Expand Down
1 change: 1 addition & 0 deletions frontend/lib/api/types/data-contracts.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions frontend/pages/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,13 @@
}

// Auto-redirect to OIDC if autoRedirect is enabled, but not if there's an OIDC initialization error
if (status?.oidc?.enabled && status?.oidc?.autoRedirect && !oidcError.value && !shownErrorMessage.value) {
if (
status?.oidc?.enabled &&
status?.oidc?.initialized &&
status?.oidc?.autoRedirect &&
!oidcError.value &&
!shownErrorMessage.value
) {
loginWithOIDC();
}
});
Expand Down Expand Up @@ -384,7 +390,7 @@
</div>

<Button
v-if="status?.oidc?.enabled"
v-if="status?.oidc?.enabled && status?.oidc?.initialized"
type="button"
variant="outline"
class="w-full"
Expand Down
Loading