Merge pull request #1 from inventivegroup/master

Added Support for multiple UserPool-UserPoolClient Custom Attribute Associations

Author: mikeduminy

.gitignore

@@ -39,4 +39,7 @@ jspm_packages
 #serverless
 .serverless
 .vscode/*
-!.vscode/extensions.json
+!.vscode/extensions.json
+
+# Webstorm IDE
+.idea/

.idea/serverless-cognito-add-custom-attributes.iml

@@ -27,7 +27,7 @@ custom:
         AttributeDataType: String
         DeveloperOnlyAttribute: False
         Mutable: True
-        Name: "another" # this will end up being custom:another 
+        Name: "another" # this will end up being custom:another
         Required: False
 
 # Only add this if not already outputting the Cognito User Pool and Client IDs, otherwise, refer to the existing outputs in the custom:CognitoAddCustomAttributes section
@@ -43,21 +43,66 @@ resources:
 
 # Details
 
-1. Output your UserPoolId via `resouces.Outputs`
-1. Output your UserPoolClientId via `resouces.Outputs`
-2. Add `CognitoAddCustomAttributes` to `custom` with the following structure:
+1. Output your UserPoolId via `resources.Outputs`
+2. Output your UserPoolClientId via `resources.Outputs`
+3. Add `CognitoAddCustomAttributes` to `custom` with the following structure:
 ```yml
   CognitoUserPoolIdOutputKey: "UserPool Output Key as a String"
   CognitoUserPoolClientIdOutputKey: "UserPoolClient Output Key as a String"
   CustomAttributes:
-    - 
+    -
         AttributeDataType: String
         DeveloperOnlyAttribute: False
         Mutable: True
         Name: "another"
         Required: False
 ```
 
+Note: If you have multiple userPool-userPoolClients you can specify them as an array as well
+
+Example:
+```yml
+plugins:
+    - serverless-cognito-add-custom-attributes
+
+custom:
+  CognitoAddCustomAttributes:
+    -
+      CognitoUserPoolIdOutputKey: "CognitoUserPoolApplicationUserPoolId"
+      CognitoUserPoolClientIdOutputKey: "CognitoUserPoolApplicationUserPoolClientId"
+      CustomAttributes:
+        -
+          AttributeDataType: String
+          DeveloperOnlyAttribute: False
+          Mutable: True
+          Name: "another" # this will end up being custom:another
+          Required: False
+    -
+      CognitoUserPoolIdOutputKey: "CognitoUserPoolApplicationUserPoolId"
+      CognitoUserPoolClientIdOutputKey: "CognitoUserPoolApplicationUserPoolClientId2"
+      CustomAttributes:
+        -
+          AttributeDataType: String
+          DeveloperOnlyAttribute: False
+          Mutable: True
+          Name: "another" # this will end up being custom:another
+          Required: False
+
+resources:
+  Outputs:
+    CognitoUserPoolApplicationUserPoolId:
+      Value:
+        Ref: CognitoUserPoolApplicationUserPool
+    CognitoUserPoolApplicationUserPoolClientId:
+      Value:
+        Ref: CognitoUserPoolApplicationUserPoolClient
+    CognitoUserPoolApplicationUserPoolClientId2:
+      Value:
+        Ref: CognitoUserPoolApplicationUserPoolClient2
+```
+
+
+
 The names of your attributes supplied here will appear as `custom:{name}` when deployed.
 
 For more information on the schema of attributes see:

README.md

@@ -0,0 +1,61 @@
+const _ = require('lodash');
+
+const Params = {
+  CognitoUserPoolIdOutputKey: 'CognitoUserPoolIdOutputKey',
+  CustomAttributes: 'CustomAttributes',
+  CognitoUserPoolClientIdOutputKey: 'CognitoUserPoolClientIdOutputKey',
+};
+
+const describeStack = async (AWS) => {
+  const response = await AWS.request('CloudFormation', 'describeStacks', { StackName: AWS.naming.getStackName() });
+  return _.first(response.Stacks);
+};
+
+const loadCustom = (log, custom) => {
+  let result = [];
+  if (custom && custom.CognitoAddCustomAttributes) {
+    
+    if(Array.isArray(custom.CognitoAddCustomAttributes)) {
+      custom.CognitoAddCustomAttributes.forEach(cognitoCustomAttributeMappingItem => {
+        result.push(parseCustomItem(log, cognitoCustomAttributeMappingItem));
+      });
+    } else {
+      result.push(parseCustomItem(log, custom.CognitoAddCustomAttributes));
+    }
+  }
+  
+  return result;
+};
+
+const parseCustomItem = (log, item) => {
+  const result = {};
+  let skippingItem = false;
+  
+  const CognitoUserPoolIdOutputKey = _.get(item, Params.CognitoUserPoolIdOutputKey);
+  const CustomAttributes = _.get(item, Params.CustomAttributes);
+  const CognitoUserPoolClientIdOutputKey = _.get(item, Params.CognitoUserPoolClientIdOutputKey);
+  
+  if (!CognitoUserPoolIdOutputKey || !(typeof(CognitoUserPoolIdOutputKey) === 'string')) {
+    log('CognitoUserPoolIdOutputKey is required.');
+    skippingItem = true;
+  } else if (!CustomAttributes || !Array.isArray(CustomAttributes)) {
+    log('CustomAttributes array is required.');
+    skippingItem = true;
+  } else {
+    result.CognitoUserPoolIdOutputKey = CognitoUserPoolIdOutputKey;
+    result.CustomAttributes = CustomAttributes;
+    result.CognitoUserPoolClientIdOutputKey = CognitoUserPoolClientIdOutputKey;
+  }
+  
+  if(skippingItem) {
+    log(`Custom Attribute is being skipped due to missing information. [CognitoUserPoolIdOutputKey: ${CognitoUserPoolIdOutputKey}] [CognitoUserPoolClientIdOutputKey: ${CognitoUserPoolClientIdOutputKey}]`);
+  }
+  
+  return result;
+};
+
+module.exports = {
+  Params,
+  loadCustom,
+  describeStack
+};