Add deleteAccount()

ref DEV-1525
authgear · Jul 17, 2024 · 4d4b3ab · 4d4b3ab
2 parents 59600e8 + 635cfe0
commit 4d4b3ab
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,8 +4,8 @@ plugins {
     // https://developer.android.com/build/releases/gradle-plugin#8-1-0
     // If you ever update Android Gradle Plugin, please also update
     // BUILD_TOOLS_VERSION in ./.github/workflows/ci.yaml
-    id("com.android.library") version "8.5.0" apply false
-    id("com.android.application") version "8.5.0" apply false
+    id("com.android.library") version "8.5.1" apply false
+    id("com.android.application") version "8.5.1" apply false
     id("org.jetbrains.kotlin.android") version "1.9.23" apply false
     kotlin("plugin.serialization") version "1.9.20" apply false
     id("org.jetbrains.dokka") version "1.9.10"

diff --git a/javasample/src/main/java/com/oursky/authgeartest/MainActivity.java b/javasample/src/main/java/com/oursky/authgeartest/MainActivity.java
@@ -58,6 +58,7 @@ public class MainActivity extends AppCompatActivity {
     private View mAuthenticateBiometric;
     private View mOpenSettings;
     private View mChangePassword;
+    private View mDeleteAccount;
     private View mFetchUserInfo;
     private View mShowAuthTime;
     private View mLogout;
@@ -92,6 +93,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mAuthenticateBiometric = findViewById(R.id.authenticateBiometric);
         mOpenSettings = findViewById(R.id.openSettings);
         mChangePassword = findViewById(R.id.changePassword);
+        mDeleteAccount = findViewById(R.id.deleteAccount);
         mFetchUserInfo = findViewById(R.id.fetchUserInfo);
         mShowAuthTime = findViewById(R.id.showAuthTime);
         mLogout = findViewById(R.id.logout);
@@ -149,6 +151,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mAuthenticateBiometric.setOnClickListener(view -> viewModel.authenticateBiometric(this));
         mOpenSettings.setOnClickListener(view -> viewModel.openSettings());
         mChangePassword.setOnClickListener(view -> viewModel.openChangePassword());
+        mDeleteAccount.setOnClickListener(view -> viewModel.openDeleteAccount());
         mFetchUserInfo.setOnClickListener(view -> viewModel.fetchUserInfo());
         mShowAuthTime.setOnClickListener(view -> viewModel.showAuthTime(this));
         mLogout.setOnClickListener(view -> viewModel.logout());
@@ -318,6 +321,8 @@ private void updateButtonDisabledState(MainViewModel viewModel) {
         mDisableBiometric.setEnabled(!isLoading && isConfigured && isBiometricEnabled);
         mAuthenticateBiometric.setEnabled(!isLoading && isConfigured && !isLoggedIn && isBiometricEnabled);
         mOpenSettings.setEnabled(!isLoading && isConfigured && isLoggedIn);
+        mChangePassword.setEnabled(!isLoading && isConfigured && isLoggedIn);
+        mDeleteAccount.setEnabled(!isLoading && isConfigured && isLoggedIn);
         mFetchUserInfo.setEnabled(!isLoading && isConfigured && isLoggedIn);
         mShowAuthTime.setEnabled(!isLoading && isConfigured && isLoggedIn);
         mLogout.setEnabled(!isLoading && isConfigured && isLoggedIn);

diff --git a/javasample/src/main/java/com/oursky/authgeartest/MainViewModel.java b/javasample/src/main/java/com/oursky/authgeartest/MainViewModel.java
@@ -715,6 +715,43 @@ public void onFailed(Throwable throwable) {
         });
     }
 
+    public void openDeleteAccount() {
+        mIsLoading.setValue(true);
+
+        mAuthgear.refreshIDToken(new OnRefreshIDTokenListener() {
+            @Override
+            public void onFinished() {
+                SettingsActionOptions options = new SettingsActionOptions(
+                        MainApplication.AUTHGEAR_REDIRECT_URI
+                );
+                options.setColorScheme(getColorScheme());
+                options.setWechatRedirectURI(MainApplication.AUTHGEAR_WECHAT_REDIRECT_URI);
+                mAuthgear.deleteAccount(options, new OnOpenSettingsActionListener() {
+                    @Override
+                    public void onFinished() {
+                        mIsLoading.setValue(false);
+                        Log.d(TAG, "deleteAccount finished");
+                    }
+
+                    @Override
+                    public void onFailed(Throwable throwable) {
+                        Log.d(TAG, throwable.toString());
+                        mIsLoading.setValue(false);
+                        setError(throwable);
+                    }
+                });
+            }
+
+            @Override
+            public void onFailed(Throwable throwable) {
+                Log.d(TAG, throwable.toString());
+                mIsLoading.setValue(false);
+                setError(throwable);
+            }
+        });
+    }
+
+
     public void promoteAnonymousUser() {
         mIsLoading.setValue(true);
         PromoteOptions options = new PromoteOptions(MainApplication.AUTHGEAR_REDIRECT_URI);

diff --git a/javasample/src/main/res/layout/activity_main.xml b/javasample/src/main/res/layout/activity_main.xml
@@ -464,6 +464,15 @@
                     android:text="Change password"
                     tools:ignore="HardcodedText" />
 
+                <Button
+                    android:id="@+id/deleteAccount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="16dp"
+                    android:text="Delete account"
+                    tools:ignore="HardcodedText" />
+
                 <Button
                     android:id="@+id/fetchUserInfo"
                     android:layout_width="wrap_content"

diff --git a/sdk/src/main/java/com/oursky/authgear/Authgear.kt b/sdk/src/main/java/com/oursky/authgear/Authgear.kt
@@ -508,6 +508,41 @@ constructor(
         }
     }
 
+    /**
+     * Open delete account page in webview
+     *
+     * @param options Setting options.
+     * @param listener The listener.
+     * @param handler The handler of the thread on which the listener is called.
+     */
+    @MainThread
+    @JvmOverloads
+    public fun deleteAccount(
+        options: SettingsActionOptions,
+        listener: OnOpenSettingsActionListener? = null,
+        handler: Handler = Handler(Looper.getMainLooper())
+    ) {
+        scope.launch {
+            try {
+                core.settingsAction(
+                    SettingsAction.DELETE_ACCOUNT,
+                    options
+                )
+                core.clearSession(SessionStateChangeReason.INVALID)
+                handler.post {
+                    listener?.onFinished()
+                }
+            } catch (e: Throwable) {
+                e.printStackTrace()
+                handler.post {
+                    listener?.onFailed(e)
+                }
+            } finally {
+                AuthgearCore.unregisteredWechatRedirectURI()
+            }
+        }
+    }
+
     /**
      * Promote the current anonymous user. Note that this must not be called before there is an
      * anonymous user.

diff --git a/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt b/sdk/src/main/java/com/oursky/authgear/AuthgearCore.kt
@@ -745,7 +745,7 @@ internal class AuthgearCore(
         }
     }
 
-    private fun clearSession(changeReason: SessionStateChangeReason) {
+    internal fun clearSession(changeReason: SessionStateChangeReason) {
         tokenStorage.deleteRefreshToken(name)
         storage.deleteApp2AppDeviceKeyId(name)
         synchronized(this) {

diff --git a/sdk/src/main/java/com/oursky/authgear/SettingsAction.kt b/sdk/src/main/java/com/oursky/authgear/SettingsAction.kt
@@ -1,5 +1,6 @@
 package com.oursky.authgear
 
 enum class SettingsAction(val raw: String) {
-    CHANGE_PASSWORD("change_password")
+    CHANGE_PASSWORD("change_password"),
+    DELETE_ACCOUNT("delete_account"),
 }