diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index 3bdc6a4..57423b2 100644 --- a/.gitea/workflows/main.yml +++ b/.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@v2 - with: - fetch-depth: 0 + - uses: actions/checkout@v3 - name: Get Repo Name id: repo_name @@ -24,4 +20,4 @@ jobs: with: branch: 'main' git_remote_url: 'ssh://dokku@v2.discours.io:22/authorizer' - ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} \ No newline at end of file + ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }} diff --git a/server/resolvers/forgot_password.go b/server/resolvers/forgot_password.go index 624955e..cd156b8 100644 --- a/server/resolvers/forgot_password.go +++ b/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 {