Skip to content

Fix issue #11 and copy pull request #14 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grengojbo wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix issue #11 and copy pull request #14 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e3e1aa3
add ignore file
grengojbo Nov 16, 2017
c0cefbe
add gitignore
grengojbo Mar 19, 2018
c8418e9
Merge branch 'master' into last
grengojbo Jun 5, 2018
db98421
Merge branch 'master' of https://github.com/qor/auth
grengojbo Sep 19, 2018
bb19c3e
Merge branch 'master' into last
grengojbo Sep 19, 2018
b58ee74
Fix issue #11 and copy pull #14
grengojbo Sep 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# Back end
public
Gemfile.lock
gin-bin
.DS_Store
.idea/
tmp
worker_data
*.exe
/test/integration/integration
/test/integration/public

# Example
/example/example
/example/public
/example/harp.json

/admin/public/

# Front end
bower_components
node_modules
__*
*.css.map
*.js.map
*.min.map
.sass-cache
npm-debug.log
3 changes: 2 additions & 1 deletion providers/password/handlers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
3 changes: 3 additions & 0 deletions providers/password/views/mailers/auth/confirmation.txt.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>