wirejs-deploy-amplify-basic 0.1.167 → 0.1.169

package/amplify-backend-assets/api/handler.ts

@@ -101,6 +101,7 @@ function extractSetCookies(context: Context) {
 		if (cookie.maxAge) cookieOptions.push(`Max-Age=${cookie.maxAge}`);
 		if (cookie.httpOnly) cookieOptions.push('HttpOnly');
 		if (cookie.secure) cookieOptions.push('Secure');
+		if (cookie.path) cookieOptions.push(`Path=${cookie.path}`);
 		cookies.push(`${cookie.name}=${cookie.value}; ${cookieOptions.join('; ')}`);
 	}
 	return cookies;

package/amplify-backend-assets/backend.ts

@@ -182,6 +182,7 @@ for (const resource of generated) {
       removalPolicy: RemovalPolicy.RETAIN,
       billingMode: BillingMode.PAY_PER_REQUEST,
       pointInTimeRecovery: true,
+      timeToLiveAttribute: resource.options.ttlAttribute,
     });
 
     new TableIndexes(tableStack, `${tableName}Indexes`,

package/amplify-hosting-assets/compute/default/index.js

@@ -1,4 +1,5 @@
 import http from 'http';
+import https from 'https';
 import fs from 'fs';
 import path from 'path';
 
@@ -311,25 +312,54 @@ async function proxyRequest(context, res, targetUrl) {
 	const body = context.requestBody;
 
 	try {
-		const response = await fetch(targetUrl, { method, headers, body });
-		const responseBody = await response.text();
-		const responseHeaders = response.headers;
-
-		res.statusCode = response.status;
-		
-		[...responseHeaders.keys()].forEach((header) => {
-			if (header === 'x-wirejs-redirect') {
-				res.setHeader('Location', responseHeaders.get(header));
-			} else {
-				res.setHeader(header, responseHeaders.get(header));
-			}
-		});
+		const parsedUrl = new URL(targetUrl);
+		const isHttps = parsedUrl.protocol === 'https:';
+		const requester = isHttps ? https : http;
+
+		return await new Promise((resolve) => {
+			const req = requester.request({
+				hostname: parsedUrl.hostname,
+				port: parsedUrl.port || (isHttps ? 443 : 80),
+				path: parsedUrl.pathname + (parsedUrl.search || ''),
+				method,
+				headers,
+			}, (proxyRes) => {
+				res.statusCode = proxyRes.statusCode;
+
+				for (const [header, value] of Object.entries(proxyRes.headers)) {
+					if (header === 'x-wirejs-redirect') {
+						res.setHeader('Location', value);
+					} else {
+						res.setHeader(header, value);
+					}
+				}
 
-		res.end(responseBody);
+				const chunks = [];
+				proxyRes.on('data', chunk => chunks.push(chunk));
+				proxyRes.on('end', () => {
+					res.end(Buffer.concat(chunks));
+					resolve(true);
+				});
+			});
+
+			req.on('error', (error) => {
+				logger.error('Error while proxying request:', error);
+				if (!res.headersSent) {
+					res.statusCode = 500;
+					res.end('Internal Server Error');
+				}
+				resolve(true);
+			});
+
+			if (body) req.write(body);
+			req.end();
+		});
 	} catch (error) {
 		logger.error('Error while proxying request:', error);
-		res.statusCode = 500;
-		res.end('Internal Server Error');
+		if (!res.headersSent) {
+			res.statusCode = 500;
+			res.end('Internal Server Error');
+		}
 	}
 
 	return true;

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.167"
+		"wirejs-resources": "^0.1.169"
 	}
 }

package/dist/resources/distributed-table.d.ts

@@ -22,6 +22,7 @@ export declare class DistributedTable<const P extends Parser<any>, const T exten
         parse: P;
         key: Key;
         indexes?: Indexes;
+        ttlAttribute?: string;
     });
     get partitionKeyName(): Key['partition']['field'];
     get sortKeyName(): 'field' extends keyof Key['sort'] ? (Key['sort']['field'] extends string ? Key['sort']['field'] : undefined) : undefined;

package/dist/resources/distributed-table.js

@@ -134,7 +134,8 @@ export class DistributedTable extends Resource {
             absoluteId: this.absoluteId,
             partitionKey: this.key.partition,
             sortKey: this.key.sort,
-            indexes: this.indexes
+            indexes: this.indexes,
+            ttlAttribute: options.ttlAttribute,
         };
         addResource('DistributedTable', resourceDefinition);
     }

package/dist/services/authentication.js

@@ -132,10 +132,10 @@ export class AuthenticationService extends AuthenticationServiceBase {
         if (state?.state === 'authenticated') {
             if (this.#keepalive)
                 await this.#cookie.write(cookies, state);
-            return {
-                ...state,
-                actions: machineActions('changepassword', 'signout')
-            };
+            const actions = state.user.oidcProvider
+                ? machineActions('signout')
+                : machineActions('changepassword', 'signout');
+            return { ...state, actions };
         }
         else {
             if (state?.substate === 'pending-completesignup') {
@@ -160,10 +160,14 @@ export class AuthenticationService extends AuthenticationServiceBase {
                 };
             }
             else {
+                const oidcActions = await this.getOidcMachineActions();
                 return {
                     state: 'unauthenticated',
                     user: undefined,
-                    actions: machineActions('signin', 'startsignup', 'startforgotpassword')
+                    actions: {
+                        ...machineActions('signin', 'startsignup', 'startforgotpassword'),
+                        ...oidcActions,
+                    }
                 };
             }
         }
@@ -364,6 +368,9 @@ export class AuthenticationService extends AuthenticationServiceBase {
                 this.#cookie.clear(cookies);
                 return this.getMachineState(cookies);
             }
+            if (state.user.oidcProvider) {
+                return { errors: [{ message: 'Password change is not available for social sign-in accounts.' }] };
+            }
             try {
                 // change password requires an access token, which we don't actually store.
                 // so, first step is to actually authenticate.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.167",
+	"version": "0.1.169",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -44,7 +44,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.167"
+		"wirejs-resources": "^0.1.169"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",