Route OIDC failures through shared auth error page
A dedicated personal-account page does not scale as more refusal reasons appear. Redirect the OIDC callback to /auth/error with an error code query parameter so the frontend can map codes to clear user-facing messages. Signed-off-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Bryan FRIMIN <bryan@frimin.fr>
This commit is contained in:
committed by
Cursor Agent
parent
d1814d7051
commit
6c4a67d3f7
@@ -21,21 +21,46 @@
|
|||||||
import { usePageTitle } from "@probo/hooks";
|
import { usePageTitle } from "@probo/hooks";
|
||||||
import { useTranslate } from "@probo/i18n";
|
import { useTranslate } from "@probo/i18n";
|
||||||
import { Button } from "@probo/ui";
|
import { Button } from "@probo/ui";
|
||||||
|
import { useSearchParams } from "react-router";
|
||||||
|
|
||||||
export default function PersonalAccountNotAllowedPage() {
|
type AuthErrorContent = {
|
||||||
|
title: string;
|
||||||
|
description: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function useAuthErrorContent(code: string | null): AuthErrorContent {
|
||||||
const { __ } = useTranslate();
|
const { __ } = useTranslate();
|
||||||
|
|
||||||
usePageTitle(__("Enterprise account required"));
|
switch (code) {
|
||||||
|
case "personal_account_not_allowed":
|
||||||
|
return {
|
||||||
|
title: __("Enterprise account required"),
|
||||||
|
description: __(
|
||||||
|
"Personal Google and Microsoft accounts cannot be used to sign in. Please use your work or school account instead.",
|
||||||
|
),
|
||||||
|
};
|
||||||
|
default:
|
||||||
|
return {
|
||||||
|
title: __("Authentication failed"),
|
||||||
|
description: __(
|
||||||
|
"We could not complete your sign-in. Please try again.",
|
||||||
|
),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function AuthErrorPage() {
|
||||||
|
const { __ } = useTranslate();
|
||||||
|
const [searchParams] = useSearchParams();
|
||||||
|
const content = useAuthErrorContent(searchParams.get("error"));
|
||||||
|
|
||||||
|
usePageTitle(content.title);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-6 w-full">
|
<div className="space-y-6 w-full">
|
||||||
<div className="space-y-2 text-center">
|
<div className="space-y-2 text-center">
|
||||||
<h1 className="text-2xl font-bold">{__("Enterprise account required")}</h1>
|
<h1 className="text-2xl font-bold">{content.title}</h1>
|
||||||
<p className="text-txt-tertiary">
|
<p className="text-txt-tertiary">{content.description}</p>
|
||||||
{__(
|
|
||||||
"Personal Google and Microsoft accounts cannot be used to sign in. Please use your work or school account instead.",
|
|
||||||
)}
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
<Button className="w-full h-10" to="/auth/login">
|
<Button className="w-full h-10" to="/auth/login">
|
||||||
{__("Sign in")}
|
{__("Sign in")}
|
||||||
@@ -128,10 +128,8 @@ const routes = [
|
|||||||
Component: lazy(() => import("./pages/iam/auth/MagicLinkAlreadyUsedPage")),
|
Component: lazy(() => import("./pages/iam/auth/MagicLinkAlreadyUsedPage")),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: "personal-account-not-allowed",
|
path: "error",
|
||||||
Component: lazy(
|
Component: lazy(() => import("./pages/iam/auth/AuthErrorPage")),
|
||||||
() => import("./pages/iam/auth/PersonalAccountNotAllowedPage"),
|
|
||||||
),
|
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
|||||||
43
pkg/server/api/connect/v1/auth_error.go
Normal file
43
pkg/server/api/connect/v1/auth_error.go
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
// SOFTWARE.
|
||||||
|
|
||||||
|
package connect_v1
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
authErrorPersonalAccountNotAllowed = "personal_account_not_allowed"
|
||||||
|
authErrorAuthenticationFailed = "authentication_failed"
|
||||||
|
)
|
||||||
|
|
||||||
|
func redirectAuthError(w http.ResponseWriter, r *http.Request, code string) {
|
||||||
|
q := url.Values{}
|
||||||
|
q.Set("error", code)
|
||||||
|
|
||||||
|
redirectURL := url.URL{
|
||||||
|
Path: "/auth/error",
|
||||||
|
RawQuery: q.Encode(),
|
||||||
|
}
|
||||||
|
|
||||||
|
http.Redirect(w, r, redirectURL.String(), http.StatusFound)
|
||||||
|
}
|
||||||
45
pkg/server/api/connect/v1/auth_error_test.go
Normal file
45
pkg/server/api/connect/v1/auth_error_test.go
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
// Copyright (c) 2026 Probo Inc <hello@probo.com>.
|
||||||
|
//
|
||||||
|
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
// of this software and associated documentation files (the "Software"), to deal
|
||||||
|
// in the Software without restriction, including without limitation the rights
|
||||||
|
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
// copies of the Software, and to permit persons to whom the Software is
|
||||||
|
// furnished to do so, subject to the following conditions:
|
||||||
|
//
|
||||||
|
// The above copyright notice and this permission notice shall be included in
|
||||||
|
// all copies or substantial portions of the Software.
|
||||||
|
//
|
||||||
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
// SOFTWARE.
|
||||||
|
|
||||||
|
package connect_v1
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/assert"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestRedirectAuthError(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
req := httptest.NewRequest(http.MethodGet, "/api/connect/v1/oidc/google/callback", nil)
|
||||||
|
rec := httptest.NewRecorder()
|
||||||
|
|
||||||
|
redirectAuthError(rec, req, authErrorPersonalAccountNotAllowed)
|
||||||
|
|
||||||
|
assert.Equal(t, http.StatusFound, rec.Code)
|
||||||
|
location, err := rec.Result().Location()
|
||||||
|
require.NoError(t, err)
|
||||||
|
assert.Equal(t, "/auth/error", location.Path)
|
||||||
|
assert.Equal(t, authErrorPersonalAccountNotAllowed, location.Query().Get("error"))
|
||||||
|
}
|
||||||
@@ -116,7 +116,7 @@ func (h *OIDCHandler) CallbackHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
log.String("error", errParam),
|
log.String("error", errParam),
|
||||||
log.String("error_description", r.URL.Query().Get("error_description")),
|
log.String("error_description", r.URL.Query().Get("error_description")),
|
||||||
)
|
)
|
||||||
httpserver.RenderError(w, http.StatusUnauthorized, errors.New("authentication failed"))
|
redirectAuthError(w, r, authErrorAuthenticationFailed)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -133,13 +133,13 @@ func (h *OIDCHandler) CallbackHandler(w http.ResponseWriter, r *http.Request) {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
if _, ok := errors.AsType[*oidc.ErrPersonalAccountNotAllowed](err); ok {
|
if _, ok := errors.AsType[*oidc.ErrPersonalAccountNotAllowed](err); ok {
|
||||||
h.logger.WarnCtx(ctx, "OIDC login rejected: personal account not allowed")
|
h.logger.WarnCtx(ctx, "OIDC login rejected: personal account not allowed")
|
||||||
http.Redirect(w, r, "/auth/personal-account-not-allowed", http.StatusFound)
|
redirectAuthError(w, r, authErrorPersonalAccountNotAllowed)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
h.logger.ErrorCtx(ctx, "cannot handle OIDC callback", log.Error(err))
|
h.logger.ErrorCtx(ctx, "cannot handle OIDC callback", log.Error(err))
|
||||||
httpserver.RenderError(w, http.StatusUnauthorized, errors.New("authentication failed"))
|
redirectAuthError(w, r, authErrorAuthenticationFailed)
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user