diff --git a/api/v1/jwt.go b/api/v1/jwt.go index 7dd54b5..68f7e71 100644 --- a/api/v1/jwt.go +++ b/api/v1/jwt.go @@ -84,7 +84,7 @@ func JWTMiddleware(server *APIV1Service, next echo.HandlerFunc, secret string) e token := findAccessToken(c) if token == "" { // When the request is not authenticated, we allow the user to access the shortcut endpoints for those public shortcuts. - if util.HasPrefixes(path, "/api/v1/workspace/status", "/s/*") && method == http.MethodGet { + if util.HasPrefixes(path, "/api/v1/workspace/profile", "/s/*") && method == http.MethodGet { return next(c) } return echo.NewHTTPError(http.StatusUnauthorized, "Missing access token") diff --git a/api/v1/workspace.go b/api/v1/workspace.go index d2cc034..991c36f 100644 --- a/api/v1/workspace.go +++ b/api/v1/workspace.go @@ -49,16 +49,17 @@ func (upsert WorkspaceSettingUpsert) Validate() error { return nil } -type WorkspaceStatus struct { +type WorkspaceProfile struct { Profile *profile.Profile `json:"profile"` DisallowSignUp bool `json:"disallowSignUp"` } func (s *APIV1Service) registerWorkspaceRoutes(g *echo.Group) { - g.GET("/workspace/status", func(c echo.Context) error { + g.GET("/workspace/profile", func(c echo.Context) error { ctx := c.Request().Context() - workspaceStatus := WorkspaceStatus{ - Profile: s.Profile, + workspaceProfile := WorkspaceProfile{ + Profile: s.Profile, + DisallowSignUp: false, } disallowSignUpSetting, err := s.Store.GetWorkspaceSetting(ctx, &store.FindWorkspaceSetting{ @@ -68,10 +69,10 @@ func (s *APIV1Service) registerWorkspaceRoutes(g *echo.Group) { return echo.NewHTTPError(http.StatusInternalServerError, "Failed to get workspace setting") } if disallowSignUpSetting != nil { - workspaceStatus.DisallowSignUp = disallowSignUpSetting.Value == "true" + workspaceProfile.DisallowSignUp = disallowSignUpSetting.Value == "true" } - return c.JSON(http.StatusOK, workspaceStatus) + return c.JSON(http.StatusOK, workspaceProfile) }) g.POST("/workspace/setting", func(c echo.Context) error { diff --git a/web/src/components/setting/WorkspaceSection.tsx b/web/src/components/setting/WorkspaceSection.tsx index f969d54..74b7f25 100644 --- a/web/src/components/setting/WorkspaceSection.tsx +++ b/web/src/components/setting/WorkspaceSection.tsx @@ -1,12 +1,12 @@ import { Checkbox } from "@mui/joy"; import { useEffect, useState } from "react"; -import { getSystemStatus, upsertWorkspaceSetting } from "../../helpers/api"; +import { getWorkspaceProfile, upsertWorkspaceSetting } from "../../helpers/api"; const WorkspaceSection: React.FC = () => { const [disallowSignUp, setDisallowSignUp] = useState(false); useEffect(() => { - getSystemStatus().then(({ data }) => { + getWorkspaceProfile().then(({ data }) => { setDisallowSignUp(data.disallowSignUp); }); }, []); diff --git a/web/src/helpers/api.ts b/web/src/helpers/api.ts index f5ed61d..6be713f 100644 --- a/web/src/helpers/api.ts +++ b/web/src/helpers/api.ts @@ -1,7 +1,7 @@ import axios from "axios"; -export function getSystemStatus() { - return axios.get("/api/v1/workspace/status"); +export function getWorkspaceProfile() { + return axios.get("/api/v1/workspace/profile"); } export function signin(email: string, password: string) { diff --git a/web/src/types/modules/system.d.ts b/web/src/types/modules/system.d.ts index bc16037..cf87fdb 100644 --- a/web/src/types/modules/system.d.ts +++ b/web/src/types/modules/system.d.ts @@ -3,7 +3,7 @@ interface Profile { version: string; } -interface SystemStatus { +interface WorkspaceProfile { profile: Profile; disallowSignUp: boolean; }