quidproquo-actionprocessor-awslambda 0.0.87 → 0.0.88

package/lib/getActionProcessor/core/userDirectory/getUserDirectoryAuthenticateUserActionProcessor.js

@@ -18,7 +18,7 @@ const getUserDirectoryAuthenticateUserActionProcessor = (qpqConfig) => {
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(payload.userDirectoryName, qpqConfig), region);
         const userPoolClientId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolClientIdFromConfig)(payload.userDirectoryName, qpqConfig), region);
-        const authResponse = yield (0, authenticateUser_1.authenticateUser)(userPoolId, userPoolClientId, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), payload.authenticateUserRequest);
+        const authResponse = yield (0, authenticateUser_1.authenticateUser)(userPoolId, userPoolClientId, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), payload.authenticateUserRequest.email, payload.authenticateUserRequest.password);
         return (0, quidproquo_core_1.actionResult)(authResponse);
     });
 };

package/lib/getActionProcessor/core/userDirectory/getUserDirectoryCreateUserActionProcessor.js

@@ -17,8 +17,9 @@ const getUserDirectoryCreateUserActionProcessor = (qpqConfig) => {
     return (payload) => __awaiter(void 0, void 0, void 0, function* () {
         const region = quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig);
         const userPoolId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolIdFromConfig)(payload.userDirectoryName, qpqConfig), region);
-        const username = yield (0, createUser_1.createUser)(userPoolId, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), payload.createUserRequest);
-        return (0, quidproquo_core_1.actionResult)(username);
+        const userPoolClientId = yield (0, getExportedValue_1.getExportedValue)((0, awsNamingUtils_1.getCFExportNameUserPoolClientIdFromConfig)(payload.userDirectoryName, qpqConfig), region);
+        const authResponse = yield (0, createUser_1.createUser)(userPoolId, quidproquo_core_1.qpqCoreUtils.getApplicationModuleDeployRegion(qpqConfig), userPoolClientId, payload.createUserRequest);
+        return (0, quidproquo_core_1.actionResult)(authResponse);
     });
 };
 exports.default = (qpqConfig) => {

package/lib/logic/cognito/authenticateUser.d.ts

@@ -1,2 +1,2 @@
-import { AuthenticateUserRequest, AuthenticateUserResponse } from 'quidproquo-core';
-export declare const authenticateUser: (userPoolId: string, clientId: string, region: string, authenticateUserRequest: AuthenticateUserRequest) => Promise<AuthenticateUserResponse>;
+import { AuthenticateUserResponse } from 'quidproquo-core';
+export declare const authenticateUser: (userPoolId: string, clientId: string, region: string, username: string, password: string) => Promise<AuthenticateUserResponse>;

package/lib/logic/cognito/authenticateUser.js

@@ -21,22 +21,21 @@ const cognitoAuthenticationResultTypeToQpqAuthenticationInfo = (authResult) => (
     refreshToken: authResult.RefreshToken,
     tokenType: authResult.TokenType,
 });
-const authenticateUser = (userPoolId, clientId, region, authenticateUserRequest) => __awaiter(void 0, void 0, void 0, function* () {
+const authenticateUser = (userPoolId, clientId, region, username, password) => __awaiter(void 0, void 0, void 0, function* () {
     const cognitoClient = new client_cognito_identity_provider_1.CognitoIdentityProviderClient({ region });
     const clientSecret = yield (0, getUserPoolClientSecret_1.getUserPoolClientSecret)(userPoolId, clientId, region);
-    const secretHash = (0, calculateSecretHash_1.calculateSecretHash)(authenticateUserRequest.email, clientId, clientSecret);
+    const secretHash = (0, calculateSecretHash_1.calculateSecretHash)(username, clientId, clientSecret);
     const params = {
         AuthFlow: client_cognito_identity_provider_1.AuthFlowType.ADMIN_USER_PASSWORD_AUTH,
         UserPoolId: userPoolId,
         ClientId: clientId,
         AuthParameters: {
-            USERNAME: authenticateUserRequest.email,
-            PASSWORD: authenticateUserRequest.password,
+            USERNAME: username,
+            PASSWORD: password,
             SECRET_HASH: secretHash,
         },
     };
     const response = yield cognitoClient.send(new client_cognito_identity_provider_1.AdminInitiateAuthCommand(params));
-    console.log(JSON.stringify(response, null, 2));
     const authenticateUserResponse = {
         session: response.Session,
         challenge: quidproquo_core_1.AuthenticateUserChallenge.NONE,

package/lib/logic/cognito/createUser.d.ts

@@ -1,2 +1,2 @@
-import { CreateUserRequest } from 'quidproquo-core';
-export declare const createUser: (userPoolId: string, region: string, createUserRequest: CreateUserRequest) => Promise<string>;
+import { CreateUserRequest, AuthenticateUserResponse } from 'quidproquo-core';
+export declare const createUser: (userPoolId: string, region: string, clientId: string, createUserRequest: CreateUserRequest) => Promise<AuthenticateUserResponse>;

package/lib/logic/cognito/createUser.js

@@ -11,7 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createUser = void 0;
 const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
-const createUser = (userPoolId, region, createUserRequest) => __awaiter(void 0, void 0, void 0, function* () {
+const authenticateUser_1 = require("./authenticateUser");
+const setUserPassword_1 = require("./setUserPassword");
+const createUser = (userPoolId, region, clientId, createUserRequest) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     const cognitoClient = new client_cognito_identity_provider_1.CognitoIdentityProviderClient({ region });
     const params = {
@@ -19,7 +21,10 @@ const createUser = (userPoolId, region, createUserRequest) => __awaiter(void 0,
         Username: createUserRequest.email,
         MessageAction: client_cognito_identity_provider_1.MessageActionType.SUPPRESS,
         DesiredDeliveryMediums: [client_cognito_identity_provider_1.DeliveryMediumType.EMAIL],
-        UserAttributes: [{ Name: 'email', Value: createUserRequest.email }],
+        UserAttributes: [
+            { Name: 'email', Value: createUserRequest.email },
+            { Name: 'email_verified', Value: 'false' },
+        ],
         ForceAliasCreation: false,
     };
     if (createUserRequest.phone) {
@@ -28,15 +33,10 @@ const createUser = (userPoolId, region, createUserRequest) => __awaiter(void 0,
     }
     const response = yield cognitoClient.send(new client_cognito_identity_provider_1.AdminCreateUserCommand(params));
     const username = ((_a = response.User) === null || _a === void 0 ? void 0 : _a.Username) || '';
-    // There has to be a better way than this?
-    const passwordParams = {
-        Password: createUserRequest.password,
-        Username: username,
-        UserPoolId: userPoolId,
-        Permanent: true,
-    };
-    yield cognitoClient.send(new client_cognito_identity_provider_1.AdminSetUserPasswordCommand(passwordParams));
-    // ///////////////////////
-    return username;
+    // Set the user's password
+    yield (0, setUserPassword_1.setUserPassword)(region, userPoolId, username, createUserRequest.password);
+    // Authenticate the user
+    const authResponse = yield (0, authenticateUser_1.authenticateUser)(userPoolId, clientId, region, username, createUserRequest.password);
+    return authResponse;
 });
 exports.createUser = createUser;

package/lib/logic/cognito/requestEmailVerificationCode.d.ts

@@ -0,0 +1 @@
+export declare const requestEmailVerificationCode: (region: string, accessToken: string) => Promise<void>;

package/lib/logic/cognito/requestEmailVerificationCode.js

@@ -0,0 +1,23 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestEmailVerificationCode = void 0;
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
+const requestEmailVerificationCode = (region, accessToken) => __awaiter(void 0, void 0, void 0, function* () {
+    const cognitoClient = new client_cognito_identity_provider_1.CognitoIdentityProviderClient({ region });
+    const params = {
+        AccessToken: accessToken,
+        AttributeName: 'email', // Request verification for the email attribute
+    };
+    const requestEmailVerificationCodeResponse = yield cognitoClient.send(new client_cognito_identity_provider_1.GetUserAttributeVerificationCodeCommand(params));
+    console.log(JSON.stringify(requestEmailVerificationCodeResponse, null, 2));
+});
+exports.requestEmailVerificationCode = requestEmailVerificationCode;

package/lib/logic/cognito/setUserPassword.d.ts

@@ -0,0 +1 @@
+export declare const setUserPassword: (region: string, userPoolId: string, username: string, password: string) => Promise<void>;

package/lib/logic/cognito/setUserPassword.js

@@ -0,0 +1,25 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setUserPassword = void 0;
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
+const setUserPassword = (region, userPoolId, username, password) => __awaiter(void 0, void 0, void 0, function* () {
+    const cognitoClient = new client_cognito_identity_provider_1.CognitoIdentityProviderClient({ region });
+    // There has to be a better way than this?
+    const passwordParams = {
+        Password: password,
+        Username: username,
+        UserPoolId: userPoolId,
+        Permanent: true,
+    };
+    yield cognitoClient.send(new client_cognito_identity_provider_1.AdminSetUserPasswordCommand(passwordParams));
+});
+exports.setUserPassword = setUserPassword;

package/lib/logic/cognito/verifyUserEmail.d.ts

@@ -0,0 +1 @@
+export declare const verifyUserEmail: (region: string, accessToken: string, verificationCode: string) => Promise<void>;

package/lib/logic/cognito/verifyUserEmail.js

@@ -0,0 +1,23 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.verifyUserEmail = void 0;
+const client_cognito_identity_provider_1 = require("@aws-sdk/client-cognito-identity-provider");
+const verifyUserEmail = (region, accessToken, verificationCode) => __awaiter(void 0, void 0, void 0, function* () {
+    const cognitoClient = new client_cognito_identity_provider_1.CognitoIdentityProviderClient({ region });
+    const params = {
+        AccessToken: accessToken,
+        AttributeName: 'email',
+        Code: verificationCode,
+    };
+    yield cognitoClient.send(new client_cognito_identity_provider_1.VerifyUserAttributeCommand(params));
+});
+exports.verifyUserEmail = verifyUserEmail;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quidproquo-actionprocessor-awslambda",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.js",