diff --git a/.vscode/settings.json b/.vscode/settings.json index c87b85e..0ed5b42 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,6 @@ "amplify/#current-cloud-backend": true, "amplify/backend/amplify-meta.json": true, "amplify/backend/awscloudformation": true - } + }, + "java.configuration.updateBuildConfiguration": "interactive" } \ No newline at end of file diff --git a/amplify/backend/auth/safeqrfrontendmobile2d879dc9/cli-inputs.json b/amplify/backend/auth/safeqrfrontendmobile2d879dc9/cli-inputs.json index da5a6c8..32d32bc 100644 --- a/amplify/backend/auth/safeqrfrontendmobile2d879dc9/cli-inputs.json +++ b/amplify/backend/auth/safeqrfrontendmobile2d879dc9/cli-inputs.json @@ -44,10 +44,24 @@ "hostedUIDomainName": "safeqrfrontendmobile2d879dc9-2d879dc9", "authProvidersUserPool": [], "hostedUIProviderMeta": "[]", - "oAuthMetadata": "{\"AllowedOAuthFlows\":[\"code\"],\"AllowedOAuthScopes\":[\"phone\",\"email\",\"openid\",\"profile\",\"aws.cognito.signin.user.admin\"],\"CallbackURLs\":[\"http://localhost/\"],\"LogoutURLs\":[\"http://localhost/\"]}", "userPoolGroupList": [], "serviceName": "Cognito", "usernameCaseSensitive": false, - "useEnabledMfas": true + "useEnabledMfas": true, + "authRoleArn": { + "Fn::GetAtt": [ + "AuthRole", + "Arn" + ] + }, + "unauthRoleArn": { + "Fn::GetAtt": [ + "UnauthRole", + "Arn" + ] + }, + "breakCircularDependency": true, + "dependsOn": [], + "oAuthMetadata": "{\"AllowedOAuthFlows\":[\"code\"],\"AllowedOAuthScopes\":[\"phone\",\"email\",\"openid\",\"profile\",\"aws.cognito.signin.user.admin\"],\"CallbackURLs\":[\"com.safeqr.safeqr://\"],\"LogoutURLs\":[\"com.safeqr.safeqr://\"]}" } } \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 1fbd0c6..86bc471 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -83,9 +83,9 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion compileSdk rootProject.ext.compileSdkVersion - namespace 'com.piggyinu.safeqr' + namespace 'com.safeqr.safeqr' defaultConfig { - applicationId 'com.piggyinu.safeqr' + applicationId 'com.safeqr.safeqr' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9111922..d4a6e9c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -26,7 +26,8 @@ - + + diff --git a/android/app/src/main/java/com/piggyinu/safeqr/MainActivity.kt b/android/app/src/main/java/com/safeqr/safeqr/MainActivity.kt similarity index 98% rename from android/app/src/main/java/com/piggyinu/safeqr/MainActivity.kt rename to android/app/src/main/java/com/safeqr/safeqr/MainActivity.kt index 9f51e85..59587f3 100644 --- a/android/app/src/main/java/com/piggyinu/safeqr/MainActivity.kt +++ b/android/app/src/main/java/com/safeqr/safeqr/MainActivity.kt @@ -1,4 +1,4 @@ -package com.piggyinu.safeqr +package com.safeqr.safeqr import android.os.Build import android.os.Bundle diff --git a/android/app/src/main/java/com/piggyinu/safeqr/MainApplication.kt b/android/app/src/main/java/com/safeqr/safeqr/MainApplication.kt similarity index 98% rename from android/app/src/main/java/com/piggyinu/safeqr/MainApplication.kt rename to android/app/src/main/java/com/safeqr/safeqr/MainApplication.kt index 5d1d563..f41afc9 100644 --- a/android/app/src/main/java/com/piggyinu/safeqr/MainApplication.kt +++ b/android/app/src/main/java/com/safeqr/safeqr/MainApplication.kt @@ -1,4 +1,4 @@ -package com.piggyinu.safeqr +package com.safeqr.safeqr import android.app.Application import android.content.res.Configuration diff --git a/app.json b/app.json index 1f4a4a6..f7c9199 100644 --- a/app.json +++ b/app.json @@ -13,13 +13,13 @@ }, "ios": { "supportsTablet": true, - "bundleIdentifier": "com.piggyinu.safeqr" + "bundleIdentifier": "com.safeqr.safeqr" }, "web": { "favicon": "./assets/favicon.png" }, "android": { - "package": "com.piggyinu.safeqr" + "package": "com.safeqr.safeqr" }, "extra": { "eas": { diff --git a/ios/SafeQR.xcodeproj/project.pbxproj b/ios/SafeQR.xcodeproj/project.pbxproj index 4fa5772..67a64c4 100644 --- a/ios/SafeQR.xcodeproj/project.pbxproj +++ b/ios/SafeQR.xcodeproj/project.pbxproj @@ -3,19 +3,19 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ - 136F51B801324639BBC84D71 /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 515B046497E640AC8D931724 /* noop-file.swift */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */; }; + 8F9BEAB3584442C2BA6AC79F /* noop-file.swift in Sources */ = {isa = PBXBuildFile; fileRef = 45C51831FFAC4F1AAE520916 /* noop-file.swift */; }; + 92953508556F47FFAC8BC2C0 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = D0AB12384685DF11E6043E19 /* PrivacyInfo.xcprivacy */; }; 96905EF65AED1B983A6B3ABC /* libPods-SafeQR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-SafeQR.a */; }; B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */; }; BB2F792D24A3F905000567C9 /* Expo.plist in Resources */ = {isa = PBXBuildFile; fileRef = BB2F792C24A3F905000567C9 /* Expo.plist */; }; - DC4FDE1A7CAB2D741353B718 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 487419EC32288C77BA122735 /* PrivacyInfo.xcprivacy */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -25,14 +25,14 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = SafeQR/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = SafeQR/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = SafeQR/main.m; sourceTree = ""; }; - 3AFB9527515F400EB35B5271 /* SafeQR-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "SafeQR-Bridging-Header.h"; path = "SafeQR/SafeQR-Bridging-Header.h"; sourceTree = ""; }; - 487419EC32288C77BA122735 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = SafeQR/PrivacyInfo.xcprivacy; sourceTree = ""; }; - 515B046497E640AC8D931724 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "SafeQR/noop-file.swift"; sourceTree = ""; }; + 45C51831FFAC4F1AAE520916 /* noop-file.swift */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.swift; name = "noop-file.swift"; path = "SafeQR/noop-file.swift"; sourceTree = ""; }; 58EEBF8E8E6FB1BC6CAF49B5 /* libPods-SafeQR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-SafeQR.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 6C2E3173556A471DD304B334 /* Pods-SafeQR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SafeQR.debug.xcconfig"; path = "Target Support Files/Pods-SafeQR/Pods-SafeQR.debug.xcconfig"; sourceTree = ""; }; 7A4D352CD337FB3A3BF06240 /* Pods-SafeQR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-SafeQR.release.xcconfig"; path = "Target Support Files/Pods-SafeQR/Pods-SafeQR.release.xcconfig"; sourceTree = ""; }; + 93334EA1EB854B6090CDADD4 /* SafeQR-Bridging-Header.h */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.h; name = "SafeQR-Bridging-Header.h"; path = "SafeQR/SafeQR-Bridging-Header.h"; sourceTree = ""; }; AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = SplashScreen.storyboard; path = SafeQR/SplashScreen.storyboard; sourceTree = ""; }; BB2F792C24A3F905000567C9 /* Expo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Expo.plist; sourceTree = ""; }; + D0AB12384685DF11E6043E19 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; includeInIndex = 1; name = PrivacyInfo.xcprivacy; path = SafeQR/PrivacyInfo.xcprivacy; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; FAC715A2D49A985799AEE119 /* ExpoModulesProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ExpoModulesProvider.swift; path = "Pods/Target Support Files/Pods-SafeQR/ExpoModulesProvider.swift"; sourceTree = ""; }; /* End PBXFileReference section */ @@ -59,9 +59,9 @@ 13B07FB61A68108700A75B9A /* Info.plist */, 13B07FB71A68108700A75B9A /* main.m */, AA286B85B6C04FC6940260E9 /* SplashScreen.storyboard */, - 515B046497E640AC8D931724 /* noop-file.swift */, - 3AFB9527515F400EB35B5271 /* SafeQR-Bridging-Header.h */, - 487419EC32288C77BA122735 /* PrivacyInfo.xcprivacy */, + 45C51831FFAC4F1AAE520916 /* noop-file.swift */, + 93334EA1EB854B6090CDADD4 /* SafeQR-Bridging-Header.h */, + D0AB12384685DF11E6043E19 /* PrivacyInfo.xcprivacy */, ); name = SafeQR; sourceTree = ""; @@ -147,13 +147,13 @@ buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "SafeQR" */; buildPhases = ( 08A4A3CD28434E44B6B9DE2E /* [CP] Check Pods Manifest.lock */, - DF33316700EE35501FA087CD /* [Expo] Configure project */, + 8D5756BA5B117749D014F526 /* [Expo] Configure project */, 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, 13B07F8E1A680F5B00A75B9A /* Resources */, 00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */, 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */, - 1ADD7D4A03FBFA9C34EABFF0 /* [CP] Embed Pods Frameworks */, + BCE3E560776BC0BFF78C5386 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -203,7 +203,7 @@ BB2F792D24A3F905000567C9 /* Expo.plist in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 3E461D99554A48A4959DE609 /* SplashScreen.storyboard in Resources */, - DC4FDE1A7CAB2D741353B718 /* PrivacyInfo.xcprivacy in Resources */, + 92953508556F47FFAC8BC2C0 /* PrivacyInfo.xcprivacy in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -247,24 +247,6 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 1ADD7D4A03FBFA9C34EABFF0 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-SafeQR/Pods-SafeQR-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SafeQR/Pods-SafeQR-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 800E24972A6A228C8D4807E9 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -297,7 +279,7 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SafeQR/Pods-SafeQR-resources.sh\"\n"; showEnvVarsInLog = 0; }; - DF33316700EE35501FA087CD /* [Expo] Configure project */ = { + 8D5756BA5B117749D014F526 /* [Expo] Configure project */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; buildActionMask = 2147483647; @@ -316,6 +298,24 @@ shellPath = /bin/sh; shellScript = "# This script configures Expo modules and generates the modules provider file.\nbash -l -c \"./Pods/Target\\ Support\\ Files/Pods-SafeQR/expo-configure-project.sh\"\n"; }; + BCE3E560776BC0BFF78C5386 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-SafeQR/Pods-SafeQR-frameworks.sh", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-SafeQR/Pods-SafeQR-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -326,7 +326,7 @@ 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */, 13B07FC11A68108700A75B9A /* main.m in Sources */, B18059E884C0ABDD17F3DC3D /* ExpoModulesProvider.swift in Sources */, - 136F51B801324639BBC84D71 /* noop-file.swift in Sources */, + 8F9BEAB3584442C2BA6AC79F /* noop-file.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -341,7 +341,6 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = SafeQR/SafeQR.entitlements; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 5WMH54H74H; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -349,10 +348,7 @@ ); INFOPLIST_FILE = SafeQR/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", @@ -360,7 +356,7 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG"; - PRODUCT_BUNDLE_IDENTIFIER = com.piggyinu.safeqr; + PRODUCT_BUNDLE_IDENTIFIER = com.safeqr.safeqr; PRODUCT_NAME = SafeQR; SWIFT_OBJC_BRIDGING_HEADER = "SafeQR/SafeQR-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -378,13 +374,9 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = SafeQR/SafeQR.entitlements; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 5WMH54H74H; INFOPLIST_FILE = SafeQR/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.4; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", @@ -392,7 +384,7 @@ "-lc++", ); OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE"; - PRODUCT_BUNDLE_IDENTIFIER = com.piggyinu.safeqr; + PRODUCT_BUNDLE_IDENTIFIER = com.safeqr.safeqr; PRODUCT_NAME = SafeQR; SWIFT_OBJC_BRIDGING_HEADER = "SafeQR/SafeQR-Bridging-Header.h"; SWIFT_VERSION = 5.0; @@ -453,10 +445,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = ( - /usr/lib/swift, - "$(inherited)", - ); + LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; @@ -515,10 +504,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 13.4; LD = ""; LDPLUSPLUS = ""; - LD_RUNPATH_SEARCH_PATHS = ( - /usr/lib/swift, - "$(inherited)", - ); + LD_RUNPATH_SEARCH_PATHS = "/usr/lib/swift $(inherited)"; LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift\"$(inherited)\""; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = ( diff --git a/ios/SafeQR.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/SafeQR.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d9810..0000000 --- a/ios/SafeQR.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/ios/SafeQR/Info.plist b/ios/SafeQR/Info.plist index 96ff081..c2e63ad 100644 --- a/ios/SafeQR/Info.plist +++ b/ios/SafeQR/Info.plist @@ -27,7 +27,13 @@ CFBundleURLSchemes - com.piggyinu.safeqr + com.safeqr.safeqr + + + + CFBundleURLSchemes + + exp+safeqr diff --git a/screens/QRScannerScreen.tsx b/screens/QRScannerScreen.tsx index 787502c..09b1c6c 100644 --- a/screens/QRScannerScreen.tsx +++ b/screens/QRScannerScreen.tsx @@ -71,7 +71,7 @@ const QRScannerScreen: React.FC = () => { console.log('Sending QR code data to backend:', payload); try { - const response = await axios.post('http://192.168.10.247:8080/v1/api/qrcodetypes/detect', { + const response = await axios.post('https://localhost:8443/v1/api/qrcodetypes/detect', { data: payload, }, { headers: {