Skip to content

Follow up 944: authentication sessions are not persistent #1003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 7, 2022
Merged

Follow up 944: authentication sessions are not persistent #1003

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff13922
#944: Fixed auth. sessions not persistent
davegarthsimpson May 18, 2022
0a7dbcc
944: Prevent race conditions setting authOptions
davegarthsimpson May 24, 2022
4ac9bb2
Merge branch 'main' into 944-authentication-sessions-are-not-persistent
davegarthsimpson May 24, 2022
9746e94
typo correction, duplicate identifier
davegarthsimpson May 24, 2022
15bb3b5
prevent block of auth client service on setOptions
davegarthsimpson May 24, 2022
8e9e5ad
consider windows cred. mgr. password len limit
davegarthsimpson Jun 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions arduino-ide-extension/src/browser/auth/authentication-client-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ export class AuthenticationClientService

readonly onSessionDidChange = this.onSessionDidChangeEmitter.event;

onStart(): void {
async onStart(): Promise<void> {
Copy link
Contributor

Choose a reason for hiding this comment

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

No need to make it async, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

oops, correct, that was left in from 0a7dbcc

this.toDispose.push(this.onSessionDidChangeEmitter);
this.service.setClient(this);
this.service
.session()
.then((session) => this.notifySessionDidChange(session));

this.setOptions();
this.service.initAuthSession()
await this.setOptions();
this.service.initAuthSession();

this.arduinoPreferences.onPreferenceChanged((event) => {
if (event.preferenceName.startsWith('arduino.auth.')) {
Expand All @@ -60,8 +60,8 @@ export class AuthenticationClientService
});
}

setOptions(): void {
this.service.setOptions({
setOptions(): Promise<void> {
return this.service.setOptions({
redirectUri: `http://localhost:${serverPort}/callback`,
responseType: 'code',
clientID: this.arduinoPreferences['arduino.auth.clientID'],
Expand Down
2 changes: 1 addition & 1 deletion arduino-ide-extension/src/common/protocol/authentication-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export interface AuthenticationService
logout(): Promise<void>;
session(): Promise<AuthenticationSession | undefined>;
disposeClient(client: AuthenticationServiceClient): void;
setOptions(authOptions: AuthOptions): void;
setOptions(authOptions: AuthOptions): Promise<void>;
initAuthSession(): Promise<void>;
}

Expand Down
2 changes: 1 addition & 1 deletion arduino-ide-extension/src/node/auth/arduino-auth-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class ArduinoAuthenticationProvider implements AuthenticationProvider {
setInterval(checkToken, REFRESH_INTERVAL);
}

public setOptions(authOptions: AuthOptions) {
public async setOptions(authOptions: AuthOptions): Promise<void> {
this.authOptions = authOptions;
}

Expand Down
8 changes: 4 additions & 4 deletions arduino-ide-extension/src/node/auth/authentication-service-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class AuthenticationServiceImpl
protected readonly clients: AuthenticationServiceClient[] = [];
protected readonly toDispose = new DisposableCollection();

private initialized = false;
private initialized = false;

async onStart(): Promise<void> {
this.toDispose.pushAll([
Expand Down Expand Up @@ -49,12 +49,12 @@ export class AuthenticationServiceImpl
async initAuthSession(): Promise<void> {
if (!this.initialized) {
await this.delegate.init();
this.initialized = true
this.initialized = true;
}
}

setOptions(authOptions: AuthOptions) {
this.delegate.setOptions(authOptions);
setOptions(authOptions: AuthOptions): Promise<void> {
return this.delegate.setOptions(authOptions);
}

async login(): Promise<AuthenticationSession> {
Expand Down