Fix issue qor#11 and copy pull qor#14

grengojbo · grengojbo · commit b58ee7411e6e · 2018-09-21T09:57:48.000+03:00
diff --git a/providers/password/handlers.go b/providers/password/handlers.go
@@ -24,7 +24,8 @@ var DefaultAuthorizeHandler = func(context *auth.Context) (*claims.Claims, error
 	authInfo.Provider = provider.GetName()
 	authInfo.UID = strings.TrimSpace(req.Form.Get("login"))
 
-	if tx.Model(context.Auth.AuthIdentityModel).Where(authInfo).Scan(&authInfo).RecordNotFound() {
+	authwhere := auth_identity.AuthIdentity{Basic: authInfo}
+	if tx.Model(context.Auth.AuthIdentityModel).Where(authwhere).Scan(&authInfo).RecordNotFound() {
 		return nil, auth.ErrInvalidAccount
 	}
 
diff --git a/providers/password/views/mailers/auth/confirmation.txt.tmpl b/providers/password/views/mailers/auth/confirmation.txt.tmpl
@@ -0,0 +1,3 @@
+<p>Please click on the below link to validate your email address:</p>
+
+<p><a href="{{confirm_url}}">{{confirm_url}}</a></p>

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ var DefaultAuthorizeHandler = func(context auth.Context) (claims.Claims, error`
`24`	`24`	`authInfo.Provider = provider.GetName()`
`25`	`25`	`authInfo.UID = strings.TrimSpace(req.Form.Get("login"))`
`26`	`26`
`27`		`- if tx.Model(context.Auth.AuthIdentityModel).Where(authInfo).Scan(&authInfo).RecordNotFound() {`
	`27`	`+ authwhere := auth_identity.AuthIdentity{Basic: authInfo}`
	`28`	`+ if tx.Model(context.Auth.AuthIdentityModel).Where(authwhere).Scan(&authInfo).RecordNotFound() {`
`28`	`29`	`return nil, auth.ErrInvalidAccount`
`29`	`30`	`}`
`30`	`31`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<p>Please click on the below link to validate your email address:</p>`
	`2`	`+`
	`3`	`+<p><a href="{{confirm_url}}">{{confirm_url}}</a></p>`