Onboarding: improve password flow (#27246)
This commit is contained in:
parent
848043e8bb
commit
d5df743d8a
2 changed files with 27 additions and 20 deletions
|
|
@ -55,6 +55,13 @@ func updatePasswordHandler(authObject auth.Auth) http.HandlerFunc {
|
|||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
// auto-login: set auth cookie
|
||||
if err := setAuthCookie(authObject, w); err != nil {
|
||||
http.Error(w, "Failed to generate JWT token.", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
}
|
||||
}
|
||||
|
|
@ -103,6 +110,24 @@ func authStatusHandler(authObject auth.Auth) http.HandlerFunc {
|
|||
}
|
||||
}
|
||||
|
||||
func setAuthCookie(authObject auth.Auth, w http.ResponseWriter) error {
|
||||
lifetime := time.Hour * 24 * 90 // 90 day valid
|
||||
tokenString, err := authObject.GenerateJwtToken(lifetime)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
http.SetCookie(w, &http.Cookie{
|
||||
Name: authCookieName,
|
||||
Value: tokenString,
|
||||
Path: "/",
|
||||
HttpOnly: true,
|
||||
Expires: time.Now().Add(lifetime),
|
||||
SameSite: http.SameSiteStrictMode,
|
||||
})
|
||||
return nil
|
||||
}
|
||||
|
||||
func loginHandler(authObject auth.Auth) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
if authObject.GetAuthMode() == auth.Locked {
|
||||
|
|
@ -121,21 +146,10 @@ func loginHandler(authObject auth.Auth) http.HandlerFunc {
|
|||
return
|
||||
}
|
||||
|
||||
lifetime := time.Hour * 24 * 90 // 90 day valid
|
||||
tokenString, err := authObject.GenerateJwtToken(lifetime)
|
||||
if err != nil {
|
||||
if err := setAuthCookie(authObject, w); err != nil {
|
||||
http.Error(w, "Failed to generate JWT token.", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
http.SetCookie(w, &http.Cookie{
|
||||
Name: authCookieName,
|
||||
Value: tokenString,
|
||||
Path: "/",
|
||||
HttpOnly: true,
|
||||
Expires: time.Now().Add(lifetime),
|
||||
SameSite: http.SameSiteStrictMode,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,14 +29,7 @@ test.describe("onboarding", async () => {
|
|||
await expect(page.locator("body")).toContainText("Hello aboard!");
|
||||
await page.getByRole("link", { name: "Let's start configuration" }).click();
|
||||
|
||||
// login
|
||||
const login = page.getByTestId("login-modal");
|
||||
await expectModalVisible(login);
|
||||
await login.getByLabel("Administrator Password").fill(PASSWORD);
|
||||
await login.getByRole("button", { name: "Login" }).click();
|
||||
await expectModalHidden(login);
|
||||
|
||||
// config page
|
||||
// config page (already logged in from password creation)
|
||||
await expect(page.getByRole("heading", { name: "Configuration" })).toBeVisible();
|
||||
await expect(page.getByTestId("welcome-banner")).toBeVisible();
|
||||
await expect(page.getByTestId("welcome-banner")).toContainText("Start with creating a");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue