Merge pull request #97 from aaroncox/master

jlamarr22 · web-flow · commit 5950f78d45d8 · 2020-06-29T09:07:19.000-04:00
Removed reference to authenticator.constructor.name and used new authenticator.getName method
diff --git a/__mocks__/Scatter.js b/__mocks__/Scatter.js
@@ -128,6 +128,6 @@ export class Scatter extends Authenticator {
   }
 
   getName() {
-    return 'authenticator'
+    return 'scatter'
   }
 }
diff --git 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",
diff --git 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,6 @@ export class UALProvider extends Component {
        */
       submitAccountForLogin: async (accountInput, authenticator) => {
         const { broadcastStatus } = this.state
-        const authenticatorName = authenticator.constructor.name
         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],
@@ -276,7 +275,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()
     }

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,6 @@ export class Scatter extends Authenticator {`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`getName() {`
`131`		`- return 'authenticator'`
	`131`	`+ return 'scatter'`
`132`	`132`	`}`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "ual-reactjs-renderer",`
`3`		`- "version": "0.3.0",`
	`3`	`+ "version": "0.3.1",`
`4`	`4`	`"main": "dist/index.js",`
`5`	`5`	`"author": {`
`6`	`6`	`"name": "block.one",`