diff --git a/app/package.json b/app/package.json index afdfa15..cd974d6 100644 --- a/app/package.json +++ b/app/package.json @@ -11,7 +11,7 @@ "author": "Lakhan Samani", "license": "ISC", "dependencies": { - "@authorizerdev/authorizer-react": "0.11.0", + "@authorizerdev/authorizer-react": "latest", "@types/react": "^17.0.15", "@types/react-dom": "^17.0.9", "esbuild": "^0.12.17", diff --git a/dashboard/src/pages/Users.tsx b/dashboard/src/pages/Users.tsx index 09d8171..a231117 100644 --- a/dashboard/src/pages/Users.tsx +++ b/dashboard/src/pages/Users.tsx @@ -184,7 +184,7 @@ export default function Users() { } updateUserList(); }; - console.log('userList ==>> ', userList); + return ( diff --git a/server/email/invite_email.go b/server/email/invite_email.go index 7db1a0a..5cbd1c9 100644 --- a/server/email/invite_email.go +++ b/server/email/invite_email.go @@ -8,7 +8,7 @@ import ( ) // InviteEmail to send invite email -func InviteEmail(toEmail, token, url string) error { +func InviteEmail(toEmail, token, verificationURL, redirectURI string) error { // The receiver needs to be in slice as the receive supports multiple receiver Receiver := []string{toEmail} @@ -101,7 +101,7 @@ func InviteEmail(toEmail, token, url string) error { data := make(map[string]interface{}, 3) data["org_logo"] = envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyOrganizationLogo) data["org_name"] = envstore.EnvStoreObj.GetStringStoreEnvVariable(constants.EnvKeyOrganizationName) - data["verification_url"] = url + "?token=" + token + data["verification_url"] = verificationURL + "?token=" + token + "&redirect_uri=" + redirectURI message = addEmailTemplate(message, data, "invite_email.tmpl") // bodyMessage := sender.WriteHTMLEmail(Receiver, Subject, message) diff --git a/server/resolvers/invite_members.go b/server/resolvers/invite_members.go index 817cdd1..1a6a0cf 100644 --- a/server/resolvers/invite_members.go +++ b/server/resolvers/invite_members.go @@ -126,7 +126,7 @@ func InviteMembersResolver(ctx context.Context, params model.InviteMemberInput) return nil, err } - go emailservice.InviteEmail(email, verificationToken, verifyEmailURL) + go emailservice.InviteEmail(email, verificationToken, verifyEmailURL, redirectURL) } return &model.Response{