Merge pull request #31 from idpass/main

Contributing branch "main" from fork "idpass/main"

.eslintrc.json

@@ -0,0 +1,42 @@
+{
+  "env": {
+    "es2021": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:react/recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:sonarjs/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "jsx": true
+    },
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": ["react", "@typescript-eslint", "sonarjs"],
+  "settings": {
+    "react": {
+      "version": "detect"
+    }
+  },
+  "ignorePatterns": [
+    "node_modules",
+    "android",
+    "ios",
+    "assets",
+    "scripts",
+    "lib",
+    "*.typegen.ts"
+  ],
+  "root": true,
+  "rules": {
+    "@typescript-eslint/no-unused-vars": [
+      "error",
+      { "ignoreRestSiblings": true }
+    ]
+  }
+}

.github/workflows/android-custom-build.yml

@@ -25,12 +25,6 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           path: ~/.npm
 
-      - name: Cache local maven repository
-        uses: actions/cache@v2
-        with:
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-
       - name: Cache local gradle repository
         uses: actions/cache@v2
         with:
@@ -45,7 +39,7 @@ jobs:
       - name: Build App Newlogic Release
         run: |
           cd android
-          [ ! -z "$FIREBASE_SECRET" ] && gpg -o app/google-services.json --batch --passphrase="$FIREBASE_SECRET" -d app/google-services.json.gpg || echo "FIREBASE_SECRET not defined"
+          if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];then rm -f app/google-services.json;gpg -o app/google-services.json --batch --passphrase="$FIREBASE_SECRET" -d app/google-services.json.gpg;fi
           ./gradlew :app:assembleNewlogicRelease
         env:
           BACKEND_SERVICE_URL: ${{ github.event.inputs.backendServiceUrl }}

.github/workflows/android.yml

@@ -23,12 +23,6 @@ jobs:
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
           path: ~/.npm
 
-      - name: Cache local maven repository
-        uses: actions/cache@v2
-        with:
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          path: ~/.m2
-
       - name: Cache local gradle repository
         uses: actions/cache@v2
         with:
@@ -43,7 +37,7 @@ jobs:
       - name: Build App Newlogic Release
         run: |
           cd android
-          [ ! -z "$FIREBASE_SECRET" ] && gpg -o app/google-services.json --batch --passphrase="$FIREBASE_SECRET" -d app/google-services.json.gpg || echo "FIREBASE_SECRET not defined"
+          if [ ! -z "$FIREBASE_SECRET" ] && [ -f app/google-services.json.gpg ];then rm -f app/google-services.json;gpg -o app/google-services.json --batch --passphrase="$FIREBASE_SECRET" -d app/google-services.json.gpg;fi
           ./gradlew :app:assembleNewlogicRelease
         env:
           BACKEND_SERVICE_URL: https://qa-triple-rc2.mosip.net/residentmobileapp

.gitignore

@@ -17,7 +17,6 @@ web-build/
 *.aab
 android/app/debug/output-metadata.json
 android/app/release/output-metadata.json
-google-services.json
 
 # OSX
 #
@@ -78,4 +77,5 @@ dist/
 # @end expo-cli
 
 .vscode/
-temp/
+temp/
+.eslintcache

.husky/.gitignore

@@ -0,0 +1 @@
+_

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx lint-staged

.prettierrc.json

@@ -10,4 +10,4 @@
   "tabWidth": 2,
   "trailingComma": "es5",
   "useTabs": false
-}
+}

App.tsx

@@ -7,7 +7,9 @@ import { GlobalContext } from './shared/GlobalContext';
 import { useSelector } from '@xstate/react';
 import { selectIsReady } from './machines/app';
 
-const AppInitialization: React.FC = (props) => {
+import './i18n';
+
+const AppInitialization: React.FC = () => {
   const { appService } = useContext(GlobalContext);
   const hasFontsLoaded = useFont();
   const isReady = useSelector(appService, selectIsReady);

README.md

@@ -1,4 +1,5 @@
 # inji
+
 MOSIP citizen app.
 
 ## Dependencies
@@ -10,8 +11,8 @@ Be sure to have the following build tools installed before proceeding:
 - [Expo](https://docs.expo.dev/get-started/installation/)
 - [Android SDK](https://developer.android.com/)
 
-
 ## Generate keystore for APK signing
+
 ```shell
 keytool \
  -genkey -v \
@@ -31,10 +32,10 @@ keytool \
 ```shell
 # Install all dependencies
 npm install
-# run dev client
-npm start
-# run Inji directly to connected emulator or device (Default)
+# run Inji Newlogic directly to connected emulator or device (Default)
 npm run android:newlogic
+# run Inji Mosip directly to connected emulator or device
+npm run android:mosip
 # run Inji Philippines directly to connected emulator or device
 npm run android:ph
 ```
@@ -48,6 +49,7 @@ The app is available in this repository's `frontend/android` directory. Open thi
 More info here: [Build your app using Android Studio](https://developer.android.com/studio/run)
 
 ## Build via command line
+
 You need Android SDK CLI to build APK.
 
 ```shell
@@ -69,6 +71,9 @@ npm run build:android:ph
 
 # Build for Newlogic test
 npm run build:android:newlogic
+
+# Build for MOSIP test
+npm run build:android:mosip
 ```
 
 More info here: [Build your app from the command line](https://developer.android.com/studio/build/building-cmdline)
@@ -81,4 +86,5 @@ One can clone the repo and run the build via github actions as shown below.
 
 
 ## Credits
+
 Credits listed [here](/Credits.md)

android/app/build.gradle

@@ -141,6 +141,7 @@ android {
     ext {
         APP_NAME_RELEASE = "@string/app_name"
         APP_NAME_PH = "@string/app_name_ph"
+        APP_NAME_MOSIP = "@string/app_name_mosip"
         APP_NAME_NEWLOGIC = "@string/app_name_newlogic"
     }
 
@@ -207,22 +208,29 @@ android {
         }
     }
 
-    flavorDimensions "mosip"
+    flavorDimensions "inji"
 
     productFlavors {
-        ph {
-            versionName defaultConfig.versionName + "-ph"
+        mosip {
+            versionName defaultConfig.versionName + "-mosip"
             manifestPlaceholders = [
-                    APP_NAME: APP_NAME_PH
+                    APP_NAME: APP_NAME_MOSIP
             ]
-            dimension "mosip"
+            dimension "inji"
         }
         newlogic {
             versionName defaultConfig.versionName + "-newlogic"
             manifestPlaceholders = [
                     APP_NAME: APP_NAME_NEWLOGIC
             ]
-            dimension "mosip"
+            dimension "inji"
+        }
+        ph {
+            versionName defaultConfig.versionName + "-ph"
+            manifestPlaceholders = [
+                    APP_NAME: APP_NAME_PH
+            ]
+            dimension "inji"
         }
     }
 

android/app/google-services.json

@@ -0,0 +1,39 @@
+{
+  "project_info": {
+    "project_number": "259470317171",
+    "project_id": "mosip-resident-app",
+    "storage_bucket": "mosip-resident-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "",
+        "android_client_info": {
+          "package_name": "io.mosip.residentapp"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": ""
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -15,6 +15,8 @@
   <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
   <uses-permission android:name="android.permission.VIBRATE"/>
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+  <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+  <uses-permission android:name="android.permission.USE_FINGERPRINT" />
   <queries>
     <intent>
       <action android:name="android.intent.action.VIEW"/>
@@ -28,7 +30,7 @@
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_LAUNCH_WAIT_MS" android:value="0"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATE_URL" android:value="https://exp.host/@nlpaolo/mosip-resident-app"/>
-    <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustPan" android:theme="@style/Theme.App.SplashScreen" android:screenOrientation="portrait">
+   <activity android:name=".MainActivity" android:label="@string/app_name" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode" android:launchMode="singleTask" android:windowSoftInputMode="adjustPan" android:theme="@style/Theme.App.SplashScreen" android:screenOrientation="portrait">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>

android/app/src/main/java/io/mosip/residentapp/MainApplication.java

@@ -21,7 +21,6 @@
 import com.facebook.react.bridge.JSIModulePackage;
 import com.google.firebase.analytics.FirebaseAnalytics;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
-import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.List;
@@ -48,11 +47,6 @@ protected List<ReactPackage> getPackages() {
     protected String getJSMainModuleName() {
       return "index";
     }
-
-    @Override
-    protected JSIModulePackage getJSIModulePackage() {
-      return new ReanimatedJSIModulePackage();
-    }
   });
 
   @Override

android/app/src/main/res/values/strings.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <resources>
   <string name="app_name">MOSIP Resident App</string>
-  <string name="app_name_ph">MOSIP Resident App - PH</string>
+  <string name="app_name_mosip">MOSIP Resident App - Mosip/Inji</string>
   <string name="app_name_newlogic">MOSIP Resident App - Newlogic</string>
+  <string name="app_name_ph">MOSIP Resident App - PH</string>
   <string name="expo_splash_screen_resize_mode" translatable="false">contain</string>
   <string name="expo_splash_screen_status_bar_translucent" translatable="false">false</string>
 </resources>

app.config.ts

@@ -26,10 +26,9 @@ export default {
       backgroundColor: '#FFFFFF',
     },
   },
-  web: {
-    favicon: './assets/favicon.png',
-  },
   extra: {
     backendServiceUrl: process.env.BACKEND_SERVICE_URL,
   },
+  platforms: ['android', 'ios'],
+  privacy: 'hidden',
 };

babel.config.js

@@ -1,11 +1,22 @@
-module.exports = function(api) {
+module.exports = function (api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
     plugins: [
       ['babel-plugin-inline-import', {
         extensions: ['.md']
-      }]
-    ]
+      }],
+      [
+        'module-resolver',
+        {
+          alias: {
+            'isomorphic-webcrypto': 'isomorphic-webcrypto/src/react-native',
+            'fast-text-encoding': 'fast-text-encoding/text',
+            'jsonld': '@digitalcredentials/jsonld',
+            'jsonld-signatures': '@digitalcredentials/jsonld-signatures',
+          },
+        },
+      ],
+    ],
   };
 };

components/DeviceInfoList.strings.json

@@ -0,0 +1,6 @@
+{
+  "requestedBy": "Requested by",
+  "sentBy": "Sent by",
+  "deviceRefNumber": "Device reference number",
+  "name": "Name"
+}

components/DeviceInfoList.tsx

@@ -1,18 +1,21 @@
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { TextItem } from './ui/TextItem';
 
 export const DeviceInfoList: React.FC<DeviceInfoProps> = (props) => {
+  const { t } = useTranslation('DeviceInfoList');
+
   return (
     <React.Fragment>
       <TextItem
         divider
-        label={props.of === 'receiver' ? 'Requested by' : 'Sent by'}
+        label={props.of === 'receiver' ? t('requestedBy') : t('sentBy')}
         text={props.deviceInfo.deviceName}
       />
-      <TextItem divider label="Name" text={props.deviceInfo.name} />
+      <TextItem divider label={t('name')} text={props.deviceInfo.name} />
       <TextItem
         divider
-        label="Device reference number"
+        label={t('deviceRefNumber')}
         text={props.deviceInfo.deviceId}
       />
     </React.Fragment>