Merge pull request #10 from torusresearch/FD-594

Fd 594 login dropdown and choosing browser

Author: chaitanyapotti

.idea/deploymentTargetDropDown.xml

@@ -83,12 +83,10 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        openlogin = OpenLogin(
-            this,
+        openlogin = OpenLogin(OpenLoginOptions(context = this,
             clientId = getString(R.string.openlogin_client_id),
             network = OpenLogin.Network.MAINNET,
-            redirectUrl = Uri.parse("{YOUR_APP_PACKAGE_NAME}://auth"),
-        )
+            redirectUrl = Uri.parse("{YOUR_APP_PACKAGE_NAME}://auth")))
 
         // Handle user signing in when app is not alive
         openlogin.setResultUrl(intent?.data)
@@ -106,7 +104,17 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun onClickLogin() {
-        openlogin.login()
+        val selectedLoginProvider = OpenLogin.Provider.GOOGLE   // Can be Google, Facebook, Twitch etc
+        val loginCompletableFuture: CompletableFuture<State> = openlogin.login(LoginParams(selectedLoginProvider))
+        
+        loginCompletableFuture.whenComplete { state, error ->
+            if (error == null) {
+                // render logged in UI
+            } else {
+                // render login error UI
+            }
+
+        }
     }
 
     //...
@@ -127,18 +135,32 @@ Make sure your sign-in activity `launchMode` is set to `singleTop` in your `Andr
 
 ```kotlin
 class OpenLogin(
-    context: Context, // Android context to launch Web-based authentication, usually is the current activity
-    clientId: String, // Your OpenLogin project ID
-    network: Network, // Network to run OpenLogin, either MAINNET or TESTNET
-    redirectUrl: Uri? = null, // URL that OpenLogin will redirect API responses
-)
+    var openLoginOptions : OpenLoginOptions
+) {
     // Trigger login flow that shows a modal for user to select one of supported providers to login,
     // e.g. Google, Facebook, Twitter, Passwordless, etc 
     fun login() {} 
 
-    // Trigger login flow using a specific provider
+    // Trigger login flow using login params. Specific Login Provider can be set through Login Params
     fun login(
-        loginProvider: Provider,
+        loginParams: LoginParams,
     ) {}
 } 
+
+data class OpenLoginOptions(
+    context: Context, // Android context to launch Web-based authentication, usually is the current activity
+    clientId: String, // Your OpenLogin project ID
+    network: Network, // Network to run OpenLogin, either MAINNET or TESTNET
+    redirectUrl: Uri? = null, // URL that OpenLogin will redirect API responses
+)
+
+data class LoginParams(
+    val loginProvider: OpenLogin.Provider,
+    val reLogin: Boolean? = null,
+    val skipTKey: Boolean? = null,
+    val extraLoginOptions: ExtraLoginOptions? = null,
+    val redirectUrl: Uri? = null,
+    val appState: String? = null
+)
+
 ```

.idea/gradle.xml

@@ -4,23 +4,36 @@ plugins {
 }
 
 android {
+    signingConfigs {
+        release {
+            storeFile file('/Users/tanuj/Desktop/Torus/open login/open_login')
+            storePassword 'torus123'
+            keyAlias 'key0'
+            keyPassword 'torus123'
+        }
+    }
     compileSdkVersion 31
-    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.openlogin.app"
         minSdkVersion 21
         targetSdkVersion 31
         versionCode 1
         versionName "1.0"
+        manifestPlaceholders = [
+                'torusRedirectScheme'    : 'torusapp',
+                'torusRedirectHost'      : 'org.torusresearch.openloginexample',
+                'torusRedirectPathPrefix': '/redirect'
+        ]
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
     }
     compileOptions {
@@ -40,6 +53,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.2'
 
+    // Completable Futures support
+    implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:1.7.4'
+
     // Encoding
     implementation 'com.google.code.gson:gson:2.8.9'
 

.idea/jarRepositories.xml

@@ -1,21 +1,6 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#### GSON
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer

.idea/misc.xml

@@ -27,11 +27,11 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <!-- Accept URIs: http://localhost[:*]/redirect/* -->
                 <data
-                    android:host="org.torusresearch.openloginexample"
-                    android:pathPrefix="/redirect"
-                    android:scheme="torusapp" />
+                    android:host="${torusRedirectHost}"
+                    android:pathPattern="/*"
+                    android:pathPrefix="${torusRedirectPathPrefix}"
+                    android:scheme="${torusRedirectScheme}" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

README.md

@@ -0,0 +1,8 @@
+package com.openlogin.app
+
+import com.openlogin.core.OpenLogin
+
+data class LoginVerifier (
+    val name : String,
+    val loginProvider : OpenLogin.Provider
+    )

app/build.gradle

@@ -3,44 +3,97 @@ package com.openlogin.app
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.View
-import android.widget.Button
-import android.widget.TextView
+import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.textfield.TextInputLayout
 import com.google.gson.Gson
-import com.openlogin.core.AuthStateChangeListener
 import com.openlogin.core.OpenLogin
+import com.openlogin.core.isEmailValid
+import com.openlogin.core.types.ExtraLoginOptions
+import com.openlogin.core.types.LoginParams
+import com.openlogin.core.types.OpenLoginOptions
+import com.openlogin.core.types.OpenLoginResponse
+import java8.util.concurrent.CompletableFuture
 
-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity(), AdapterView.OnItemClickListener {
     private lateinit var openlogin: OpenLogin
 
+    private val verifierList : List<LoginVerifier> = listOf(
+        LoginVerifier("Google", OpenLogin.Provider.GOOGLE),
+        LoginVerifier("Facebook", OpenLogin.Provider.FACEBOOK),
+        LoginVerifier("Twitch", OpenLogin.Provider.TWITCH),
+        LoginVerifier("Discord", OpenLogin.Provider.DISCORD),
+        LoginVerifier("Reddit", OpenLogin.Provider.REDDIT),
+        LoginVerifier("Apple", OpenLogin.Provider.APPLE),
+        LoginVerifier("Github", OpenLogin.Provider.GITHUB),
+        LoginVerifier("LinkedIn", OpenLogin.Provider.LINKEDIN),
+        LoginVerifier("Twitter", OpenLogin.Provider.TWITTER),
+        LoginVerifier("Line", OpenLogin.Provider.LINE),
+        LoginVerifier("Hosted Email Passwordless", OpenLogin.Provider.EMAIL_PASSWORDLESS)
+    )
+
+    private var selectedLoginProvider: OpenLogin.Provider = OpenLogin.Provider.GOOGLE
+
     private val gson = Gson()
 
     private fun signIn() {
-        openlogin.login(OpenLogin.Provider.GOOGLE)
+        val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
+        var extraLoginOptions : ExtraLoginOptions? = null
+        if (selectedLoginProvider == OpenLogin.Provider.EMAIL_PASSWORDLESS) {
+            val hintEmail = hintEmailEditText.text.toString()
+            if (hintEmail.isBlank() || !hintEmail.isEmailValid()) {
+                Toast.makeText(this, "Please enter a valid Email.", Toast.LENGTH_LONG).show()
+                return
+            }
+            extraLoginOptions = ExtraLoginOptions(login_hint = hintEmail)
+        }
+
+        val loginCompletableFuture: CompletableFuture<OpenLoginResponse> = openlogin.login(LoginParams(selectedLoginProvider, extraLoginOptions = extraLoginOptions))
+        loginCompletableFuture.whenComplete { loginResponse, error ->
+            if (error == null) {
+                reRender(loginResponse)
+            } else {
+                Log.d("MainActivity_OpenLogin", error.message ?: "Something went wrong" )
+            }
+
+        }
     }
 
     private fun signOut() {
-        openlogin.logout()
+        val logoutCompletableFuture =  openlogin.logout()
+        logoutCompletableFuture.whenComplete { _, error ->
+            if (error == null) {
+                reRender(OpenLoginResponse())
+            } else {
+                Log.d("MainActivity_OpenLogin", error.message ?: "Something went wrong" )
+            }
+        }
     }
 
-    private fun reRender() {
+    private fun reRender(openLoginResponse: OpenLoginResponse) {
         val contentTextView = findViewById<TextView>(R.id.contentTextView)
         val signInButton = findViewById<Button>(R.id.signInButton)
         val signOutButton = findViewById<Button>(R.id.signOutButton)
+        val spinner = findViewById<TextInputLayout>(R.id.verifierList)
+        val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
 
-        val key = openlogin.state.privKey
-        val userInfo = openlogin.state.userInfo
+        val key = openLoginResponse.privKey
+        val userInfo = openLoginResponse.userInfo
         if (key is String && key.isNotEmpty()) {
-            contentTextView.text = gson.toJson(openlogin.state)
+            contentTextView.text = gson.toJson(openLoginResponse)
             contentTextView.visibility = View.VISIBLE
             signInButton.visibility = View.GONE
             signOutButton.visibility = View.VISIBLE
+            spinner.visibility = View.GONE
+            hintEmailEditText.visibility = View.GONE
         } else {
             contentTextView.text = getString(R.string.not_logged_in)
             contentTextView.visibility = View.GONE
             signInButton.visibility = View.VISIBLE
             signOutButton.visibility = View.GONE
+            spinner.visibility = View.VISIBLE
         }
     }
 
@@ -49,27 +102,43 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         // Configure OpenLogin
-        openlogin = OpenLogin(
-            this,
+        openlogin = OpenLogin(OpenLoginOptions(context = this,
             clientId = getString(R.string.openlogin_project_id),
             network = OpenLogin.Network.MAINNET,
-            redirectUrl = Uri.parse("torusapp://org.torusresearch.openloginexample/redirect"),
-        )
+            redirectUrl = Uri.parse("torusapp://org.torusresearch.openloginexample/redirect")))
+
         openlogin.setResultUrl(intent.data)
-        openlogin.addAuthStateChangeListener(AuthStateChangeListener {
-            reRender()
-        })
 
         // Setup UI and event handlers
         val signInButton = findViewById<Button>(R.id.signInButton)
         signInButton.setOnClickListener { signIn() }
 
         val signOutButton = findViewById<Button>(R.id.signOutButton)
         signOutButton.setOnClickListener { signOut() }
+
+        val spinner = findViewById<AutoCompleteTextView>(R.id.spinnerTextView)
+        val loginVerifierList: List<String> = verifierList.map {
+            item -> item.name
+        }
+        val adapter: ArrayAdapter<String> =
+            ArrayAdapter(this, R.layout.item_dropdown, loginVerifierList)
+        spinner.setAdapter(adapter)
+        spinner.onItemClickListener = this
     }
 
     override fun onNewIntent(intent: Intent?) {
         super.onNewIntent(intent)
         openlogin.setResultUrl(intent?.data)
     }
+
+    override fun onItemClick(p0: AdapterView<*>?, p1: View?, p2: Int, p3: Long) {
+        selectedLoginProvider = verifierList[p2].loginProvider
+
+        val hintEmailEditText = findViewById<EditText>(R.id.etEmailHint)
+        if (selectedLoginProvider == OpenLogin.Provider.EMAIL_PASSWORDLESS) {
+            hintEmailEditText.visibility = View.VISIBLE
+        } else {
+            hintEmailEditText.visibility = View.GONE
+        }
+    }
 }