Fix web build
parent
172ed1e2cd
commit
de87ec17d1
|
@ -33,6 +33,7 @@ Uses:
|
||||||
- Annoyingly this must be re-set via XCode after every pod install
|
- Annoyingly this must be re-set via XCode after every pod install
|
||||||
- The android simulator won't be able to access localhost services unless you run `adb reverse tcp:{PORT} tcp:{PORT}`
|
- The android simulator won't be able to access localhost services unless you run `adb reverse tcp:{PORT} tcp:{PORT}`
|
||||||
- For instance, the localhosted dev-wallet will need `adb reverse tcp:3001 tcp:3001`
|
- For instance, the localhosted dev-wallet will need `adb reverse tcp:3001 tcp:3001`
|
||||||
|
- For some reason, the typescript compiler chokes on platform-specific files (e.g. `foo.native.ts`) but only when compiling for Web thus far. Therefore we always have one version of the file which doesn't use a platform specifier, and that should bee the Web version. ([More info](https://stackoverflow.com/questions/44001050/platform-specific-import-component-in-react-native-with-typescript).)
|
||||||
|
|
||||||
## Various notes
|
## Various notes
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
// @ts-ignore types not available -prf
|
||||||
|
import {REACT_APP_AUTH_LOBBY} from '@env'
|
||||||
|
|
||||||
|
if (typeof REACT_APP_AUTH_LOBBY !== 'string') {
|
||||||
|
throw new Error('ENV: No auth lobby provided')
|
||||||
|
}
|
||||||
|
|
||||||
|
export const AUTH_LOBBY = REACT_APP_AUTH_LOBBY
|
|
@ -1,7 +1,5 @@
|
||||||
import {REACT_APP_AUTH_LOBBY} from '@env'
|
if (typeof process.env.REACT_APP_AUTH_LOBBY !== 'string') {
|
||||||
|
|
||||||
if (typeof REACT_APP_AUTH_LOBBY !== 'string') {
|
|
||||||
throw new Error('ENV: No auth lobby provided')
|
throw new Error('ENV: No auth lobby provided')
|
||||||
}
|
}
|
||||||
|
|
||||||
export const AUTH_LOBBY = REACT_APP_AUTH_LOBBY
|
export const AUTH_LOBBY = process.env.REACT_APP_AUTH_LOBBY
|
||||||
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
import {Linking} from 'react-native'
|
||||||
|
import * as auth from '@adxp/auth'
|
||||||
|
import * as ucan from 'ucans'
|
||||||
|
import {InAppBrowser} from 'react-native-inappbrowser-reborn'
|
||||||
|
import {isWeb} from '../platform/detection'
|
||||||
|
import {extractHashFragment, makeAppUrl} from '../platform/urls'
|
||||||
|
import {ReactNativeStore, parseUrlForUcan} from '../state/auth'
|
||||||
|
import * as env from '../env'
|
||||||
|
|
||||||
|
export async function requestAppUcan(
|
||||||
|
authStore: ReactNativeStore,
|
||||||
|
scope: ucan.Capability,
|
||||||
|
) {
|
||||||
|
const did = await authStore.getDid()
|
||||||
|
const returnUrl = makeAppUrl()
|
||||||
|
const fragment = auth.requestAppUcanHashFragment(did, scope, returnUrl)
|
||||||
|
const url = `${env.AUTH_LOBBY}#${fragment}`
|
||||||
|
|
||||||
|
if (isWeb) {
|
||||||
|
// @ts-ignore window is defined -prf
|
||||||
|
window.location.href = url
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (await InAppBrowser.isAvailable()) {
|
||||||
|
// use in-app browser
|
||||||
|
const res = await InAppBrowser.openAuth(url, returnUrl, {
|
||||||
|
// iOS Properties
|
||||||
|
ephemeralWebSession: false,
|
||||||
|
// Android Properties
|
||||||
|
showTitle: false,
|
||||||
|
enableUrlBarHiding: true,
|
||||||
|
enableDefaultShare: false,
|
||||||
|
})
|
||||||
|
if (res.type === 'success' && res.url) {
|
||||||
|
const fragment = extractHashFragment(res.url)
|
||||||
|
if (fragment) {
|
||||||
|
const ucan = await parseUrlForUcan(fragment)
|
||||||
|
if (ucan) {
|
||||||
|
await authStore.addUcan(ucan)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('Not completed', res)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// use system browser
|
||||||
|
Linking.openURL(url)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
|
@ -0,0 +1,19 @@
|
||||||
|
import * as auth from '@adxp/auth'
|
||||||
|
import * as ucan from 'ucans'
|
||||||
|
import {makeAppUrl} from '../platform/urls'
|
||||||
|
import {ReactNativeStore} from '../state/auth'
|
||||||
|
import * as env from '../env'
|
||||||
|
|
||||||
|
export async function requestAppUcan(
|
||||||
|
authStore: ReactNativeStore,
|
||||||
|
scope: ucan.Capability,
|
||||||
|
) {
|
||||||
|
const did = await authStore.getDid()
|
||||||
|
const returnUrl = makeAppUrl()
|
||||||
|
const fragment = auth.requestAppUcanHashFragment(did, scope, returnUrl)
|
||||||
|
const url = `${env.AUTH_LOBBY}#${fragment}`
|
||||||
|
|
||||||
|
// @ts-ignore window is defined -prf
|
||||||
|
window.location.href = url
|
||||||
|
return false
|
||||||
|
}
|
|
@ -1,12 +1,11 @@
|
||||||
// import {generateSecureRandom} from 'react-native-securerandom'
|
|
||||||
import {NativeModules} from 'react-native'
|
import {NativeModules} from 'react-native'
|
||||||
const {AppSecureRandomModule} = NativeModules
|
const {AppSecureRandomModule} = NativeModules
|
||||||
import {toByteArray} from 'base64-js'
|
import {toByteArray} from 'base64-js'
|
||||||
|
// @ts-ignore we dont have types for this -prf
|
||||||
import crypto from 'msrcrypto'
|
import crypto from 'msrcrypto'
|
||||||
import '@zxing/text-encoding' // TextEncoder / TextDecoder
|
import '@zxing/text-encoding' // TextEncoder / TextDecoder
|
||||||
|
|
||||||
async function generateSecureRandom(bytes: number) {
|
async function generateSecureRandom(bytes: number) {
|
||||||
console.log('a')
|
|
||||||
return toByteArray(
|
return toByteArray(
|
||||||
await AppSecureRandomModule.generateSecureRandomAsBase64(bytes),
|
await AppSecureRandomModule.generateSecureRandomAsBase64(bytes),
|
||||||
)
|
)
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
// do nothing
|
// do nothing
|
||||||
|
export {}
|
|
@ -1,16 +1,8 @@
|
||||||
import {Linking} from 'react-native'
|
|
||||||
import * as auth from '@adxp/auth'
|
import * as auth from '@adxp/auth'
|
||||||
import * as ucan from 'ucans'
|
import * as ucan from 'ucans'
|
||||||
import {InAppBrowser} from 'react-native-inappbrowser-reborn'
|
import {getInitialURL, extractHashFragment, clearHash} from '../platform/urls'
|
||||||
import {isWeb} from '../platform/detection'
|
import * as authFlow from '../platform/auth-flow'
|
||||||
import {
|
|
||||||
getInitialURL,
|
|
||||||
extractHashFragment,
|
|
||||||
clearHash,
|
|
||||||
makeAppUrl,
|
|
||||||
} from '../platform/urls'
|
|
||||||
import * as storage from './storage'
|
import * as storage from './storage'
|
||||||
import * as env from '../env'
|
|
||||||
|
|
||||||
const SCOPE = auth.writeCap(
|
const SCOPE = auth.writeCap(
|
||||||
'did:key:z6MkfRiFMLzCxxnw6VMrHK8pPFt4QAHS3jX3XM87y9rta6kP',
|
'did:key:z6MkfRiFMLzCxxnw6VMrHK8pPFt4QAHS3jX3XM87y9rta6kP',
|
||||||
|
@ -48,45 +40,7 @@ export async function initialLoadUcanCheck(authStore: ReactNativeStore) {
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function requestAppUcan(authStore: ReactNativeStore) {
|
export async function requestAppUcan(authStore: ReactNativeStore) {
|
||||||
const did = await authStore.getDid()
|
return authFlow.requestAppUcan(authStore, SCOPE)
|
||||||
const returnUrl = makeAppUrl()
|
|
||||||
const fragment = auth.requestAppUcanHashFragment(did, SCOPE, returnUrl)
|
|
||||||
const url = `${env.AUTH_LOBBY}#${fragment}`
|
|
||||||
|
|
||||||
if (isWeb) {
|
|
||||||
// @ts-ignore window is defined -prf
|
|
||||||
window.location.href = url
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
if (await InAppBrowser.isAvailable()) {
|
|
||||||
// use in-app browser
|
|
||||||
const res = await InAppBrowser.openAuth(url, returnUrl, {
|
|
||||||
// iOS Properties
|
|
||||||
ephemeralWebSession: false,
|
|
||||||
// Android Properties
|
|
||||||
showTitle: false,
|
|
||||||
enableUrlBarHiding: true,
|
|
||||||
enableDefaultShare: false,
|
|
||||||
})
|
|
||||||
if (res.type === 'success' && res.url) {
|
|
||||||
const fragment = extractHashFragment(res.url)
|
|
||||||
if (fragment) {
|
|
||||||
const ucan = await parseUrlForUcan(fragment)
|
|
||||||
if (ucan) {
|
|
||||||
await authStore.addUcan(ucan)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
console.log('Not completed', res)
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// use system browser
|
|
||||||
Linking.openURL(url)
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ReactNativeStore extends auth.AuthStore {
|
export class ReactNativeStore extends auth.AuthStore {
|
||||||
|
|
|
@ -7,7 +7,6 @@ import {
|
||||||
import {Environment} from './env'
|
import {Environment} from './env'
|
||||||
import * as storage from './storage'
|
import * as storage from './storage'
|
||||||
import * as auth from './auth'
|
import * as auth from './auth'
|
||||||
import * as urls from '../platform/urls'
|
|
||||||
|
|
||||||
const ROOT_STATE_STORAGE_KEY = 'root'
|
const ROOT_STATE_STORAGE_KEY = 'root'
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue