Sign: Handle ErrTwoFactorNotEnrolled correctly (#10008)

zeripath · web-flow · commit d087f4fb735d · 2020-01-26T23:44:12.000Z
diff --git a/models/pull_sign.go b/models/pull_sign.go
@@ -43,7 +43,7 @@ func (pr *PullRequest) SignMerge(u *User, tmpBasePath, baseCommit, headCommit st
 			}
 		case twofa:
 			twofaModel, err := GetTwoFactorByUID(u.ID)
-			if err != nil {
+			if err != nil && !IsErrTwoFactorNotEnrolled(err) {
 				return false, "", err
 			}
 			if twofaModel == nil {
diff --git a/models/repo_sign.go b/models/repo_sign.go
@@ -119,7 +119,7 @@ func SignInitialCommit(repoPath string, u *User) (bool, string, error) {
 			}
 		case twofa:
 			twofaModel, err := GetTwoFactorByUID(u.ID)
-			if err != nil {
+			if err != nil && !IsErrTwoFactorNotEnrolled(err) {
 				return false, "", err
 			}
 			if twofaModel == nil {
@@ -154,7 +154,7 @@ func (repo *Repository) SignUncycloCommit(u *User) (bool, string, error) {
 			}
 		case twofa:
 			twofaModel, err := GetTwoFactorByUID(u.ID)
-			if err != nil {
+			if err != nil && !IsErrTwoFactorNotEnrolled(err) {
 				return false, "", err
 			}
 			if twofaModel == nil {
@@ -206,7 +206,7 @@ func (repo *Repository) SignCRUDAction(u *User, tmpBasePath, parentCommit string
 			}
 		case twofa:
 			twofaModel, err := GetTwoFactorByUID(u.ID)
-			if err != nil {
+			if err != nil && !IsErrTwoFactorNotEnrolled(err) {
 				return false, "", err
 			}
 			if twofaModel == nil {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func (pr PullRequest) SignMerge(u User, tmpBasePath, baseCommit, headCommit st`
`43`	`43`	`}`
`44`	`44`	`case twofa:`
`45`	`45`	`twofaModel, err := GetTwoFactorByUID(u.ID)`
`46`		`- if err != nil {`
	`46`	`+ if err != nil && !IsErrTwoFactorNotEnrolled(err) {`
`47`	`47`	`return false, "", err`
`48`	`48`	`}`
`49`	`49`	`if twofaModel == nil {`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func SignInitialCommit(repoPath string, u *User) (bool, string, error) {`
`119`	`119`	`}`
`120`	`120`	`case twofa:`
`121`	`121`	`twofaModel, err := GetTwoFactorByUID(u.ID)`
`122`		`- if err != nil {`
	`122`	`+ if err != nil && !IsErrTwoFactorNotEnrolled(err) {`
`123`	`123`	`return false, "", err`
`124`	`124`	`}`
`125`	`125`	`if twofaModel == nil {`
`@@ -154,7 +154,7 @@ func (repo Repository) SignUncycloCommit(u User) (bool, string, error) {`
`154`	`154`	`}`
`155`	`155`	`case twofa:`
`156`	`156`	`twofaModel, err := GetTwoFactorByUID(u.ID)`
`157`		`- if err != nil {`
	`157`	`+ if err != nil && !IsErrTwoFactorNotEnrolled(err) {`
`158`	`158`	`return false, "", err`
`159`	`159`	`}`
`160`	`160`	`if twofaModel == nil {`
`@@ -206,7 +206,7 @@ func (repo Repository) SignCRUDAction(u User, tmpBasePath, parentCommit string`
`206`	`206`	`}`
`207`	`207`	`case twofa:`
`208`	`208`	`twofaModel, err := GetTwoFactorByUID(u.ID)`
`209`		`- if err != nil {`
	`209`	`+ if err != nil && !IsErrTwoFactorNotEnrolled(err) {`
`210`	`210`	`return false, "", err`
`211`	`211`	`}`
`212`	`212`	`if twofaModel == nil {`