Merge pull request #171 from blockstack/develop

Version 0.5.0

Author: friedger

.idea/assetWizardSettings.xml

@@ -4,7 +4,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [0.5.0] - 2019-10-12
+
+### Added
+- A `ResultError` type and enum `ErrorCode` to better represent errors from Blockstack
+
+### Changed
+- Replaced J2V8 with kotlin implementation of auth and storage protocol
+- Removed callbacks from all method calls
+- Replaced `Result.error` type String with type `ResultError`
+- `loadUserData` throws an error if user not logged in
+- `Network` methods return results, no callback used anymore
+- `Network.getNamePrice` is using v2 API (expecting amounts in decimals, not hex format)
 
 ## [0.4.8] - 2019-09-16
 

.idea/modules.xml

@@ -9,16 +9,15 @@ apply plugin: 'org.jetbrains.dokka-android'
 group = 'com.github.blockstack'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion 29
         versionCode 2
         versionName "0.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
     }
 
     signingConfigs {
@@ -41,6 +40,13 @@ android {
         unitTests.returnDefaultValues = true
     }
 
+    packagingOptions {
+        exclude 'META-INF/*'
+    }
+
+    lintOptions {
+        disable 'InvalidPackage'
+    }
 }
 
 dokka {
@@ -59,27 +65,56 @@ gitPublish {
 }
 
 dependencies {
-    implementation 'com.eclipsesource.j2v8:j2v8:4.8.4@aar'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.browser:browser:1.0.0'
-    implementation 'androidx.appcompat:appcompat:1.0.2'
     api 'com.squareup.okhttp3:okhttp:3.12.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0'
+
+    implementation "com.github.komputing.kethereum:crypto_api:$kethereum_version"
+    implementation "com.github.komputing.kethereum:base58:$kethereum_version"
+    implementation "com.github.komputing.kethereum:hashes:$kethereum_version"
+    api ("com.github.komputing.kethereum:bip32:$kethereum_version") {
+        exclude group:'com.github.komputing.KHash'
+    }
+    api "com.github.komputing.kethereum:bip44:$kethereum_version"
+    api ("com.github.komputing.kethereum:bip39:$kethereum_version") {
+        exclude group:'com.github.komputing.KHash'
+    }
+    implementation "com.github.komputing.kethereum:bip39_wordlist_en:$kethereum_version"
+
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.62'
+    api ("com.github.uport-project.kotlin-did-jwt:jwt:$did_jwt_version") {
+        exclude group:'com.github.komputing.KHash'
+        exclude group: 'com.squareup.okhttp3'
+    }
+
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.json:json:20180130'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:rules:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
     androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1'
 }
 
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 
+/**
+ * How to get a new `blockstack.js` version?
+ *
+ * 1. change the url in downloadBlockstackJs
+ * 2. ./gradlew updateBlockstackJs
+ */
+
+
 task downloadBlockstackJs(type: Download) {
-    src 'https://unpkg.com/blockstack@19.2.1/dist/blockstack.js'
+    src 'https://unpkg.com/blockstack@19.4.0-beta.1/dist/blockstack.js'
     dest new File(buildDir, 'blockstack.js')
 }
 

.idea/vcs.xml

@@ -1,27 +1,21 @@
 package org.blockstack.android.sdk
 
-import android.content.Context
 import android.preference.PreferenceManager
-import android.util.Log
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import kotlinx.coroutines.runBlocking
 import org.blockstack.android.sdk.model.BlockstackConfig
-import org.blockstack.android.sdk.model.Profile
-import org.blockstack.android.sdk.model.Proof
 import org.blockstack.android.sdk.model.toBlockstackConfig
 import org.blockstack.android.sdk.test.TestActivity
 import org.hamcrest.CoreMatchers.`is`
-import org.hamcrest.CoreMatchers.nullValue
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers
 import org.hamcrest.Matchers.notNullValue
-import org.hamcrest.Matchers.startsWith
-import org.json.JSONObject
-import org.junit.*
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
 import org.junit.runner.RunWith
-import java.util.*
-import java.util.concurrent.CountDownLatch
 
 val A_VALID_BLOCKSTACK_SESSION_JSON = "{\"transitKey\":\"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f\",\"userData\":{\"username\":null,\"profile\":{\"@type\":\"Person\",\"@context\":\"http:\\/\\/schema.org\",\"apps\":{\"https:\\/\\/app.graphitedocs.com\":\"https:\\/\\/gaia.blockstack.org\\/hub\\/1Fuzd6sJXqtXhgoFpb8W19Ao4BCG3EHQGf\\/\",\"https:\\/\\/app.misthos.io\":\"https:\\/\\/gaia.blockstack.org\\/hub\\/1CkGhNN71a1dpgXQjncunYZpXakJvwrpmc\\/\"},\"image\":[{\"@type\":\"ImageObject\",\"name\":\"avatar\",\"contentUrl\":\"https:\\/\\/gaia.blockstack.org\\/hub\\/12Gpr9kYXJJn4fWec4nRVwHLSrrTieeywt\\/\\/avatar-0\"}],\"name\":\"fm\"},\"decentralizedID\":\"did:btc-addr:12Gpr9kYXJJn4fWec4nRVwHLSrrTieeywt\",\"identityAddress\":\"12Gpr9kYXJJn4fWec4nRVwHLSrrTieeywt\",\"appPrivateKey\":\"89f92476f13f5b173e53926ad7d6e22baf78c6b1dcdf200c38dc73d2bf47d43b\",\"coreSessionToken\":null,\"authResponseToken\":\"eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NksifQ.eyJqdGkiOiI3MWI3NWY1Yi0xNDJkLTQxMzQtOGZkYy0zYWUyMWRmZTkzNjAiLCJpYXQiOjE1MzcxNjkxODYsImV4cCI6MTUzOTc2MTE4NSwiaXNzIjoiZGlkOmJ0Yy1hZGRyOjEyR3ByOWtZWEpKbjRmV2VjNG5SVndITFNyclRpZWV5d3QiLCJwcml2YXRlX2tleSI6IjdiMjI2OTc2MjIzYTIyMzEzOTMzMzM2NTM5MzYzNTY2NjMzNzM5NjM2MjYyMzAzNjY0NjMzMjM0MzIzNzY2NjY2MjYzMzczMjMyMzgzOTIyMmMyMjY1NzA2ODY1NmQ2NTcyNjE2YzUwNGIyMjNhMjIzMDMyMzQzMTY1MzY2NjYzMzEzODM0MzAzMDMyMzQzMTY0NjYzNzMzMzMzNTY1NjM2MjY2MzQzMzM0NjY2NDM5MzU2MjY0NjUzMjY2MzIzNTMxNjU2MzM3MzczNjMxMzQzNDM0MzAzMjY2NjUzNTM3NjE2MzYzMzA2MjY2MzQzNjYxMzQyMjJjMjI2MzY5NzA2ODY1NzI1NDY1Nzg3NDIyM2EyMjM5MzkzMTYxMzM2MzM1NjYzOTY2NjI2MzM2MzYzMzY2MzMzMDY0MzgzNzMxMzgzNzMyNjIzODM5MzMzMTYxMzMzMTMyNjUzMjM0NjM2MjM4MzAzNzM1NjQzODY0MzkzNzM1Mzg2MjM3NjEzMDY1NjMzMTM0Mzg2MTM2MzEzMjM2MzIzMjY1MzYzMjYyMzQ2NjY1NjYzNjMzNjMzMTYzNjYzMjMzNjEzMTM3MzM2NTM0NjUzOTMwMzIzMzM5MzQ2NDY1NjEzMTMxMzQzOTYzNjE2NTYxMzMzMzY2MzMzODY2NjIzMTMwMzczNTM0MzU2NDM1MzUzNDM3NjYzNjY2NjMzODMwMzg2MTM2MzIzNjM2MzAzMDMzNjMzNzM5MzMzNzM4MzYzMzM4MzMzNDMyNjEzNjYzMzMzOTM4MzM2MjM5MjIyYzIyNmQ2MTYzMjIzYTIyNjYzODMwMzQ2MjMzMzY2MjY0MzgzMjM2NjQzNTM3MzIzMzYxMzQzOTM4MzczOTYzMzAzMDYzNjQ2MzMzNjYzMDYxNjQzNzY0NjE2MTYyNjE2NDM0MzY2NDMzMzczNjY0MzUzMTYxNjI2NjYzNjYzMTM4MzM2MTM4MzAzNDMwMzgyMjJjMjI3NzYxNzM1Mzc0NzI2OTZlNjcyMjNhNzQ3Mjc1NjU3ZCIsInB1YmxpY19rZXlzIjpbIjAyODcyNmQyMGZhMTI4Yjc1OWViOGIwOWZjY2Y2ODU2ZTQzMjM1YmI5OTkxNjI0OWNmNjNhM2NiMjA0MTY0Y2I4ZSJdLCJwcm9maWxlIjpudWxsLCJ1c2VybmFtZSI6bnVsbCwiY29yZV90b2tlbiI6bnVsbCwiZW1haWwiOiJmcmllZGdlckBnbWFpbC5jb20iLCJwcm9maWxlX3VybCI6Imh0dHBzOi8vZ2FpYS5ibG9ja3N0YWNrLm9yZy9odWIvMTJHcHI5a1lYSkpuNGZXZWM0blJWd0hMU3JyVGllZXl3dC9wcm9maWxlLmpzb24iLCJodWJVcmwiOiJodHRwczovL2h1Yi5ibG9ja3N0YWNrLm9yZyIsInZlcnNpb24iOiIxLjIuMCJ9.QM8wx-EDjZrHk1ubK99divaejN5XAcCn_OkYAiPXQUNtzENUy8ogyrHzB4xC7mwfMckzFsMxEOdzwVW_Xcjqqg\",\"hubUrl\":\"https:\\/\\/hub.blockstack.org\"}}"
 
@@ -43,21 +37,10 @@ class BlockstackSessionAuthProfileTest {
     fun setup() {
         config = "https://flamboyant-darwin-d11c17.netlify.com".toBlockstackConfig(emptyArray())
         sessionStore = sessionStoreforIntegrationTests(rule)
-        session = BlockstackSession(rule.activity,
-                config,
-                sessionStore = sessionStore,
-                executor = IntegrationTestExecutor(rule))
+        session = BlockstackSession(sessionStore,
+                config, blockstack = Blockstack())
     }
 
-    @After
-    fun teardown() {
-        session.release()
-    }
-
-    @Test
-    fun loadedIsTrueAfterSessionCreated() {
-        Assert.assertThat(session.loaded, Matchers.`is`(true))
-    }
 
     @Test
     fun userIsSignedInAfterSessionCreated() {
@@ -71,20 +54,23 @@ class BlockstackSessionAuthProfileTest {
 
     @Test
     fun testHandlingPendingSignInWithInvalidToken() {
-        val latch = CountDownLatch(1)
         var error: String? = null
-        session.handlePendingSignIn("authResponse") {
-            latch.countDown()
-            error = it.error
+        runBlocking {
+            val it = session.handlePendingSignIn("invalidAuthResponseToken")
+            error = it.error?.message
         }
-        latch.await()
-        Assert.assertThat(error, Matchers.`is`("The authResponse parameter is an invalid base64 encoded token\n2 dots requires\nAuth response: authResponse"))
+        Assert.assertThat(error, Matchers.`is`("The authResponse parameter is an invalid base64 encoded token\n2 dots requires\nAuth response: invalidAuthResponseToken"))
     }
 
     @Test
-    fun loadUserDataIsNullAfterSignOut() {
+    fun loadUserDataIsInvalidAfterSignOut() {
         session.signUserOut()
-        assertThat(session.loadUserData(), `is`(nullValue()))
+        try {
+            session.loadUserData()
+            throw AssertionError("should have thrown an error that no user data was found")
+        } catch (e: Exception) {
+            assertThat(e.message, `is`("No user data found. Did the user sign in?"))
+        }
     }
 
     @Test
@@ -94,6 +80,8 @@ class BlockstackSessionAuthProfileTest {
         assertThat(session.isUserSignedIn(), `is`(false))
     }
 
+    /* TODO implement validateProofs
+
     @Test
     fun verifyProofsReturnsEmptyListForEmptyProfile() {
         val latch = CountDownLatch(1)
@@ -113,6 +101,7 @@ class BlockstackSessionAuthProfileTest {
         assertThat(proofList!!.size, `is`(0))
     }
 
+
     @Test
     fun verifyProofsReturnsAllProofsForFriedger() {
         val latch = CountDownLatch(1)
@@ -139,46 +128,13 @@ class BlockstackSessionAuthProfileTest {
         assertThat(proofList!![2].valid, `is`(true))
     }
 
-    @Test
-    fun generateAndStoreTransitKeyReturnsTheCorrectKey() {
-        val key = session.generateAndStoreTransitKey()
-        val storedKey = sessionStore.sessionData.json.getString("transitKey")
-        assertThat(key, `is`(storedKey))
-    }
+    */
 
-    @Test
-    fun makeAuthRequestReturnsValidRequestToken() {
-        val key = session.generateAndStoreTransitKey()
-        val authRequest = session.makeAuthRequest(key, Date(System.currentTimeMillis() + 3600000).time, mapOf(Pair("solicitGaiaHubUrl", true)))
-        assertThat(authRequest, startsWith("ey"))
-
-        val tokenPair = session.wrapProfileToken(authRequest)
-        val payload = tokenPair.decodedToken?.json?.optJSONObject("payload")
-        Log.d("payload", payload.toString())
-        assertThat(payload?.optString("domain_name"), `is`(config.appDomain.toString()))
-        assertThat(payload?.optBoolean("solicitGaiaHubUrl"), `is`(true))
-    }
-}
-
-class IntegrationTestExecutor(var rule: ActivityTestRule<*>) : Executor {
-    override fun onMainThread(function: (Context) -> Unit) {
-        function(rule.activity)
-    }
-
-    override fun onNetworkThread(function: suspend () -> Unit) {
-        runBlocking {
-            function()
-        }
-    }
-
-    override fun onV8Thread(function: () -> Unit) {
-        function()
-    }
 }
 
 fun sessionStoreforIntegrationTests(rule: ActivityTestRule<*>): SessionStore {
     val prefs = PreferenceManager.getDefaultSharedPreferences(rule.activity)
-    prefs.edit().putString("blockstack_session", A_VALID_BLOCKSTACK_SESSION_JSON)
+    prefs.edit().putString(BLOCKSTACK_SESSION, A_VALID_BLOCKSTACK_SESSION_JSON)
             .apply()
     return SessionStore(prefs)
 }

CHANGELOG.md

@@ -19,11 +19,11 @@ class BlockstackSessionCompanionTest {
 
     @Test
     fun verifyAuthResponseReturnsNullForValidAuthResponse() {
-        assertThat(BlockstackSession.verifyAuthResponse(TOKEN), isEmptyOrNullString())
+        assertThat(Blockstack.verifyAuthResponse(TOKEN)?.message, isEmptyOrNullString())
     }
 
     @Test
     fun verifyAuthResponseReturnsErrorForInValidAuthResponse() {
-        assertThat(BlockstackSession.verifyAuthResponse("a.b.c"), `is`("The authResponse parameter is an invalid base64 encoded token\nbad base-64\nAuth response: a.b.c"))
+        assertThat(Blockstack.verifyAuthResponse("a.b.c")?.message, `is`("The authResponse parameter is an invalid base64 encoded token\nbad base-64\nAuth response: a.b.c"))
     }
 }