From 71eac9db6c694b111462b131165fb96edef68043 Mon Sep 17 00:00:00 2001 From: Aaron Cox Date: Fri, 26 Jun 2020 20:50:23 -0400 Subject: [PATCH 1/4] Swapped from using constructor.name to new getName() method for UALLoggedInAuthType --- src/components/provider/UALProvider.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/provider/UALProvider.js b/src/components/provider/UALProvider.js index 26420f42..24f34895 100644 --- a/src/components/provider/UALProvider.js +++ b/src/components/provider/UALProvider.js @@ -166,7 +166,7 @@ export class UALProvider extends Component { const users = await authenticator.login() const accountName = await users[0].getAccountName() if (!isAutoLogin) { - window.localStorage.setItem('UALLoggedInAuthType', authenticator.constructor.name) + window.localStorage.setItem('UALLoggedInAuthType', authenticator.getName()) this.setUALInvalidateAt(authenticator) } broadcastStatus({ @@ -194,7 +194,7 @@ export class UALProvider extends Component { */ submitAccountForLogin: async (accountInput, authenticator) => { const { broadcastStatus } = this.state - const authenticatorName = authenticator.constructor.name + const authenticatorName = authenticator.getName() broadcastStatus({ loading: true, message: authenticator.requiresGetKeyConfirmation() @@ -276,7 +276,7 @@ export class UALProvider extends Component { * @return {number|boolean} */ getAuthenticatorInstance = (type, availableAuthenticators) => { - const loggedIn = availableAuthenticators.filter(auth => auth.constructor.name === type) + const loggedIn = availableAuthenticators.filter(auth => auth.getName() === type) if (!loggedIn.length) { this.clearCache() } From b27f40eafb768f67d1e84c4481b610d79657378d Mon Sep 17 00:00:00 2001 From: Aaron Cox Date: Mon, 29 Jun 2020 00:52:33 -0400 Subject: [PATCH 2/4] Updated Scatter mocks to return name --- __mocks__/Scatter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__mocks__/Scatter.js b/__mocks__/Scatter.js index a43a8cd9..a5d784ae 100644 --- a/__mocks__/Scatter.js +++ b/__mocks__/Scatter.js @@ -128,6 +128,6 @@ export class Scatter extends Authenticator { } getName() { - return 'authenticator' + return 'scatter' } } From ce589e482e43fc3ab2bd97c90abfc3505b4ad02d Mon Sep 17 00:00:00 2001 From: Aaron Cox Date: Mon, 29 Jun 2020 00:52:55 -0400 Subject: [PATCH 3/4] Bump to v0.3.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e0840544..9f6ed723 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ual-reactjs-renderer", - "version": "0.3.0", + "version": "0.3.1", "main": "dist/index.js", "author": { "name": "block.one", From acd29b77baf89ebc8e061df5b8e2591229b5b015 Mon Sep 17 00:00:00 2001 From: Aaron Cox Date: Mon, 29 Jun 2020 00:53:27 -0400 Subject: [PATCH 4/4] removed const --- src/components/provider/UALProvider.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/provider/UALProvider.js b/src/components/provider/UALProvider.js index 24f34895..77abe043 100644 --- a/src/components/provider/UALProvider.js +++ b/src/components/provider/UALProvider.js @@ -194,7 +194,6 @@ export class UALProvider extends Component { */ submitAccountForLogin: async (accountInput, authenticator) => { const { broadcastStatus } = this.state - const authenticatorName = authenticator.getName() broadcastStatus({ loading: true, message: authenticator.requiresGetKeyConfirmation() @@ -203,7 +202,7 @@ export class UALProvider extends Component { }) try { const users = await authenticator.login(accountInput) - window.localStorage.setItem('UALLoggedInAuthType', authenticatorName) + window.localStorage.setItem('UALLoggedInAuthType', authenticator.getName()) window.localStorage.setItem('UALAccountName', accountInput) broadcastStatus({ activeUser: users[users.length - 1],