Merge branch 'feature/discoursio-auth' into mailgun

.gitea/workflows/main.yml

@@ -4,12 +4,8 @@ on: [push]
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/mailgun'
     steps:
-      - name: Cloning repo
+      - uses: actions/checkout@v3
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
 
       - name: Get Repo Name
         id: repo_name

server/resolvers/forgot_password.go

@@ -83,6 +83,16 @@ func ForgotPasswordResolver(ctx context.Context, params model.ForgotPasswordInpu
 		log.Debug("Failed to get user: ", err)
 		return nil, fmt.Errorf(`bad user credentials`)
 	}
+
+	if user.SignupMethods == "magic_link_login" {
+		user.SignupMethods = "basic_auth"
+
+		user, err = db.Provider.UpdateUser(ctx, user)
+		if err != nil {
+			log.Debug("Failed to update user signup method: ", err)
+		}
+	}
+
 	hostname := parsers.GetHost(gc)
 	_, nonceHash, err := utils.GenerateNonce()
 	if err != nil {