wirejs-deploy-amplify-basic 0.0.36 → 0.0.38

package/amplify-backend-assets/auth/resource.ts

@@ -5,7 +5,4 @@ export const auth = defineAuth({
 	loginWith: {
 		email: true,
 	},
-	access: allow => [
-		allow.resource(api).to(['manageUsers', 'listUsers'])
-	]
 });

package/amplify-backend-assets/backend.ts

@@ -20,7 +20,6 @@ const backend = defineBackend({
 /**
  * Amplify resource augmentations
  */
-
 const userPoolClient = backend.auth.resources.cfnResources.cfnUserPoolClient;
 userPoolClient.explicitAuthFlows = userPoolClient.explicitAuthFlows || [];
 userPoolClient.explicitAuthFlows.push(
@@ -45,9 +44,9 @@ bucket.grantReadWrite(backend.api.resources.lambda);
 backend.api.addEnvironment(
   'BUCKET', bucket.bucketName,
 );
-// backend.api.addEnvironment(
-//   'COGNITO_CLIENT_ID', backend.auth.resources.userPoolClient.userPoolClientId
-// );
+backend.api.addEnvironment(
+  'COGNITO_CLIENT_ID', backend.auth.resources.userPoolClient.userPoolClientId
+);
 
 
 /**

package/dist/services/authentication.js

@@ -212,10 +212,7 @@ export class AuthenticationService extends AuthenticationServiceBase {
                     state: 'unauthenticated',
                     user: undefined,
                     substate: 'pending-completesignup',
-                    metadata: JSON.stringify({
-                        email: form.inputs.email,
-                        sub: result.UserSub,
-                    })
+                    metadata: form.inputs.email
                 });
                 return this.getMachineState(cookies);
             }
@@ -274,8 +271,8 @@ export class AuthenticationService extends AuthenticationServiceBase {
                 return this.getMachineState(cookies);
             }
             try {
-                const { email, sub } = JSON.parse(state.metadata);
-                if (!email || !sub) {
+                const email = state.metadata;
+                if (!email) {
                     this.#cookie.clear(cookies);
                     return this.getMachineState(cookies);
                 }
@@ -284,11 +281,21 @@ export class AuthenticationService extends AuthenticationServiceBase {
                     Username: email,
                     ConfirmationCode: form.inputs.code
                 });
-                await client.send(command);
+                const result = await client.send(command);
+                const signinCommand = new InitiateAuthCommand({
+                    ClientId,
+                    AuthFlow: 'USER_AUTH',
+                    Session: result.Session
+                });
+                const signinResult = await client.send(signinCommand);
+                signinResult.AuthenticationResult?.AccessToken;
+                const jwtPayload = jose.decodeJwt(
+                // assuming for now, until we support challenges like OTP, Email code, etc.
+                signinResult.AuthenticationResult?.IdToken);
                 await this.#cookie.write(cookies, {
                     state: 'authenticated',
                     user: {
-                        id: sub,
+                        id: jwtPayload.sub,
                         displayName: email,
                         username: email,
                     }
@@ -325,18 +332,38 @@ export class AuthenticationService extends AuthenticationServiceBase {
                     state: 'authenticated',
                     user: {
                         id: jwtPayload.sub,
-                        username: jwtPayload['cognito:username'],
-                        displayName: jwtPayload['cognito:username'],
+                        username: form.inputs.email,
+                        displayName: form.inputs.email,
                     },
                 });
                 return this.getMachineState(cookies);
             }
             catch (error) {
-                return {
-                    errors: [{
-                            message: error.message
-                        }]
-                };
+                if (error.message === 'User is not confirmed.') {
+                    const command = new ResendConfirmationCodeCommand({
+                        ClientId,
+                        Username: form.inputs.email
+                    });
+                    await client.send(command);
+                    await this.#cookie.write(cookies, {
+                        state: 'unauthenticated',
+                        user: undefined,
+                        substate: 'pending-completesignup',
+                        metadata: form.inputs.email,
+                    });
+                    return {
+                        ...this.getMachineState(cookies),
+                        message: `Your account setup isn't complete.<br />
+							We sent you a new code to enter below.`
+                    };
+                }
+                else {
+                    return {
+                        errors: [{
+                                message: error.message
+                            }]
+                    };
+                }
             }
         }
         else if (isAction(form, 'changepassword')) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.0.36",
+	"version": "0.0.38",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",