chore: add boolean to auth methods to know if the deployment supports oidc conversion

Emyrk · Emyrk · commit 57b36054192a · 2023-06-22T15:07:50.000-05:00
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/userauth.go b/coderd/userauth.go
@@ -411,6 +411,7 @@ func (api *API) userAuthMethods(rw http.ResponseWriter, r *http.Request) {
 
 	httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.AuthMethods{
 		UserAuthenticationType: currentUserLoginType,
+		ConvertToOIDCEnabled:   api.Options.DeploymentValues.EnableOauthAccountConversion.Value(),
 		Password: codersdk.AuthMethod{
 			Enabled: !api.DeploymentValues.DisablePasswordAuth.Value(),
 		},
diff --git a/codersdk/users.go b/codersdk/users.go
@@ -126,6 +126,7 @@ type AuthMethods struct {
 	// UserAuthenticationType returns the authentication method for the given
 	// caller if the request is an authenticated request. Otherwise it is empty.
 	UserAuthenticationType LoginType      `json:"me_login_type,omitempty"`
+	ConvertToOIDCEnabled   bool           `json:"convert_to_oidc_enabled"`
 	Password               AuthMethod     `json:"password"`
 	Github                 AuthMethod     `json:"github"`
 	OIDC                   OIDCAuthMethod `json:"oidc"`
diff --git a/docs/api/schemas.md b/docs/api/schemas.md
@@ -1107,6 +1107,7 @@
 
 ```json
 {
+  "convert_to_oidc_enabled": true,
   "github": {
     "enabled": true
   },
@@ -1124,12 +1125,13 @@
 
 ### Properties
 
-| Name            | Type                                               | Required | Restrictions | Description                                                                                                                             |
-| --------------- | -------------------------------------------------- | -------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------- |
-| `github`        | [codersdk.AuthMethod](#codersdkauthmethod)         | false    |              |                                                                                                                                         |
-| `me_login_type` | [codersdk.LoginType](#codersdklogintype)           | false    |              | Me login type returns the authentication method for the given caller if the request is an authenticated request. Otherwise it is empty. |
-| `oidc`          | [codersdk.OIDCAuthMethod](#codersdkoidcauthmethod) | false    |              |                                                                                                                                         |
-| `password`      | [codersdk.AuthMethod](#codersdkauthmethod)         | false    |              |                                                                                                                                         |
+| Name                      | Type                                               | Required | Restrictions | Description                                                                                                                             |
+| ------------------------- | -------------------------------------------------- | -------- | ------------ | --------------------------------------------------------------------------------------------------------------------------------------- |
+| `convert_to_oidc_enabled` | boolean                                            | false    |              |                                                                                                                                         |
+| `github`                  | [codersdk.AuthMethod](#codersdkauthmethod)         | false    |              |                                                                                                                                         |
+| `me_login_type`           | [codersdk.LoginType](#codersdklogintype)           | false    |              | Me login type returns the authentication method for the given caller if the request is an authenticated request. Otherwise it is empty. |
+| `oidc`                    | [codersdk.OIDCAuthMethod](#codersdkoidcauthmethod) | false    |              |                                                                                                                                         |
+| `password`                | [codersdk.AuthMethod](#codersdkauthmethod)         | false    |              |                                                                                                                                         |
 
 ## codersdk.AuthorizationCheck
 
diff --git a/docs/api/users.md b/docs/api/users.md
@@ -140,6 +140,7 @@ curl -X GET http://coder-server:8080/api/v2/users/authmethods \
 
 ```json
 {
+  "convert_to_oidc_enabled": true,
   "github": {
     "enabled": true
   },
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -105,6 +105,7 @@ export interface AuthMethod {
 // From codersdk/users.go
 export interface AuthMethods {
   readonly me_login_type?: LoginType
+  readonly convert_to_oidc_enabled: boolean
   readonly password: AuthMethod
   readonly github: AuthMethod
   readonly oidc: OIDCAuthMethod

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ curl -X GET http://coder-server:8080/api/v2/users/authmethods \`
`140`	`140`
`141`	`141`	```json
`142`	`142`	`{`
	`143`	`+ "convert_to_oidc_enabled": true,`
`143`	`144`	`"github": {`
`144`	`145`	`"enabled": true`
`145`	`146`	`},`