Skip to content

Comments

OAuth#2989

Merged
battermann merged 293 commits intodevelopfrom
SQSERVICES-1825-be-oauth-refresh-token-generation
Mar 14, 2023
Merged

OAuth#2989
battermann merged 293 commits intodevelopfrom
SQSERVICES-1825-be-oauth-refresh-token-generation

Conversation

@fisx
Copy link
Contributor

@fisx fisx commented Jan 16, 2023

https://wearezeta.atlassian.net/browse/SQSERVICES-1782

replaces #3086, #3046, #3010, #3004, #2985, #2931, #2922, #2907, #2901, #2882

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@battermann battermann temporarily deployed to cachix January 16, 2023 11:01 — with GitHub Actions Inactive
[dev-dependencies]
clap = ">= 2.0"

[patch.crates-io.jwt-simple]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[dependencies.jwt-simple]
git = "https://github.com/wireapp/rust-jwt-simple"
rev = "commit_id"

Also, can you add a comment stating why this was forked (what's missing from upstream), and did we send it along already?


zauth_keystore resources/zauth/pubkeys.txt;
zauth_acl conf/nginz/zauth_acl.txt;
oauth_key resources/oauth/ed25519_public.jwk;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
oauth_key resources/oauth/ed25519_public.jwk;
# needs to be kept in sync with services/brig/test/resources/oauth/ed25519.jwk
oauth_key resources/oauth/ed25519_public.jwk;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it has conflicts now, I'll add it manually.

@battermann battermann self-requested a review March 14, 2023 15:21
@battermann battermann merged commit 7c1349b into develop Mar 14, 2023
@battermann battermann deleted the SQSERVICES-1825-be-oauth-refresh-token-generation branch March 14, 2023 16:17
battermann pushed a commit that referenced this pull request Mar 15, 2023
Comment on lines -345 to +347
:> ZConn
:> ZOptConn
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sure this was justified, but can you clarify why is the connection ID now optional? Only the local user can call this endpoint, hence I believe we always have the connection ID.

CC: @fisx , @battermann

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When this endpoint is called by an OAuth application, we do not have a connection ID.

lepsa pushed a commit to lepsa/wire-server that referenced this pull request Nov 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants