Skip to content

Commit 0eb910a

Browse files
mtojekmtojek
committed
Merge branch 'main' into 8128-new-user-state-dormant
2 parents db9769f + a96c4a3 commit 0eb910a

File tree

17 files changed

+59
-207
lines changed

17 files changed

+59
-207
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ jobs:
203203
needs: changes
204204
if: needs.changes.outputs.offlinedocs-only == 'false' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
205205
runs-on: ${{ github.repository_owner == 'coder' && 'buildjet-8vcpu-ubuntu-2204' || 'ubuntu-latest' }}
206-
timeout-minutes: 5
206+
timeout-minutes: 7
207207
steps:
208208
- name: Checkout
209209
uses: actions/checkout@v3

‎.github/workflows/security.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,12 @@ jobs:
126126
127127
- name: Run Prisma Cloud image scan
128128
uses: PaloAltoNetworks/prisma-cloud-scan@v1
129-
if: false
130129
with:
131130
pcc_console_url: ${{ secrets.PRISMA_CLOUD_URL }}
132131
pcc_user: ${{ secrets.PRISMA_CLOUD_ACCESS_KEY }}
133132
pcc_pass: ${{ secrets.PRISMA_CLOUD_SECRET_KEY }}
134133
image_name: ${{ steps.build.outputs.image }}
135134

136-
- name: Scan image
137-
id: sysdig-scan
138-
uses: sysdiglabs/scan-action@v3
139-
with:
140-
image-tag: ${{ steps.build.outputs.image }}
141-
sysdig-secure-token: ${{ secrets.SYSDIG_API_TOKEN }}
142-
input-type: docker-daemon
143-
sysdig-secure-url: https://app.us4.sysdig.com
144-
145135
- name: Run Trivy vulnerability scanner
146136
uses: aquasecurity/trivy-action@41f05d9ecffa2ed3f1580af306000f734b733e54
147137
with:

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 5 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: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/userauth.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,6 @@ type OAuthConvertStateClaims struct {
6464
// @Success 201 {object} codersdk.OAuthConversionResponse
6565
// @Router /users/{user}/convert-login [post]
6666
func (api *API) postConvertLoginType(rw http.ResponseWriter, r *http.Request) {
67-
if !api.Experiments.Enabled(codersdk.ExperimentConvertToOIDC) {
68-
httpapi.Write(r.Context(), rw, http.StatusForbidden, codersdk.Response{
69-
Message: "Oauth conversion is not allowed, contact an administrator to turn on this feature.",
70-
})
71-
return
72-
}
73-
7467
var (
7568
user = httpmw.UserParam(r)
7669
ctx = r.Context()
@@ -471,7 +464,6 @@ func (api *API) userAuthMethods(rw http.ResponseWriter, r *http.Request) {
471464
}
472465

473466
httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.AuthMethods{
474-
ConvertToOIDCEnabled: api.Experiments.Enabled(codersdk.ExperimentConvertToOIDC),
475467
Password: codersdk.AuthMethod{
476468
Enabled: !api.DeploymentValues.DisablePasswordAuth.Value(),
477469
},
@@ -1529,11 +1521,6 @@ func (api *API) convertUserToOauth(ctx context.Context, r *http.Request, db data
15291521
oauthConvertAudit.UserID = claims.UserID
15301522
oauthConvertAudit.Old = user
15311523

1532-
// If we do not allow converting to oauth, return an error.
1533-
if !api.Experiments.Enabled(codersdk.ExperimentConvertToOIDC) {
1534-
return database.User{}, wrongLoginTypeHTTPError(user.LoginType, params.LoginType)
1535-
}
1536-
15371524
if claims.RegisteredClaims.Issuer != api.DeploymentID {
15381525
return database.User{}, httpError{
15391526
code: http.StatusForbidden,

‎coderd/userauth_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"golang.org/x/xerrors"
2121

2222
"cdr.dev/slog/sloggers/slogtest"
23-
"github.com/coder/coder/cli/clibase"
2423
"github.com/coder/coder/coderd"
2524
"github.com/coder/coder/coderd/audit"
2625
"github.com/coder/coder/coderd/coderdtest"
@@ -796,7 +795,6 @@ func TestUserOIDC(t *testing.T) {
796795
config.AllowSignups = true
797796

798797
cfg := coderdtest.DeploymentValues(t)
799-
cfg.Experiments = clibase.StringArray{string(codersdk.ExperimentConvertToOIDC)}
800798
client := coderdtest.New(t, &coderdtest.Options{
801799
Auditor: auditor,
802800
OIDCConfig: config,

‎codersdk/deployment.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1850,10 +1850,6 @@ const (
18501850
// only Coordinator
18511851
ExperimentTailnetPGCoordinator Experiment = "tailnet_pg_coordinator"
18521852

1853-
// ExperimentConvertToOIDC enables users to convert from password to
1854-
// oidc.
1855-
ExperimentConvertToOIDC Experiment = "convert-to-oidc"
1856-
18571853
// ExperimentSingleTailnet replaces workspace connections inside coderd to
18581854
// all use a single tailnet, instead of the previous behavior of creating a
18591855
// single tailnet for each agent.

‎codersdk/users.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,9 @@ type CreateOrganizationRequest struct {
161161

162162
// AuthMethods contains authentication method information like whether they are enabled or not or custom text, etc.
163163
type AuthMethods struct {
164-
ConvertToOIDCEnabled bool `json:"convert_to_oidc_enabled"`
165-
Password AuthMethod `json:"password"`
166-
Github AuthMethod `json:"github"`
167-
OIDC OIDCAuthMethod `json:"oidc"`
164+
Password AuthMethod `json:"password"`
165+
Github AuthMethod `json:"github"`
166+
OIDC OIDCAuthMethod `json:"oidc"`
168167
}
169168

170169
type AuthMethod struct {

‎docs/api/schemas.md

Lines changed: 5 additions & 8 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: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎offlinedocs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"@emotion/react": "11",
2020
"@emotion/styled": "11",
2121
"archiver": "5.3.1",
22-
"framer-motion": "6",
22+
"framer-motion": "10",
2323
"front-matter": "4.0.2",
2424
"fs-extra": "11.1.1",
2525
"lodash": "4.17.21",
@@ -37,10 +37,10 @@
3737
"@types/node": "18.17.0",
3838
"@types/react": "18.2.17",
3939
"@types/react-dom": "18.2.7",
40-
"eslint": "8.45.0",
40+
"eslint": "8.46.0",
4141
"eslint-config-next": "13.4.10",
4242
"prettier": "3.0.0",
43-
"typescript": "4.7.3"
43+
"typescript": "5.1.6"
4444
},
4545
"engines": {
4646
"npm": ">=9.0.0 <10.0.0",

0 commit comments

Comments
 (0)