Add publish scripts (#1)

onelogin · Jun 1, 2020 · 3181d61 · 3181d61
1 parent 1f82f3f
commit 3181d61
Show file tree

Hide file tree

Showing 14 changed files with 179 additions and 34 deletions.
diff --git a/.github/workflows/publish-workflow.yml b/.github/workflows/publish-workflow.yml
@@ -0,0 +1,21 @@
+name: Publish library
+
+on:
+  release:
+    types:
+      - created
+
+jobs:
+  publish-library:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Publish to bintray
+        env:
+          BINTRAY_USER: ${{ secrets.BINTRAY_USER}}
+          BINTRAY_API_KEY: ${{ secrets.BINTRAY_API_KEY}}
+        run: ./gradlew install bintrayUpload
diff --git a/app/build.gradle b/app/build.gradle
@@ -46,12 +46,11 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(":oneloginoidc")
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.2.2'
     implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'

diff --git a/appjava/build.gradle b/appjava/build.gradle
@@ -43,7 +43,6 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(":oneloginoidc")
 
     implementation 'androidx.appcompat:appcompat:1.1.0'

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,6 @@ buildscript {
     repositories {
         google()
         jcenter()
-
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
@@ -15,14 +14,15 @@ buildscript {
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }
 
 allprojects {
     repositories {
         google()
         jcenter()
-
     }
 }
 

diff --git a/oneloginoidc/bintray.gradle b/oneloginoidc/bintray.gradle
@@ -0,0 +1,45 @@
+apply plugin: 'com.jfrog.bintray'
+
+version = '1.0.0'
+
+task sourcesJar(type: Jar) {
+    from android.sourceSets.main.java.srcDirs
+    archiveClassifier.set('sources')
+}
+
+task javadoc(type: Javadoc, dependsOn: dokka) {
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    archiveClassifier.set('javadoc')
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives javadocJar
+    archives sourcesJar
+}
+
+Properties properties = new Properties()
+def propertiesFile = project.rootProject.file('local.properties')
+if (propertiesFile.exists()) {
+    properties.load(propertiesFile.newDataInputStream())
+}
+
+// Bintray
+bintray {
+    user = properties.getProperty("bintray.user") ?: System.getenv('BINTRAY_USER')
+    key = properties.getProperty("bintray.apikey") ?: System.getenv('BINTRAY_API_KEY')
+
+    pkg {
+        repo = 'maven'
+        name = 'com.onelogin.oidc'
+        configurations = ['archives']
+        desc = 'OneLogin Android OIDC SDK.'
+        websiteUrl = 'https://github.com/onelogin/onelogin-oidc-android'
+        vcsUrl = 'https://github.com/onelogin/onelogin-oidc-android.git'
+        licenses = ["MIT"]
+        publish = true
+        publicDownloadNumbers = true
+    }
+}
diff --git a/oneloginoidc/build.gradle b/oneloginoidc/build.gradle
@@ -30,15 +30,14 @@ dokka {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.0'
     implementation 'net.openid:appauth:0.7.1'
-    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.5.0'
     implementation 'com.google.code.gson:gson:2.8.6'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.3'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7'
     implementation 'com.jakewharton.timber:timber:4.7.1'
 
     testImplementation 'junit:junit:4.12'
@@ -51,3 +50,6 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
+
+apply from: 'install.gradle'
+apply from: 'bintray.gradle'
diff --git a/oneloginoidc/install.gradle b/oneloginoidc/install.gradle
@@ -0,0 +1,50 @@
+apply plugin: 'com.github.dcendents.android-maven'
+
+group = 'com.onelogin.oidc'
+
+install {
+    repositories.mavenInstaller {
+        pom {
+            project {
+                packaging 'aar'
+                groupId 'com.onelogin.oidc'
+                artifactId 'oidc'
+                name 'OneLogin OIDC SDK'
+                description 'OneLogin OIDC SDK for android.'
+                url 'https://github.com/onelogin/onelogin-oidc-android'
+
+                licenses {
+                    license {
+                        name 'The MIT License'
+                        url 'https://opensource.org/licenses/MIT'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'miguelvillasenor'
+                        name 'Miguel Villaseñor'
+                        email 'miguel.villasenor@onelogin.com'
+                    }
+                }
+
+                scm {
+                    connection 'https://github.com/onelogin/onelogin-oidc-android.git'
+                    developerConnection 'https://github.com/onelogin/onelogin-oidc-android.git'
+                    url 'https://github.com/onelogin/onelogin-oidc-android'
+                }
+            }
+            withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+
+                //Iterate over the compile dependencies (we don't want the test ones), adding a <dependency> node for each
+                configurations.implementation.allDependencies.each {
+                    def dependencyNode = dependenciesNode.appendNode('dependency')
+                    dependencyNode.appendNode('groupId', it.group)
+                    dependencyNode.appendNode('artifactId', it.name)
+                    dependencyNode.appendNode('version', it.version)
+                }
+            }
+        }
+    }
+}
diff --git a/oneloginoidc/src/main/java/com/onelogin/oidc/OIDCClientFactory.kt b/oneloginoidc/src/main/java/com/onelogin/oidc/OIDCClientFactory.kt
@@ -1,15 +1,18 @@
 package com.onelogin.oidc
 
 import android.content.Context
+import android.os.Bundle
+import com.onelogin.oidc.data.AuthorizationServiceProvider
 import com.onelogin.oidc.data.OKHttpProvider
 import com.onelogin.oidc.data.network.ConfigurationClient
 import com.onelogin.oidc.data.network.NetworkClient
 import com.onelogin.oidc.data.repository.OIDCRepositoryImpl
 import com.onelogin.oidc.data.stores.OneLoginEncryptionManager
+import com.onelogin.oidc.data.stores.OneLoginEncryptionManager.Companion.ONELOGIN_SHARED_PREFERENCES
 import com.onelogin.oidc.data.stores.OneLoginStore
 import com.onelogin.oidc.login.SignInFragment
+import com.onelogin.oidc.login.SignInFragment.Companion.ARG_AUTHORIZATION_REQUEST
 import com.onelogin.oidc.login.SignInManagerImpl
-import net.openid.appauth.AuthorizationService
 
 internal class OIDCClientFactory(
     private val context: Context,
@@ -22,17 +25,22 @@ internal class OIDCClientFactory(
         val encryptionManager =
             configuration.encryptionManager ?: OneLoginEncryptionManager(context)
         val networkClient = NetworkClient(okHttpClient, configuration)
-        val preferences = context.getSharedPreferences("oneloginPreferences", Context.MODE_PRIVATE)
+        val preferences = context.getSharedPreferences(ONELOGIN_SHARED_PREFERENCES, Context.MODE_PRIVATE)
         val store = OneLoginStore(preferences)
         val repository =
             OIDCRepositoryImpl(configuration, configurationClient, store, encryptionManager)
-        val authorizationService = AuthorizationService(context)
+        AuthorizationServiceProvider.init(context)
+        val authorizationService = AuthorizationServiceProvider.authorizationService
         val signInManager = SignInManagerImpl(
             configuration,
             authorizationService,
             repository
-        ) { service, authorizationRequest ->
-            SignInFragment(service, authorizationRequest)
+        ) { authorizationRequest ->
+            val fragment = SignInFragment()
+            val args = Bundle()
+            args.putString(ARG_AUTHORIZATION_REQUEST, authorizationRequest.jsonSerializeString())
+            fragment.arguments = args
+            fragment
         }
 
         return OIDCClientImpl(authorizationService, networkClient, repository, signInManager)

diff --git a/oneloginoidc/src/main/java/com/onelogin/oidc/data/AuthorizationServiceProvider.kt b/oneloginoidc/src/main/java/com/onelogin/oidc/data/AuthorizationServiceProvider.kt
@@ -0,0 +1,18 @@
+package com.onelogin.oidc.data
+
+import android.content.Context
+import net.openid.appauth.AuthorizationService
+
+object AuthorizationServiceProvider {
+
+    val authorizationService by lazy {
+        AuthorizationService(context)
+    }
+
+    private lateinit var context: Context
+
+    fun init(context: Context) {
+        this.context = context
+    }
+
+}
diff --git a/oneloginoidc/src/main/java/com/onelogin/oidc/data/network/NetworkClient.kt b/oneloginoidc/src/main/java/com/onelogin/oidc/data/network/NetworkClient.kt
@@ -35,7 +35,7 @@ internal class NetworkClient(
             if (response.isSuccessful) {
                 return@withContext
             }
-            response.body()?.let {
+            response.body?.let {
                 val error = Gson().fromJson(it.string(), ErrorResponse::class.java)
                 throw NetworkException(error.errorDescription)
             } ?: throw  NetworkException("Unable to revoke token")
@@ -51,10 +51,10 @@ internal class NetworkClient(
         val response = okHttpClient.newCall(request).execute()
 
         return@withContext response.use {
-            if (response.isSuccessful && response.body() != null) {
-                Gson().fromJson(response.body()!!.string(), UserInfo::class.java)
+            if (response.isSuccessful && response.body != null) {
+                Gson().fromJson(response.body!!.string(), UserInfo::class.java)
             } else {
-                response.body()?.let {
+                response.body?.let {
                     val error = Gson().fromJson(it.string(), ErrorResponse::class.java)
                     throw NetworkException(error.errorDescription)
                 } ?: throw NetworkException("Unable to get user info")
@@ -77,10 +77,10 @@ internal class NetworkClient(
         val response = okHttpClient.newCall(request).execute()
 
         return@withContext response.use {
-            if (response.isSuccessful && response.body() != null) {
-                Gson().fromJson(response.body()!!.string(), TokenIntrospection::class.java)
+            if (response.isSuccessful && response.body != null) {
+                Gson().fromJson(response.body!!.string(), TokenIntrospection::class.java)
             } else {
-                response.body()?.let {
+                response.body?.let {
                     val error = Gson().fromJson(it.string(), ErrorResponse::class.java)
                     throw NetworkException(error.errorDescription)
                 } ?: throw NetworkException("Unable to introspect token")

diff --git a/oneloginoidc/src/main/java/com/onelogin/oidc/data/stores/OneLoginEncryptionManager.kt b/oneloginoidc/src/main/java/com/onelogin/oidc/data/stores/OneLoginEncryptionManager.kt
@@ -39,10 +39,12 @@ class OneLoginEncryptionManager(
         try {
             sharedPreferences = context.getSharedPreferences(ONELOGIN_SHARED_PREFERENCES, MODE_PRIVATE)
             if (!containsAlias()) {
+                sharedPreferences.edit().clear().apply()
                 generateKeys()
             } else {
                 if (!verifyKeys()) {
                     removeKeys()
+                    sharedPreferences.edit().clear().apply()
                     generateKeys()
                 }
             }
@@ -258,6 +260,6 @@ class OneLoginEncryptionManager(
         private const val RSA_ENCRYPTION = "RSA"
         private const val RSA_MODE = "RSA/ECB/PKCS1Padding"
         private const val AES_ENCRYPTED_KEY = "oneloginAesEncrypted"
-        private const val ONELOGIN_SHARED_PREFERENCES = "oneloginPreferences"
+        internal const val ONELOGIN_SHARED_PREFERENCES = "oneloginPreferences"
     }
 }
diff --git a/oneloginoidc/src/main/java/com/onelogin/oidc/login/SignInFragment.kt b/oneloginoidc/src/main/java/com/onelogin/oidc/login/SignInFragment.kt
@@ -2,28 +2,28 @@ package com.onelogin.oidc.login
 
 import android.content.Intent
 import androidx.fragment.app.Fragment
+import com.onelogin.oidc.data.AuthorizationServiceProvider
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.ClosedSendChannelException
 import net.openid.appauth.AuthorizationException
 import net.openid.appauth.AuthorizationRequest
 import net.openid.appauth.AuthorizationResponse
-import net.openid.appauth.AuthorizationService
 import timber.log.Timber
 
 
-internal class SignInFragment(
-    private val authorizationService: AuthorizationService,
-    private var authorizationRequest: AuthorizationRequest?
-) : Fragment() {
+internal class SignInFragment : Fragment() {
 
     internal val resultChannel = Channel<Pair<AuthorizationResponse?, AuthorizationException?>>()
 
     override fun onResume() {
         super.onResume()
+        val authorizationRequestString = arguments?.getString(ARG_AUTHORIZATION_REQUEST)
+        val authorizationRequest = authorizationRequestString?.let { AuthorizationRequest.jsonDeserialize(authorizationRequestString) }
         authorizationRequest?.let {
-            val authIntent = authorizationService.getAuthorizationRequestIntent(it)
+
+            val authIntent = AuthorizationServiceProvider.authorizationService.getAuthorizationRequestIntent(it)
             startActivityForResult(authIntent, AUTHORIZATION_REQUEST_CODE)
-            authorizationRequest = null
+            arguments?.putString(ARG_AUTHORIZATION_REQUEST, null)
         }
     }
 
@@ -50,6 +50,7 @@ internal class SignInFragment(
 
     companion object {
         internal const val AUTHORIZATION_REQUEST_CODE = 34001
+        internal const val ARG_AUTHORIZATION_REQUEST = "authorization_request"
         internal const val LOGIN_FRAGMENT_TAG = "login_fragment"
     }
 }
diff --git a/oneloginoidc/src/main/java/com/onelogin/oidc/login/SignInManagerImpl.kt b/oneloginoidc/src/main/java/com/onelogin/oidc/login/SignInManagerImpl.kt
@@ -14,7 +14,7 @@ internal class SignInManagerImpl(
     private val configuration: OIDCConfiguration,
     private val authorizationService: AuthorizationService,
     private val repository: OIDCRepository,
-    private val signInFragmentProvider: (AuthorizationService, AuthorizationRequest) -> SignInFragment
+    private val signInFragmentProvider: (AuthorizationRequest) -> SignInFragment
 ) : SignInManager {
 
     override suspend fun signIn(
@@ -26,7 +26,7 @@ internal class SignInManagerImpl(
 
         if (activity is FragmentActivity) {
             removeFragmentIfAttached(activity)
-            val loginFragment = signInFragmentProvider(authorizationService, authorizationRequest)
+            val loginFragment = signInFragmentProvider(authorizationRequest)
             attachLoginFragment(activity, loginFragment)
             loginFragment.resultChannel.consumeEach { (response, exception) ->
                 if (exception != null) {

diff --git a/oneloginoidc/src/test/java/com/onelogin/oidc/login/SignInManagerTest.kt b/oneloginoidc/src/test/java/com/onelogin/oidc/login/SignInManagerTest.kt
@@ -40,12 +40,12 @@ class SignInManagerTest {
         .clientId("testClientId")
         .build()
 
-    lateinit var signInManager: SignInManager
+    private lateinit var signInManager: SignInManager
 
     @Before
     fun setup() {
         signInManager =
-            SignInManagerImpl(oidcConfiguration, authorizationService, repository) { _, _ ->
+            SignInManagerImpl(oidcConfiguration, authorizationService, repository) { _ ->
                 signInFragment
             }