Merge branch 'main' into feat/context-cogs

Author: pranavosu

.github/dependency-review/dependency-review-config.yml

@@ -24,3 +24,24 @@ allow-licenses:
   - 'Unlicense'
   - 'WTFPL'
   - 'Zlib'
+allow-dependencies-licenses:
+  # These packages are needed for nextjs (more detailed sharp)
+  # they are dynamic libraries and thus do not ship the underlying library
+  # which means they are not under LGPL strictly speaking.
+  # so an exception is valid here
+  # ALSO: none of these are shipped to the customer. they're only used as dev dependencies.
+  - 'pkg:npm/%2540img/sharp-libvips-darwin-arm64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-darwin-x64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linux-arm@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linux-arm64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linux-ppc64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linux-riscv64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linux-s390x@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linux-x64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linuxmusl-arm64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-libvips-linuxmusl-x64@1.2.4'
+  - 'pkg:npm/%2540img/sharp-wasm32'
+  - 'pkg:npm/%2540img/sharp-win32-arm64'
+  - 'pkg:npm/%2540img/sharp-win32-ia32'
+  - 'pkg:npm/%2540img/sharp-win32-x64'
+  - 'pkg:npm/unicode-match-property-value-ecmascript@2.2.1'

package.json

@@ -150,6 +150,7 @@
 		"**/on-headers": "1.1.0",
 		"**/form-data": "4.0.4",
 		"tmp": "^0.2.4",
+		"qs": "^6.14.1",
 		"js-yaml": "4.1.1"
 	},
 	"overrides": {

packages/adapter-nextjs/README.md

@@ -1,2 +1,6 @@
 This package contains the AWS Amplify Next.js Adapter. For more information on using Next.js in your application please reference the [Amplify Dev Center](https://docs.amplify.aws/javascript/build-a-backend/server-side-rendering/nextjs/).
 
+### Licensing Note
+Although this repository is released and licensed under the Apache License (see [LICENSE](./LICENSE)), its devDependencies transitively use the third party [sharp](https://sharp.pixelplumbing.com/) project.
+
+The sharp projects prebuilt binaries' licensing includes [LGPL-2.1](https://opensource.org/license/LGPL-2.1) and [LGPL-3.0-or-later](https://opensource.org/license/LGPL-3.0) licenses

packages/adapter-nextjs/package.json

@@ -5,7 +5,7 @@
 	"description": "The adapter for the supporting of using Amplify APIs in Next.js.",
 	"peerDependencies": {
 		"aws-amplify": "^6.13.1",
-		"next": ">=13.5.0 <16.0.0"
+		"next": ">=13.5.0 <17.0.0"
 	},
 	"dependencies": {
 		"aws-jwt-verify": "^4.0.1"
@@ -16,7 +16,7 @@
 		"@types/react-dom": "^18.2.6",
 		"aws-amplify": "6.15.9",
 		"jest-fetch-mock": "3.0.3",
-		"next": ">= 13.5.0 < 15.0.0"
+		"next": ">= 13.5.0 <17.0.0"
 	},
 	"publishConfig": {
 		"access": "public"

packages/auth/src/providers/cognito/apis/signInWithRedirect.ts

@@ -119,11 +119,10 @@ const oauthSignIn = async ({
 	oAuthStore.storeOAuthState(state);
 	oAuthStore.storePKCE(value);
 
-	const params = new URLSearchParams([
-		['redirect_uri', redirectUri],
-		['response_type', responseType],
-		['client_id', clientId],
-	]);
+	const params = new URLSearchParams();
+	params.append('redirect_uri', redirectUri);
+	params.append('response_type', responseType);
+	params.append('client_id', clientId);
 
 	// Add either identity_provider or idp_identifier, but not both
 	if (idpIdentifier) {

packages/rtn-push-notification/android/src/main/kotlin/com/amazonaws/amplify/rtnpushnotification/PushNotificationModule.kt

@@ -116,7 +116,7 @@ class PushNotificationModule(
         "NativeHeadlessTaskKey" to PushNotificationHeadlessTaskService.HEADLESS_TASK_KEY
     )
 
-    override fun onActivityResult(p0: Activity?, p1: Int, p2: Int, p3: Intent?) {
+    override fun onActivityResult(activity: Activity, requestCode: Int, resultCode: Int, data: Intent?) {
         // noop - only overridden as this class implements ActivityEventListener
     }
 
@@ -157,15 +157,19 @@ class PushNotificationModule(
                     params
                 )
             })
-            currentActivity?.intent?.let {
-                val payload = NotificationPayload.fromIntent(it)
-                if (payload != null) {
-                    launchNotification = payload.toWritableMap()
-                    // Launch notification opened event is emitted for internal use only
-                    PushNotificationEventManager.sendEvent(
-                        PushNotificationEventType.LAUNCH_NOTIFICATION_OPENED,
-                        payload.toWritableMap()
-                    )
+            val activity = reactApplicationContext.getCurrentActivity()
+            if (activity != null) {
+                val activityIntent = activity.intent
+                if (activityIntent != null) {
+                    val payload = NotificationPayload.fromIntent(activityIntent)
+                    if (payload != null) {
+                        launchNotification = payload.toWritableMap()
+                        // Launch notification opened event is emitted for internal use only
+                        PushNotificationEventManager.sendEvent(
+                            PushNotificationEventType.LAUNCH_NOTIFICATION_OPENED,
+                            payload.toWritableMap()
+                        )
+                    }
                 }
             }
         } else {
@@ -183,6 +187,7 @@ class PushNotificationModule(
     }
 
     private fun shouldShowRequestPermissionRationale(): Boolean {
-        return ActivityCompat.shouldShowRequestPermissionRationale(currentActivity!!, PERMISSION)
+        val activity = reactApplicationContext.getCurrentActivity() ?: return false
+        return ActivityCompat.shouldShowRequestPermissionRationale(activity, PERMISSION)
     }
-}
+}