Simplify icpStorage.

Author: RubenVerborgh

popup-app/components/IdpCallback.js

@@ -2,27 +2,17 @@ import React, { Component } from 'react'
 
 import auth from '../../src'
 import { Client } from '../../src/ipc'
-import { postMessageStorage } from '../../src/storage'
+import { ipcStorage } from '../../src/storage'
 
 export default class IdpCallback extends Component {
   state = { loggedIn: false }
   client = new Client(window.opener, this.props.appOrigin)
 
-  postSession = async () => {
-    const storage = postMessageStorage(window.opener, this.props.appOrigin)
+  async componentDidMount() {
+    const storage = ipcStorage(this.client)
     const session = await auth.currentSession(storage)
     await this.client.request('foundSession', session)
-  }
-
-  constructor(props) {
-    super(props)
-    this.postSession().then(() => {
-      this.setState({ loggedIn: true })
-    })
-  }
-
-  render() {
-    return this.state.loggedIn ? <LoggedIn /> : <Loading />
+    this.setState({ loggedIn: true })
   }
 
   componentDidUpdate() {
@@ -31,8 +21,9 @@ export default class IdpCallback extends Component {
       afterLoggedIn()
     }
   }
-}
-
-const Loading = () => <h1 class="center">Logging in...</h1>
 
-const LoggedIn = () => <h1 className="center">Logged in!</h1>
+  render() {
+    const message = this.state.loggedIn ? 'Logged in!' : 'Logging in…'
+    return <h1 class="center">{message}</h1>
+  }
+}

popup-app/components/IdpSelect.js

@@ -2,7 +2,7 @@ import React from 'react'
 
 import auth from '../../src'
 import { Client } from '../../src/ipc'
-import { postMessageStorage } from '../../src/storage'
+import { ipcStorage } from '../../src/storage'
 
 import './IdpSelect.css'
 
@@ -56,7 +56,7 @@ class IdpSelect extends React.Component {
     }
     loginOptions = {
       ...loginOptions,
-      storage: postMessageStorage(window.opener, appOrigin)
+      storage: ipcStorage(client)
     }
     await auth.login(idp.url, loginOptions)
   }

src/__test__/storage.spec.js

@@ -2,7 +2,8 @@
 
 import { polyfillWindow, polyunfillWindow } from './spec-helpers'
 import type { AsyncStorage } from '../storage'
-import { defaultStorage, postMessageStorage } from '../storage'
+import { defaultStorage, ipcStorage } from '../storage'
+import { Client } from '../ipc'
 
 beforeEach(polyfillWindow)
 
@@ -21,7 +22,7 @@ describe('defaultStorage', () => {
   })
 })
 
-describe('postMessage storage', () => {
+describe('ipcStorage', () => {
   ;[
     {
       expectedMethod: 'getItem',
@@ -64,7 +65,8 @@ describe('postMessage storage', () => {
           done.fail(e)
         }
       })
-      const store = postMessageStorage(window, window.location.origin)
+      const client = new Client(window, window.location.origin)
+      const store = ipcStorage(client)
       const item = await store[expectedMethod](...expectedArgs)
       expect(item).toBe(expectedRet)
       done()

src/storage.js

@@ -93,11 +93,7 @@ export const memStorage = (): Storage => {
   }
 }
 
-export const postMessageStorage = (
-  storageWindow: window,
-  storageOrigin: string
-): AsyncStorage => {
-  const client = new Client(storageWindow, storageOrigin)
+export function ipcStorage(client: Client): AsyncStorage {
   return {
     getItem: (key: string): Promise<?string> =>
       client.request('storage/getItem', key),