Skip to content

Commit 11ef507

Browse files
EmyrkEmyrk
committed
Merge remote-tracking branch 'origin/main' into authzquerier_layer
2 parents 32c8af1 + 4a6fc40 commit 11ef507

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1296
-763
lines changed

‎.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ jobs:
214214
./build/*.rpm
215215
env:
216216
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
217-
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.CODER_GPG_RELEASE_KEY_BASE64 }}
217+
CODER_GPG_RELEASE_KEY_BASE64: ${{ secrets.GPG_RELEASE_KEY_BASE64 }}
218218

219219
- name: Authenticate to Google Cloud
220220
uses: google-github-actions/auth@v1

‎cli/deployment/config.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,17 @@ func newConfig() *codersdk.DeploymentConfig {
254254
Flag: "oidc-username-field",
255255
Default: "preferred_username",
256256
},
257+
SignInText: &codersdk.DeploymentConfigField[string]{
258+
Name: "OpenID Connect sign in text",
259+
Usage: "The text to show on the OpenID Connect sign in button",
260+
Flag: "oidc-sign-in-text",
261+
Default: "OpenID Connect",
262+
},
263+
IconURL: &codersdk.DeploymentConfigField[string]{
264+
Name: "OpenID connect icon URL",
265+
Usage: "URL pointing to the icon to use on the OepnID Connect login button",
266+
Flag: "oidc-icon-url",
267+
},
257268
},
258269

259270
Telemetry: &codersdk.TelemetryConfig{

‎cli/server.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,8 @@ func Server(vip *viper.Viper, newAPI func(context.Context, *coderd.Options) (*co
552552
EmailDomain: cfg.OIDC.EmailDomain.Value,
553553
AllowSignups: cfg.OIDC.AllowSignups.Value,
554554
UsernameField: cfg.OIDC.UsernameField.Value,
555+
SignInText: cfg.OIDC.SignInText.Value,
556+
IconURL: cfg.OIDC.IconURL.Value,
555557
}
556558
}
557559

‎cli/testdata/coder_server_--help.golden

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,9 @@ Flags:
148148
--oidc-email-domain strings Email domains that clients logging in
149149
with OIDC must match.
150150
Consumes $CODER_OIDC_EMAIL_DOMAIN
151+
--oidc-icon-url string URL pointing to the icon to use on the
152+
OepnID Connect login button
153+
Consumes $CODER_OIDC_ICON_URL
151154
--oidc-ignore-email-verified Ignore the email_verified claim from the
152155
upstream provider.
153156
Consumes $CODER_OIDC_IGNORE_EMAIL_VERIFIED
@@ -157,6 +160,10 @@ Flags:
157160
OIDC.
158161
Consumes $CODER_OIDC_SCOPES (default
159162
[openid,profile,email])
163+
--oidc-sign-in-text string The text to show on the OpenID Connect
164+
sign in button
165+
Consumes $CODER_OIDC_SIGN_IN_TEXT
166+
(default "OpenID Connect")
160167
--oidc-username-field string OIDC claim field to use as the username.
161168
Consumes $CODER_OIDC_USERNAME_FIELD
162169
(default "preferred_username")

‎coderd/apidoc/docs.go

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

‎coderd/database/databasefake/databasefake.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4080,24 +4080,6 @@ func (q *fakeQuerier) GetGroupsByOrganizationID(_ context.Context, organizationI
40804080
return groups, nil
40814081
}
40824082

4083-
func (q *fakeQuerier) GetAllOrganizationMembers(_ context.Context, organizationID uuid.UUID) ([]database.User, error) {
4084-
q.mutex.RLock()
4085-
defer q.mutex.RUnlock()
4086-
4087-
var users []database.User
4088-
for _, member := range q.organizationMembers {
4089-
if member.OrganizationID == organizationID {
4090-
for _, user := range q.users {
4091-
if user.ID == member.UserID {
4092-
users = append(users, user)
4093-
}
4094-
}
4095-
}
4096-
}
4097-
4098-
return users, nil
4099-
}
4100-
41014083
func (q *fakeQuerier) DeleteGroupByID(_ context.Context, id uuid.UUID) error {
41024084
q.mutex.Lock()
41034085
defer q.mutex.Unlock()

0 commit comments

Comments
 (0)