Auth: Always set config.oAuth2 for OAuth2 accounts #983
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
Author
|
Untested so far. |
NeilRashbrook
requested changes
Dec 23, 2025
Collaborator
NeilRashbrook
left a comment
NeilRashbrook
left a comment
There was a problem hiding this comment.
Would have been r+ without the error in 64c7e5f.
Comment on lines
+190
to
+191
| await onContinue(); | ||
| return; |
Collaborator
There was a problem hiding this comment.
This is inconsistent with line 168 which doesn't explicitly return (because it's the last code in its block).
Comment on lines
+9
to
+17
| export function getOAuth2BuiltIn(config: Account): WebBasedAuth | undefined { | ||
| if (config.protocol == "owa") { | ||
| return new OWAAuth(config as OWAAccount); | ||
| } | ||
| let hostname = (config as TCPAccount).hostname ?? | ||
| config.url ? new URL(config.url).hostname : null; | ||
| let o = OAuth2URLs.find(o => o.hostnames.some(h => h == hostname)); | ||
| if (!o) { | ||
| return undefined; |
Collaborator
There was a problem hiding this comment.
config.oAuth2 normally defaults to null.
Also, while I'm here, ?? has higher precedence than ?:, so you'll need to wrap line 14 in ()s.
Comment on lines
-83
to
+82
| if (!this.oAuth2) { | ||
| let urls = OAuth2URLs.find(a => a.hostnames.includes(this.hostname)); | ||
| assert(urls, gt`Could not find OAuth2 config for ${this.hostname}`); | ||
| this.oAuth2 = new OAuth2(this, urls.tokenURL, urls.authURL, urls.authDoneURL, urls.scope, urls.clientID, urls.clientSecret, urls.doPKCE); | ||
| this.oAuth2.setTokenURLPasswordAuth(urls.tokenURLPasswordAuth); | ||
| } | ||
| this.oAuth2 ??= getOAuth2BuiltIn(this); |
Collaborator
There was a problem hiding this comment.
This assert went missing, although one was kept on line 168.
| @@ -1,5 +1,5 @@ | |||
|
|
|||
| export function assert(test: boolean | Object | null, errorMessage: string): asserts test { | |||
| export function assert(test: boolean | Object | null | undefined, errorMessage: string): asserts test { | |||
Collaborator
There was a problem hiding this comment.
What's complaining about this?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There were cases where we did not fill in an OAuth2 config. This is a revision of PR #981.
The automatic account setup failed to fill in the OAuth2 config. Before PR #969, this appeared to work, because the login step would always show the separate window UI, but then the account would be created with the popup window as the default auth UI.