From 6a63c9055400666dbc1aa311e249f69498a164cc Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:43:10 +0100
Subject: [PATCH 1/8] Move 'deleteUser' responsibility to
 'useDemoSyncTriggers'.

---
 .../frontend/app/hooks/useDemoSyncTriggers.ts    | 16 +++++++++++++++-
 .../frontend/app/screens/StoreScreen.tsx         |  9 +++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/examples/rn-connection-and-error/frontend/app/hooks/useDemoSyncTriggers.ts b/examples/rn-connection-and-error/frontend/app/hooks/useDemoSyncTriggers.ts
index 57cff39594..91fbb08859 100644
--- a/examples/rn-connection-and-error/frontend/app/hooks/useDemoSyncTriggers.ts
+++ b/examples/rn-connection-and-error/frontend/app/hooks/useDemoSyncTriggers.ts
@@ -18,7 +18,7 @@
 
 import {useCallback, useEffect, useState} from 'react';
 import {BSON, ConnectionState, UserState} from 'realm';
-import {useRealm, useUser} from '@realm/react';
+import {useApp, useRealm, useUser} from '@realm/react';
 
 import {Store} from '../models/Store';
 import {logger} from '../utils/logger';
@@ -37,6 +37,7 @@ let mostRecentAccessToken: string | null = null;
  * You can also add a listener to the App (via `useApp()`).
  */
 export function useDemoSyncTriggers() {
+  const app = useApp();
   const realm = useRealm();
   const currentUser = useUser();
   const [isConnected, setIsConnected] = useState(true);
@@ -147,6 +148,18 @@ export function useDemoSyncTriggers() {
     await currentUser.refreshCustomData();
   }, [currentUser]);
 
+  /**
+   * Trigger the user event listener by removing the user from the app.
+   */
+  const deleteUser = useCallback(() => {
+    // TODO: Update to use only `deleteUser`.
+    // We currently call both `deleteUser` (deletes from server and client) and
+    // `removeUser` (deletes from client) due to a bug in `deleteUser` where the
+    // `currentUser` is not updated to `null`.
+    app.deleteUser(currentUser);
+    app.removeUser(currentUser);
+  }, [app, currentUser]);
+
   useEffect(() => {
     /**
      * The user listener - Will be invoked on various user related events including
@@ -196,5 +209,6 @@ export function useDemoSyncTriggers() {
     triggerSyncError,
     triggerClientReset,
     refreshAccessToken,
+    deleteUser,
   };
 }
diff --git a/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx b/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
index c27b814015..647dde6d56 100644
--- a/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
+++ b/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
@@ -18,7 +18,7 @@
 
 import React from 'react';
 import {Alert, FlatList, StyleSheet, Text, View} from 'react-native';
-import {useAuth, useApp, useUser} from '@realm/react';
+import {useAuth, useUser} from '@realm/react';
 
 import {Button} from '../components/Button';
 import {KioskItem} from '../components/KioskItem';
@@ -41,10 +41,10 @@ export function StoreScreen() {
     triggerSyncError,
     triggerClientReset,
     refreshAccessToken,
+    deleteUser,
   } = useDemoSyncTriggers();
   const {logOut} = useAuth();
   const user = useUser();
-  const app = useApp();
 
   return (
     <View style={styles.container}>
@@ -119,10 +119,7 @@ export function StoreScreen() {
               />
               <Button
                 extraStyles={[styles.button]}
-                onPress={() => {
-                  app.deleteUser(user);
-                  app.removeUser(user);
-                }}
+                onPress={deleteUser}
                 text="Delete User"
               />
               <Button

From 89d05a2b909016e4cdcbee063f9fb7d13550aee9 Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:46:50 +0100
Subject: [PATCH 2/8] Type the user data.

---
 .../frontend/app/screens/StoreScreen.tsx         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx b/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
index 647dde6d56..13d88c8054 100644
--- a/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
+++ b/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
@@ -27,6 +27,18 @@ import {fonts} from '../styles/fonts';
 import {useDemoSyncTriggers} from '../hooks/useDemoSyncTriggers';
 import {useStore} from '../providers/StoreProvider';
 
+/**
+ * The properties used as custom user data.
+ *
+ * @note
+ * Our backend function `onUserCreation()` adds these fields
+ * when the user registers.
+ */
+type CustomUserData = {
+  user_id: string;
+  team: string;
+};
+
 /**
  * Screen for showing the kiosks and products in the store,
  * as well as buttons for triggering various listeners.
@@ -44,7 +56,7 @@ export function StoreScreen() {
     deleteUser,
   } = useDemoSyncTriggers();
   const {logOut} = useAuth();
-  const user = useUser();
+  const user = useUser<{}, CustomUserData, {}>();
 
   return (
     <View style={styles.container}>
@@ -84,7 +96,7 @@ export function StoreScreen() {
             </View>
             <View style={styles.status}>
               <Text style={styles.statusText}>
-                Team: {user.customData?.team || '-'}
+                Team: {user.customData.team}
               </Text>
             </View>
             <View style={styles.triggerButtons}>

From a47ae29ba334885887e0cfdfb2de5cc2f7545a94 Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:51:26 +0100
Subject: [PATCH 3/8] Move user data text above connection text.

---
 .../frontend/app/screens/StoreScreen.tsx               | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx b/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
index 13d88c8054..ed62cb9632 100644
--- a/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
+++ b/examples/rn-connection-and-error/frontend/app/screens/StoreScreen.tsx
@@ -84,6 +84,11 @@ export function StoreScreen() {
             />
           </View>
           <View style={styles.triggers}>
+            <View style={styles.status}>
+              <Text style={styles.statusText}>
+                Team: {user.customData.team}
+              </Text>
+            </View>
             <View style={styles.status}>
               <Text style={styles.statusText}>
                 Status: {isConnected ? 'Connected 🟢' : 'Not connected 🔴'}
@@ -94,11 +99,6 @@ export function StoreScreen() {
                 text={isConnected ? 'Disconnect' : 'Connect'}
               />
             </View>
-            <View style={styles.status}>
-              <Text style={styles.statusText}>
-                Team: {user.customData.team}
-              </Text>
-            </View>
             <View style={styles.triggerButtons}>
               <Button
                 extraStyles={[styles.button]}

From c96d5663fd86fc0d4389ed6f560d0d6abb827f7d Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:52:54 +0100
Subject: [PATCH 4/8] Remove 'rollup-plugin-dts' from package lock.

---
 package-lock.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 18fdbf0a23..cb2323453e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29506,7 +29506,6 @@
         "react-native": "0.72.6",
         "react-test-renderer": "18.2.0",
         "realm": "*",
-        "rollup-plugin-dts": "^5.0.0",
         "ts-jest": "^29.0.5"
       },
       "optionalDependencies": {
@@ -35994,7 +35993,6 @@
         "react-native": "0.72.6",
         "react-test-renderer": "18.2.0",
         "realm": "*",
-        "rollup-plugin-dts": "^5.0.0",
         "ts-jest": "^29.0.5"
       },
       "dependencies": {

From ac95bc06e6a5109646f7167b504c3c1beeaf510c Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 15:57:09 +0100
Subject: [PATCH 5/8] Change 'onUserCreation' to run as 'App Auth' instead of
 'System User'.

---
 .../rn-connection-and-error/backend/functions/config.json     | 1 -
 .../backend/functions/onUserCreation.js                       | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/rn-connection-and-error/backend/functions/config.json b/examples/rn-connection-and-error/backend/functions/config.json
index 5d5b38f1bd..526d5d60f2 100644
--- a/examples/rn-connection-and-error/backend/functions/config.json
+++ b/examples/rn-connection-and-error/backend/functions/config.json
@@ -8,7 +8,6 @@
     {
         "name": "onUserCreation",
         "private": false,
-        "run_as_system": true,
         "disable_arg_logs": true
     }
 ]
diff --git a/examples/rn-connection-and-error/backend/functions/onUserCreation.js b/examples/rn-connection-and-error/backend/functions/onUserCreation.js
index 0653782de0..dc8b363335 100644
--- a/examples/rn-connection-and-error/backend/functions/onUserCreation.js
+++ b/examples/rn-connection-and-error/backend/functions/onUserCreation.js
@@ -7,9 +7,9 @@ exports = async function onUserCreation(user) {
   const customUserDataCollection = context.services.get("mongodb-atlas").db("AuthExample").collection("Users");
   try {
     await customUserDataCollection.insertOne({
-      // Save the user's account ID to your configured user_id_field
+      // Save the user's account ID to your configured user_id field.
       user_id: user.id,
-      // Store any other user data you want
+      // Store any other user data you want.
       team: "service",
     });
   } catch (e) {

From b52880e9cfc7712d51599c3a3ae628f8d9ecd3b7 Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 17:02:02 +0100
Subject: [PATCH 6/8] Add permission role to custom data collection.

---
 .../AuthExample/Users/rules.json              | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json

diff --git a/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json b/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json
new file mode 100644
index 0000000000..e9d3bf65ca
--- /dev/null
+++ b/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json
@@ -0,0 +1,29 @@
+{
+    "collection": "Users",
+    "database": "AuthExample",
+    "roles": [
+        {
+            "name": "ThisUser",
+            "apply_when": {
+                "roles": [
+                    {
+                        "name": "ThisUser",
+                        "apply_when": {
+                            "user_id": "%%user.id%%"
+                        },
+                        "insert": false,
+                        "read": true,
+                        "write": true,
+                        "search": false,
+                        "delete": false
+                    }
+                ],
+                "filters": []
+            },
+            "document_filters": {
+                "write": {},
+                "read": {}
+            }
+        }
+    ]
+}

From d91c4d534517975474b24f384d327a24221a72a1 Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 17:05:48 +0100
Subject: [PATCH 7/8] Update README.

---
 examples/rn-connection-and-error/README.md | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/examples/rn-connection-and-error/README.md b/examples/rn-connection-and-error/README.md
index 55210981f4..a4b5888490 100644
--- a/examples/rn-connection-and-error/README.md
+++ b/examples/rn-connection-and-error/README.md
@@ -71,7 +71,7 @@ It specifically addresses the following points:
       * With invalid password
       * With non-existent email
 * Listening (and triggering) when a user gets logged out.
-* Listening (and triggering) when a user's tokens are refreshed.
+* Listening (and triggering) when a user's tokens and custom data are refreshed.
 * Listening (and triggering) when the underlying sync session:
   * Tries to connect
   * Gets connected
@@ -201,17 +201,21 @@ To sync data used in this app you must first:
 
 ### Add an Atlas Function
 
-> If you set up your App Services App [via a CLI](#via-a-cli-recommended), you can **skip this step** as the function should already be defined for you.
+> If you set up your App Services App [via a CLI](#via-a-cli-recommended), you can **skip this step** as these functions should already be defined for you.
 
-We will add a function for forcing a client reset. The function is solely used for demo purposes and should not be used in production.
+We will add a function for forcing a client reset. The function is solely used for demo purposes and should not be used in production. We will also add a function to be run on user creation that adds fields to the user's [custom user data](https://www.mongodb.com/docs/atlas/app-services/users/custom-metadata/) document.
 
 To set this up via the App Services UI:
 
-1. [Define a function](https://www.mongodb.com/docs/atlas/app-services/functions/#define-a-function) with the following configurations:
+1. [Define two functions](https://www.mongodb.com/docs/atlas/app-services/functions/#define-a-function) with the following configurations:
     * Function name: `triggerClientReset`
       * Authentication: `System`
       * Private: `false`
       * Code: See [backend function](./backend/functions/triggerClientReset.js)
+    * Function name: `onUserCreation`
+      * Authentication: `Application Authentication`
+      * Private: `false`
+      * Code: See [backend function](./backend/functions/onUserCreation.js)
 
 ### Install Dependencies
 
@@ -253,7 +257,16 @@ npm run android
 
 > If you set up your App Services App [via a CLI](#via-a-cli-recommended), you can **skip this step** as the permissions should already be defined for you.
 
-After running the client app for the first time, [check the rules](https://www.mongodb.com/docs/atlas/app-services/rules/roles/#define-roles---permissions) for the collections in the App Services UI and make sure all collections have `readAndWriteAll` permissions (see [corresponding json](./backend/data_sources/mongodb-atlas/sync/Product/rules.json)).
+After running the client app for the first time, [modify the rules](https://www.mongodb.com/docs/atlas/app-services/rules/roles/#define-roles---permissions) for the collections in the App Services UI.
+
+* Collections: `Kiosk`, `Product`, `Store`
+  * Permissions: `readAndWriteAll` (see [corresponding json](./backend/data_sources/mongodb-atlas/sync/Product/rules.json))
+  * Explanation:
+    * All users will be able to read and write to the above collections.
+* Collection: `Users`
+  * Permissions: `ThisUser` (see [corresponding json](./backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json))
+  * Explanation:
+    * Users who have registered each have a `Users` document as custom user data. A user will be able to read and write to their own document (i.e. when `Users.user_id === <App User ID>`), but not anyone else's (see [Secure Custom User Data](https://www.mongodb.com/docs/atlas/app-services/users/custom-metadata/#secure-custom-user-data)).
 
 > To learn more and see examples of permissions depending on a certain use case, see [Device Sync Permissions Guide](https://www.mongodb.com/docs/atlas/app-services/sync/app-builder/device-sync-permissions-guide/#std-label-flexible-sync-permissions-guide) and [Data Access Role Examples](https://www.mongodb.com/docs/atlas/app-services/rules/examples/).
 

From 53afe75ab598e931f86181c0bb421499342d1738 Mon Sep 17 00:00:00 2001
From: LJ <81748770+elle-j@users.noreply.github.com>
Date: Mon, 30 Oct 2023 17:36:29 +0100
Subject: [PATCH 8/8] Update custom user data rules.json formatting.

---
 .../AuthExample/Users/rules.json              | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json b/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json
index e9d3bf65ca..0176ecaac0 100644
--- a/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json
+++ b/examples/rn-connection-and-error/backend/data_sources/mongodb-atlas/AuthExample/Users/rules.json
@@ -2,28 +2,21 @@
     "collection": "Users",
     "database": "AuthExample",
     "roles": [
-        {
-            "name": "ThisUser",
-            "apply_when": {
-                "roles": [
-                    {
-                        "name": "ThisUser",
-                        "apply_when": {
-                            "user_id": "%%user.id%%"
-                        },
-                        "insert": false,
-                        "read": true,
-                        "write": true,
-                        "search": false,
-                        "delete": false
-                    }
-                ],
-                "filters": []
-            },
-            "document_filters": {
-                "write": {},
-                "read": {}
-            }
-        }
-    ]
+    {
+        "name": "ThisUser",
+        "apply_when": {
+            "user_id": "%%user.id%%"
+        },
+        "document_filters": {
+            "write": {},
+            "read": {}
+        },
+        "read": true,
+        "write": true,
+        "insert": false,
+        "delete": false,
+        "search": false
+    }
+  ],
+  "filters": []
 }