From 4e2ae6ad2bf9cadf79ee18486616843e2d52db23 Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Wed, 11 Sep 2019 16:04:41 +0200 Subject: [PATCH] Wrap code into if supported check --- src/auth/AuthProvider.tsx | 8 ++------ src/utils/credentialsManagement.ts | 28 ++++++++++++++++------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/auth/AuthProvider.tsx b/src/auth/AuthProvider.tsx index 18f00f423..c835248f7 100644 --- a/src/auth/AuthProvider.tsx +++ b/src/auth/AuthProvider.tsx @@ -105,9 +105,7 @@ class AuthProvider extends React.Component< if (!!token && !user) { this.verifyToken(token); } else { - if (isCredentialsManagementAPISupported) { - loginWithCredentialsManagementAPI(this.login); - } + loginWithCredentialsManagementAPI(this.login); } } @@ -117,9 +115,7 @@ class AuthProvider extends React.Component< tokenAuthFn({ variables: { email, password } }).then(result => { if (result && !result.data.tokenCreate.errors.length) { - if (isCredentialsManagementAPISupported) { - saveCredentials(result.data.tokenCreate.user, password); - } + saveCredentials(result.data.tokenCreate.user, password); } }); }; diff --git a/src/utils/credentialsManagement.ts b/src/utils/credentialsManagement.ts index 1f02c20bd..bd451c50a 100644 --- a/src/utils/credentialsManagement.ts +++ b/src/utils/credentialsManagement.ts @@ -4,19 +4,23 @@ export const isSupported = navigator.credentials && navigator.credentials.preventSilentAccess; export function login(loginFn: (id: string, password: string) => void) { - navigator.credentials.get({ password: true }).then(credential => { - if (credential instanceof PasswordCredential) { - loginFn(credential.id, credential.password); - } - }); + if (isSupported) { + navigator.credentials.get({ password: true }).then(credential => { + if (credential instanceof PasswordCredential) { + loginFn(credential.id, credential.password); + } + }); + } } export function saveCredentials(user: User, password: string) { - const cred = new PasswordCredential({ - iconURL: user.avatar ? user.avatar.url : undefined, - id: user.email, - name: user.firstName ? `${user.firstName} ${user.lastName}` : undefined, - password - }); - navigator.credentials.store(cred); + if (isSupported) { + const cred = new PasswordCredential({ + iconURL: user.avatar ? user.avatar.url : undefined, + id: user.email, + name: user.firstName ? `${user.firstName} ${user.lastName}` : undefined, + password + }); + navigator.credentials.store(cred); + } }