chore(heroku): Adds Heroku (#2)

Author: Max

.gitignore

@@ -10,4 +10,4 @@
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
-src/build
+build

Procfile

@@ -0,0 +1 @@
+web: bin/golang-cognito-example

README.md

@@ -1,5 +1,11 @@
 # Golang AWS Cognito Register, Verify phone number, Login and Get User example
 
+## Just Show Me
+
+If you are just curious how things work all together, you can find this example working at https://golang-cognito-example.herokuapp.com
+
+## Instructions
+
 This example code demonstrates how to use AWS Cognito with AWS Go SDK in a form of simple web pages where you can:
 
 1. Check if username is taken
@@ -13,12 +19,10 @@ You will also need to create App Client in User Pool without "Generate Secret Ke
 
 ## Build
 
-Go to `/src` folder and run:
-
 ```go
 go build -o ./build/cognito
 
-AWS_PROFILE=XXX COGNITO_APP_CLIENT_ID=XXX COGNITO_USER_POOL_ID=XXX ./build/cognito
+AWS_PROFILE=XXX COGNITO_APP_CLIENT_ID=XXX COGNITO_USER_POOL_ID=XXX PORT=8080 ./build/cognito
 ```
 
-Visit http://localhost:8080/register to see the registration page.
+Visit http://localhost:8080/ to see the list of available pages.

app/app.go

@@ -0,0 +1,12 @@
+package app
+
+import (
+	cognito "github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
+)
+
+// App holds internals for auth flow.
+type App struct {
+	CognitoClient *cognito.CognitoIdentityProvider
+	UserPoolID    string
+	AppClientID   string
+}

src/login.go renamed to app/login.go

@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"
@@ -13,7 +13,7 @@ const flowUsernamePassword = "USER_PASSWORD_AUTH"
 const flowRefreshToken = "REFRESH_TOKEN_AUTH"
 
 // Login handles login scenario.
-func (c *CognitoExample) Login(w http.ResponseWriter, r *http.Request) {
+func (a *App) Login(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
 	username := r.Form.Get("username")
@@ -37,13 +37,13 @@ func (c *CognitoExample) Login(w http.ResponseWriter, r *http.Request) {
 	authTry := &cognito.InitiateAuthInput{
 		AuthFlow:       flow,
 		AuthParameters: params,
-		ClientId:       aws.String(c.AppClientID),
+		ClientId:       aws.String(a.AppClientID),
 	}
 
-	res, err := c.CognitoClient.InitiateAuth(authTry)
+	res, err := a.CognitoClient.InitiateAuth(authTry)
 	if err != nil {
 		fmt.Println(err)
-		http.Redirect(w, r, fmt.Sprintf("/login?error=%s", err.Error()), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("/login?message=%s", err.Error()), http.StatusSeeOther)
 		return
 	}
 

src/otp.go renamed to app/otp.go

@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"
@@ -9,21 +9,22 @@ import (
 )
 
 // OTP handles phone verification step.
-func (c *CognitoExample) OTP(w http.ResponseWriter, r *http.Request) {
+func (a *App) OTP(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
 	otp := r.Form.Get("otp")
+	username := r.Form.Get("username")
 
 	user := &cognito.ConfirmSignUpInput{
 		ConfirmationCode: aws.String(otp),
-		Username:         aws.String(c.RegFlow.Username),
-		ClientId:         aws.String(c.AppClientID),
+		Username:         aws.String(username),
+		ClientId:         aws.String(a.AppClientID),
 	}
 
-	_, err := c.CognitoClient.ConfirmSignUp(user)
+	_, err := a.CognitoClient.ConfirmSignUp(user)
 	if err != nil {
 		fmt.Println(err)
-		http.Redirect(w, r, fmt.Sprintf("/otp?error=%s", err.Error()), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("/otp?message=%s", err.Error()), http.StatusSeeOther)
 		return
 	}
 

src/register.go renamed to app/register.go

@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"
@@ -9,7 +9,7 @@ import (
 )
 
 // Register handles sign in scenario.
-func (c *CognitoExample) Register(w http.ResponseWriter, r *http.Request) {
+func (a *App) Register(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 
 	username := r.Form.Get("username")
@@ -19,7 +19,7 @@ func (c *CognitoExample) Register(w http.ResponseWriter, r *http.Request) {
 	user := &cognito.SignUpInput{
 		Username: aws.String(username),
 		Password: aws.String(password),
-		ClientId: aws.String(c.AppClientID),
+		ClientId: aws.String(a.AppClientID),
 		UserAttributes: []*cognito.AttributeType{
 			{
 				Name:  aws.String("phone_number"),
@@ -28,15 +28,12 @@ func (c *CognitoExample) Register(w http.ResponseWriter, r *http.Request) {
 		},
 	}
 
-	_, err := c.CognitoClient.SignUp(user)
+	_, err := a.CognitoClient.SignUp(user)
 	if err != nil {
 		fmt.Println(err)
-		http.Redirect(w, r, fmt.Sprintf("/register?error=%s", err.Error()), http.StatusSeeOther)
+		http.Redirect(w, r, fmt.Sprintf("/register?message=%s", err.Error()), http.StatusSeeOther)
 		return
 	}
 
-	c.RegFlow.Username = username
-
-	http.Redirect(w, r, "/otp", http.StatusFound)
-
+	http.Redirect(w, r, fmt.Sprintf("/otp?username=%s", username), http.StatusFound)
 }

src/username.go renamed to app/username.go

@@ -1,4 +1,4 @@
-package main
+package app
 
 import (
 	"fmt"
@@ -11,12 +11,12 @@ import (
 )
 
 // Username handles username scenario.
-func (c *CognitoExample) Username(w http.ResponseWriter, r *http.Request) {
+func (a *App) Username(w http.ResponseWriter, r *http.Request) {
 	r.ParseForm()
 	username := r.Form.Get("username")
 
-	_, err := c.CognitoClient.AdminGetUser(&cognito.AdminGetUserInput{
-		UserPoolId: aws.String(c.UserPoolID),
+	_, err := a.CognitoClient.AdminGetUser(&cognito.AdminGetUserInput{
+		UserPoolId: aws.String(a.UserPoolID),
 		Username:   aws.String(username),
 	})
 
@@ -25,7 +25,7 @@ func (c *CognitoExample) Username(w http.ResponseWriter, r *http.Request) {
 		if ok {
 			if awsErr.Code() == cognito.ErrCodeUserNotFoundException {
 				m := fmt.Sprintf("Username %s is free!", username)
-				http.Redirect(w, r, fmt.Sprintf("/username?error=%s", m), http.StatusSeeOther)
+				http.Redirect(w, r, fmt.Sprintf("/username?message=%s", m), http.StatusSeeOther)
 				return
 			}
 		} else {
@@ -35,5 +35,5 @@ func (c *CognitoExample) Username(w http.ResponseWriter, r *http.Request) {
 	}
 
 	m := fmt.Sprintf("Username %s is taken.", username)
-	http.Redirect(w, r, fmt.Sprintf("/username?error=%s", m), http.StatusSeeOther)
+	http.Redirect(w, r, fmt.Sprintf("/username?message=%s", m), http.StatusSeeOther)
 }

src/go.mod renamed to go.mod

@@ -1,16 +1,23 @@
 github.com/aws/aws-sdk-go v1.31.14 h1:uRC2riabEXPMHl1CDylsfCod5DKjiOSXhYvxg/Eb9V8=
 github.com/aws/aws-sdk-go v1.31.14/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/jmespath/go-jmespath v0.3.0 h1:OS12ieG61fsCg5+qLJ+SsW9NicxNkg3b25OyT2yCeUc=
 github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=