Skip to content

Commit e8550dc

Browse files
aslilacaslilac
committed
url
1 parent 1d3c010 commit e8550dc

File tree

12 files changed

+40
-40
lines changed

12 files changed

+40
-40
lines changed

‎coderd/apidoc/docs.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/userauth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ func (api *API) userAuthMethods(rw http.ResponseWriter, r *http.Request) {
472472
}
473473

474474
httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.AuthMethods{
475-
TermsOfServiceLink: api.DeploymentValues.TermsOfServiceLink.Value(),
475+
TermsOfServiceURL: api.DeploymentValues.TermsOfServiceURL.Value(),
476476
Password: codersdk.AuthMethod{
477477
Enabled: !api.DeploymentValues.DisablePasswordAuth.Value(),
478478
},

‎codersdk/deployment.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ type DeploymentValues struct {
200200
AllowWorkspaceRenames serpent.Bool `json:"allow_workspace_renames,omitempty" typescript:",notnull"`
201201
Healthcheck HealthcheckConfig `json:"healthcheck,omitempty" typescript:",notnull"`
202202
CLIUpgradeMessage serpent.String `json:"cli_upgrade_message,omitempty" typescript:",notnull"`
203-
TermsOfServiceLink serpent.String `json:"terms_of_service_link,omitempty" typescript:",notnull"`
203+
TermsOfServiceURL serpent.String `json:"terms_of_service_url,omitempty" typescript:",notnull"`
204204

205205
Config serpent.YAMLConfigPath `json:"config,omitempty" typescript:",notnull"`
206206
WriteConfig serpent.Bool `json:"write_config,omitempty" typescript:",notnull"`
@@ -1685,12 +1685,12 @@ when required by your organization's security policy.`,
16851685
Annotations: serpent.Annotations{}.Mark(annotationExternalProxies, "true"),
16861686
},
16871687
{
1688-
Name: "Terms of Service Link",
1689-
Description: "A link to an external Terms of Service that must be accepted by users when logging in.",
1690-
Flag: "terms-of-service-link",
1691-
Env: "CODER_TERMS_OF_SERVICE_LINK",
1692-
YAML: "termsOfServiceLink",
1693-
Value: &c.TermsOfServiceLink,
1688+
Name: "Terms of Service URL",
1689+
Description: "A URL to an external Terms of Service that must be accepted by users when logging in.",
1690+
Flag: "terms-of-service-url",
1691+
Env: "CODER_TERMS_OF_SERVICE_URL",
1692+
YAML: "termsOfServiceURL",
1693+
Value: &c.TermsOfServiceURL,
16941694
},
16951695
{
16961696
Name: "Strict-Transport-Security",

‎codersdk/users.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,10 +209,10 @@ type CreateOrganizationRequest struct {
209209

210210
// AuthMethods contains authentication method information like whether they are enabled or not or custom text, etc.
211211
type AuthMethods struct {
212-
TermsOfServiceLink string `json:"terms_of_service_link,omitempty"`
213-
Password AuthMethod `json:"password"`
214-
Github AuthMethod `json:"github"`
215-
OIDC OIDCAuthMethod `json:"oidc"`
212+
TermsOfServiceURL string `json:"terms_of_service_url,omitempty"`
213+
Password AuthMethod `json:"password"`
214+
Github AuthMethod `json:"github"`
215+
OIDC OIDCAuthMethod `json:"oidc"`
216216
}
217217

218218
type AuthMethod struct {

‎docs/api/general.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/schemas.md

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/api/users.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/cli/server.md

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/api/typesGenerated.ts

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎site/src/pages/LoginPage/LoginPageView.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ export const LoginPageView: FC<LoginPageViewProps> = ({
7373
</div>
7474
<div>{buildInfo?.version}</div>
7575

76-
{authMethods?.terms_of_service_link && (
76+
{authMethods?.terms_of_service_url && (
7777
<div css={{ paddingTop: 12, fontSize: 12 }}>
7878
By continuing, you agree to the{" "}
7979
<Link
8080
css={{ fontWeight: 500 }}
81-
href={authMethods.terms_of_service_link}
81+
href={authMethods.terms_of_service_url}
8282
target="_blank"
8383
rel="noreferrer"
8484
>

‎site/src/testHelpers/entities.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1374,7 +1374,7 @@ export const MockAuthMethodsPasswordOnly: TypesGen.AuthMethods = {
13741374
};
13751375

13761376
export const MockAuthMethodsPasswordTermsOfService: TypesGen.AuthMethods = {
1377-
terms_of_service_link: "https://www.youtube.com/watch?v=C2f37Vb2NAE",
1377+
terms_of_service_url: "https://www.youtube.com/watch?v=C2f37Vb2NAE",
13781378
password: { enabled: true },
13791379
github: { enabled: false },
13801380
oidc: { enabled: false, signInText: "", iconUrl: "" },

0 commit comments

Comments
 (0)