Skip to content

fix: handle demo signin less generically #497

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
arielsvg merged 3 commits into from
Nov 12, 2020
Merged

fix: handle demo signin less generically #497

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0f608d
fix: handle demo signin less generically
arielsvg Nov 9, 2020
51068f5
Merge branch 'develop' into fix/explicit-demo-param
arielsvg Nov 10, 2020
859d185
Merge branch 'develop' into fix/explicit-demo-param
arielsvg Nov 12, 2020
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
35 changes: 13 additions & 22 deletions app/assets/javascripts/views/application/application_view.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class ApplicationViewCtrl extends PureViewCtrl {
async onAppLaunch() {
super.onAppLaunch();
this.setState({ needsUnlock: false });
this.handleAutoSignInFromParams();
this.handleDemoSignInFromParams();
}

onUpdateAvailable() {
Expand Down Expand Up @@ -142,28 +142,19 @@ class ApplicationViewCtrl extends PureViewCtrl {
}
}

async handleAutoSignInFromParams() {
const params = this.$location!.search();
const server = params.server;
const email = params.email;
const password = params.pw;
if (!server || !email || !password) return;

const user = this.application!.getUser();
if (user) {
if (user.email === email && await this.application!.getHost() === server) {
/** Already signed in, return */
return;
} else {
/** Sign out */
await this.application!.signOut();
}
async handleDemoSignInFromParams() {
if (
this.$location!.search().demo === 'true' &&
!this.application.hasAccount()
) {
await this.application!.setHost(
'https://syncing-server-demo.standardnotes.org'
);
this.application!.signIn(
'demo@standardnotes.org',
'password',
);
}
await this.application!.setHost(server);
this.application!.signIn(
email,
password,
);
}
}

Expand Down