Fix CloudKit secret storage

Author: Imperiopolis

demo/ios/JuiceboxDemo.xcodeproj/project.pbxproj

@@ -501,7 +501,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuiceboxDemo/Entitlements.plist;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 5HW5GVQ38N;
+				DEVELOPMENT_TEAM = D5LDRT5BB3;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -606,7 +606,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = JuiceboxDemo/Entitlements.plist;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = 5HW5GVQ38N;
+				DEVELOPMENT_TEAM = D5LDRT5BB3;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"\"${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/universal\"",

demo/ios/JuiceboxDemo/Entitlements.plist

@@ -2,6 +2,12 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
+	<key>com.apple.developer.icloud-container-identifiers</key>
+	<array>
+		<string>iCloud.xyz.juicebox.demo</string>
+	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
 		<string>CloudKit</string>

demo/ios/SecretIdStorage.swift

@@ -19,8 +19,8 @@ class SecretIdStorage: NSObject {
 
   let container = CKContainer.default()
 
-  static let secretId = "SecretId"
-  let secretIdRecordId = CKRecord.ID(recordName: secretId)
+  static let recordType = "SecretId"
+  static let recordId = CKRecord.ID(recordName: "xyz.juicebox.jbid")
 
   @objc
   func register(
@@ -29,12 +29,20 @@ class SecretIdStorage: NSObject {
     reject: @escaping RCTPromiseRejectBlock
   ) {
     Task {
-      let record = CKRecord(recordType: Self.secretId, recordID: secretIdRecordId)
-      record.setObject(secretId as NSString, forKey: Self.secretId)
-
       do {
         try await checkAccountStatus()
+
+        let record: CKRecord
+
+        do {
+          record = try await fetchExistingRecord()
+        } catch AccountError.noRecord {
+          record = CKRecord(recordType: Self.recordType, recordID: Self.recordId)
+        }
+
+        record.setValue(secretId, forKey: Self.recordType)
         try await container.privateCloudDatabase.save(record)
+
         resolve(())
       } catch {
         reject("\((error as NSError).code)", "Failed to save record: \(error)", error)
@@ -50,8 +58,8 @@ class SecretIdStorage: NSObject {
     Task {
       do {
         try await checkAccountStatus()
-        let record = try await container.privateCloudDatabase.record(for: secretIdRecordId)
-        guard let secretId = record.object(forKey: Self.secretId) as? String else {
+        let record = try await fetchExistingRecord()
+        guard let secretId = record.value(forKey: Self.recordType) as? String else {
           throw AccountError.noRecord
         }
         resolve(secretId)
@@ -61,7 +69,15 @@ class SecretIdStorage: NSObject {
     }
   }
 
-  func checkAccountStatus() async throws {
+  private func fetchExistingRecord() async throws -> CKRecord {
+    do {
+      return try await container.privateCloudDatabase.record(for: Self.recordId)
+    } catch CKError.unknownItem {
+      throw AccountError.noRecord
+    }
+  }
+
+  private func checkAccountStatus() async throws {
     switch try await container.accountStatus() {
     case .couldNotDetermine, .noAccount, .temporarilyUnavailable:
       throw AccountError.notRegistered

demo/src/Screens/Secret.tsx

@@ -1,5 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { View, Text, TouchableOpacity, StyleSheet, Image } from 'react-native';
+import {
+  View,
+  Text,
+  TouchableOpacity,
+  StyleSheet,
+  Image,
+  Platform,
+} from 'react-native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { CommonActions } from '@react-navigation/native';
 
@@ -71,12 +78,12 @@ const styles = StyleSheet.create({
     backgroundColor: '#f7f7f7',
     borderRadius: 20,
     alignItems: 'center',
-    maxWidth: 375,
+    maxWidth: 360,
   },
   secretText: {
-    fontSize: 16,
+    fontSize: 15,
     fontWeight: '300',
-    fontFamily: 'monospace',
+    fontFamily: Platform.OS === 'ios' ? 'Courier New' : 'monospace',
     color: '#032f62',
     paddingVertical: 10,
     paddingHorizontal: 20,

demo/src/Screens/Setup.tsx

@@ -90,12 +90,27 @@ const Setup = ({ navigation, route }) => {
 
     if (secretId != null) return;
 
+    const isNotSignedInError = ({
+      message,
+      code,
+      domain,
+    }: {
+      message: string;
+      code: string;
+      domain: string | undefined;
+    }) => {
+      if (message === 'google drive unavailable') return true;
+      if (code === '0' && domain === 'Juicebox.SecretIdStorage.AccountError')
+        return true;
+      return false;
+    };
+
     const createSecretId = async () => {
       try {
         setSecretId(await SecretIdStorage.recover());
       } catch (e) {
         // @ts-ignore
-        if (e.message === 'google drive unavailable') {
+        if (isNotSignedInError(e)) {
           showNotSignedInError();
         } else {
           setSecretId(await JuiceboxSdk.randomSecretId());
@@ -109,9 +124,7 @@ const Setup = ({ navigation, route }) => {
       } catch (e) {
         showNotSignedInError(
           // @ts-ignore
-          e.message !== 'google drive unavailable'
-            ? 'An existing account was not found.'
-            : null
+          !isNotSignedInError(e) ? 'An existing account was not found.' : null
         );
       }
     };