chore: some improvements

.github/workflows/ci.yaml

@@ -35,9 +35,15 @@ jobs:
       - name: Install dependencies
         run: pnpm install
 
+      - name: Style
+        run: pnpm style:check
+
       - name: Build
         run: pnpm build
 
+      - name: Check types
+        run: pnpm types:check
+
   continuous-deployment:
     if: github.event_name == 'workflow_dispatch'
 

.release-it.json

@@ -4,6 +4,7 @@
   },
   "npm": {
     "skipChecks": true,
+    "ignoreVersion": true,
     "tag": "latest"
   },
   "git": {

biome.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
+  "formatter": {
+    "lineWidth": 120,
+    "indentStyle": "space"
+  },
+  "javascript": {
+    "parser": {
+      "unsafeParameterDecoratorsEnabled": true
+    },
+    "formatter": {
+      "semicolons": "asNeeded",
+      "quoteStyle": "single",
+      "trailingCommas": "es5",
+      "lineWidth": 120,
+      "indentStyle": "space"
+    }
+  },
+  "json": {
+    "parser": {
+      "allowComments": true
+    }
+  },
+  "organizeImports": {
+    "enabled": true
+  },
+  "linter": {
+    "enabled": true
+  },
+  "vcs": {
+    "useIgnoreFile": true,
+    "clientKind": "git",
+    "enabled": true
+  }
+}

example/App.tsx

@@ -1,74 +1,70 @@
-import {
-  ariesAskar,
-  KeyAlgs,
-  LocalKeyHandle,
-} from "@hyperledger/aries-askar-react-native";
-import {
-  sign,
-  generateKeypair,
-  getPublicBytesForKeyId,
-} from "expo-secure-environment";
-import { Button } from "react-native";
-import { StyleSheet, View } from "react-native";
+import { generateKeypair, getPublicBytesForKeyId, sign } from '@animo-id/expo-secure-environment'
+import { KeyAlgs, LocalKeyHandle, ariesAskar } from '@hyperledger/aries-askar-react-native'
+import { Button } from 'react-native'
+import { StyleSheet, View } from 'react-native'
 
 export default function App() {
   const testBiometrics = async () => {
-    try{
-    const id = new Date().toString();
-    generateKeypair(id, true);
-    const publicKey = getPublicBytesForKeyId(id);
-    const key = ariesAskar.keyFromPublicBytes({
-      algorithm: KeyAlgs.EcSecp256r1,
-      publicKey,
-    });
-    const kHandle = new LocalKeyHandle(key.handle);
-    const message = new Uint8Array(10).fill(10);
-    const signature = await sign(id, new Uint8Array(message), true);
-    const isValid = ariesAskar.keyVerifySignature({
-      message,
-      signature,
-      localKeyHandle: kHandle,
-    });
+    try {
+      const id = new Date().toString()
+      generateKeypair(id, true)
+      const publicKey = getPublicBytesForKeyId(id)
+      const key = ariesAskar.keyFromPublicBytes({
+        algorithm: KeyAlgs.EcSecp256r1,
+        publicKey,
+      })
+      const kHandle = new LocalKeyHandle(key.handle)
+      const message = new Uint8Array(10).fill(10)
+      const signature = await sign(id, new Uint8Array(message), true)
+      const isValid = ariesAskar.keyVerifySignature({
+        message,
+        signature,
+        localKeyHandle: kHandle,
+      })
 
-    console.log(isValid);
-    }catch(e) {
-      console.error('ERRRRRR', e)
+      console.log('Signing with biometrics enabled isValid: ', isValid)
+    } catch (e) {
+      console.error('Error signing with biometrics enabled', e)
     }
-  };
+  }
 
   const testNoBiometrics = async () => {
-    const id = new Date().toString();
-    generateKeypair(id, false);
-    const publicKey = getPublicBytesForKeyId(id);
-    const key = ariesAskar.keyFromPublicBytes({
-      algorithm: KeyAlgs.EcSecp256r1,
-      publicKey,
-    });
-    const kHandle = new LocalKeyHandle(key.handle);
-    const message = new Uint8Array(10).fill(10);
-    const signature = await sign(id, new Uint8Array(message), false);
-    const isValid = ariesAskar.keyVerifySignature({
-      message,
-      signature,
-      localKeyHandle: kHandle,
-    });
+    try {
+      const id = new Date().toString()
+      generateKeypair(id, false)
+      const publicKey = getPublicBytesForKeyId(id)
+      const key = ariesAskar.keyFromPublicBytes({
+        algorithm: KeyAlgs.EcSecp256r1,
+        publicKey,
+      })
+      const kHandle = new LocalKeyHandle(key.handle)
+      const message = new Uint8Array(10).fill(10)
+      const signature = await sign(id, new Uint8Array(message), false)
+      const isValid = ariesAskar.keyVerifySignature({
+        message,
+        signature,
+        localKeyHandle: kHandle,
+      })
 
-    console.log(isValid);
-  };
+      console.log('Signing with biometrics disabled isValid: ', isValid)
+    } catch (e) {
+      console.error('Error signing with biometrics disabled', e)
+    }
+  }
 
   return (
     <View style={styles.container}>
       <Button title="test biometrics" onPress={testBiometrics} />
       <Button title="test without biometrics" onPress={testNoBiometrics} />
     </View>
-  );
+  )
 }
 
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    backgroundColor: "#fff",
-    alignItems: "center",
-    justifyContent: "center",
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center',
   },
-});
+})

example/app.json

@@ -13,7 +13,10 @@
     },
     "ios": {
       "supportsTablet": true,
-      "bundleIdentifier": "id.animo.secure.environment.example"
+      "bundleIdentifier": "id.animo.secure.environment.example",
+      "infoPlist": {
+        "NSFaceIDUsageDescription": "FaceID is used to securely sign data"
+      }
     },
     "android": {
       "adaptiveIcon": {

example/babel.config.js

@@ -1,6 +1,6 @@
-module.exports = function (api) {
-  api.cache(true);
+module.exports = (api) => {
+  api.cache(true)
   return {
     presets: ['babel-preset-expo'],
-  };
-};
+  }
+}

example/index.js

@@ -1,5 +1,5 @@
-import { registerRootComponent } from "expo";
+import { registerRootComponent } from 'expo'
 
-import App from "./App";
+import App from './App'
 
-registerRootComponent(App);
+registerRootComponent(App)

example/metro.config.js

@@ -1,8 +1,8 @@
 // Learn more https://docs.expo.io/guides/customizing-metro
-const { getDefaultConfig } = require('expo/metro-config');
-const path = require('path');
+const { getDefaultConfig } = require('expo/metro-config')
+const path = require('node:path')
 
-const config = getDefaultConfig(__dirname);
+const config = getDefaultConfig(__dirname)
 
 // npm v7+ will install ../node_modules/react and ../node_modules/react-native because of peerDependencies.
 // To prevent the incompatible react-native between ./node_modules/react-native and ../node_modules/react-native,
@@ -11,24 +11,24 @@ config.resolver.blockList = [
   ...Array.from(config.resolver.blockList ?? []),
   new RegExp(path.resolve('..', 'node_modules', 'react')),
   new RegExp(path.resolve('..', 'node_modules', 'react-native')),
-];
+]
 
 config.resolver.nodeModulesPaths = [
   path.resolve(__dirname, './node_modules'),
   path.resolve(__dirname, '../node_modules'),
-];
+]
 
 config.resolver.extraNodeModules = {
-  'expo-secure-environment': '..',
-};
+  '@animo-id/expo-secure-environment': '..',
+}
 
-config.watchFolders = [path.resolve(__dirname, '..')];
+config.watchFolders = [path.resolve(__dirname, '..')]
 
 config.transformer.getTransformOptions = async () => ({
   transform: {
     experimentalImportSupport: false,
     inlineRequires: true,
   },
-});
+})
 
-module.exports = config;
+module.exports = config

example/package.json

@@ -6,18 +6,16 @@
     "start": "expo start",
     "android": "expo run:android",
     "ios": "expo run:ios",
-    "web": "expo start --web"
+    "prebuild": "expo prebuild --no-install"
   },
   "dependencies": {
     "@babel/runtime": "^7.24.8",
     "@hyperledger/aries-askar-react-native": "^0.2.3",
-    "@react-native/assets-registry": "^0.74.85",
     "expo": "~51.0.22",
     "react": "18.2.0",
     "react-native": "0.74.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
     "@types/react": "~18.2.45",
     "typescript": "^5.1.3"
   },

example/tsconfig.json

@@ -3,8 +3,7 @@
   "compilerOptions": {
     "strict": true,
     "paths": {
-      "expo-secure-environment": ["../src/index"],
-      "expo-secure-environment/*": ["../src/*"]
+      "@animo-id/expo-secure-environment": ["../src/index"]
     }
   }
 }

ios/SecureEnvironment.swift

@@ -15,18 +15,19 @@ struct SecureEnvironment {
           kSecAttrApplicationTag as String: Bundle.main.bundleIdentifier.unsafelyUnwrapped,
         ],
     ]
-
+
+    var flags: SecAccessControlCreateFlags = [.privateKeyUsage]
     if biometricsBacked {
-      let accessControl = SecAccessControlCreateWithFlags(
-        kCFAllocatorDefault,
-        kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
-        [.privateKeyUsage, .biometryCurrentSet],
-        nil
-      )
-
-      attributes[kSecAttrAccessControl as String] = accessControl
+      flags.insert(.biometryCurrentSet)
     }
 
+    attributes[kSecAttrAccessControl as String] = SecAccessControlCreateWithFlags(
+      kCFAllocatorDefault,
+      kSecAttrAccessibleWhenUnlockedThisDeviceOnly,
+      flags,
+      nil
+    )
+
     var error: Unmanaged<CFError>?
     guard SecKeyCreateRandomKey(attributes as CFDictionary, &error) != nil else {
       throw error!.takeRetainedValue() as Error

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@animo-id/expo-secure-environment",
-  "version": "0.1.0-alpha.3",
+  "version": "0.0.0",
   "description": "Expo Secure Environment",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -9,17 +9,15 @@
   },
   "scripts": {
     "build": "EXPO_NONINTERACTIVE=1 expo-module build",
+    "style:check": "biome check --unsafe",
+    "style:fix": "biome check --write --unsafe",
+    "types:check": "EXPO_NONINTERACTIVE=1 expo-module typecheck",
     "expo-module": "expo-module",
     "open:ios": "xed example/ios",
     "open:android": "open -a \"Android Studio\" example/android",
     "release": "release-it"
   },
-  "keywords": [
-    "react-native",
-    "expo",
-    "expo-secure-environment",
-    "ExpoSecureEnvironment"
-  ],
+  "keywords": ["react-native", "expo", "expo-secure-environment", "ExpoSecureEnvironment"],
   "repository": "https://github.com/animo/expo-secure-environment",
   "bugs": {
     "url": "https://github.com/animo/expo-secure-environment/issues"
@@ -33,10 +31,12 @@
     "@peculiar/asn1-x509": "^2.3.8"
   },
   "devDependencies": {
+    "@biomejs/biome": "^1.8.3",
     "@types/react": "^18.0.25",
     "expo-module-scripts": "^3.5.2",
     "expo-modules-core": "^1.12.19",
-    "release-it": "^17.4.1"
+    "release-it": "^17.4.1",
+    "typescript": "^5.5.4"
   },
   "peerDependencies": {
     "expo": "*",