fix legacy password and signup redirect (#99)

uberswe · Feb 15, 2025 · 0cd90d7 · 0cd90d7
1 parent 2c5862b
commit 0cd90d7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/server/start.go b/server/start.go
@@ -23,7 +23,6 @@ import (
 	"github.com/pocketbase/pocketbase/tools/mailer"
 	"github.com/sunshineplan/imgconv"
 	"github.com/sym01/htmlsanitizer"
-	"golang.org/x/crypto/bcrypt"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"log"
@@ -231,17 +230,8 @@ func (s *Server) Start() {
 			if e.Record != nil && e.Record.GetString("old_password") != "" {
 				p := phpass.New(nil)
 				if p.Check([]byte(e.Password), []byte(e.Record.GetString("old_password"))) {
-					hashedPassword, err := bcrypt.GenerateFromPassword([]byte(e.Password), 12)
-					if err != nil {
-						s.app.Logger().Warn("old password failled to hash", "error", err.Error())
-						return e.Next()
-					}
-					e.Record.SetPassword(string(hashedPassword))
+					e.Record.SetPassword(e.Password)
 					e.Record.Set("old_password", "")
-					if err = s.app.Save(e.Record); err != nil {
-						s.app.Logger().Warn("old password invalid", "error", err.Error())
-						return e.Next()
-					}
 				}
 			}
 			return e.Next()

diff --git a/template/include/footer.html b/template/include/footer.html
@@ -281,6 +281,13 @@
                                 pb.collection('users').requestVerification(email.value);
                                 let successModal = new bootstrap.Modal(document.getElementById('modal-success'), {});
                                 successModal.show();
+                                // Log the user in automatically
+                                pb.collection('users').authWithPassword(
+                                    username.value,
+                                    password.value,
+                                ).then((authData) => {
+                                    location.href = '/'
+                                });
                             }).catch((e) => {
                                 if (e.data === undefined || e.data.data === undefined) {
                                     alert("Something went wrong, please reload the page and try again")

diff --git a/template/schematic.html b/template/schematic.html
@@ -202,13 +202,15 @@ <h3 class="card-title">Comments</h3>
                                                                     {{ .Created }}
                                                                 </a>
                                                             </div>
+                                                            {{ if .IsAuthenticated }}
                                                             <div class="col-auto">
                                                                 <a href="#tinymce-comment"
                                                                    onclick="commentReply('{{ .ID }}', '{{ .Author }}')"
                                                                    class="link">
                                                                     Reply
                                                                 </a>
                                                             </div>
+                                                            {{ end }}
                                                             <div class="col-auto">
                                                                 <a id="{{ .ID }}" href="#{{ .ID }}" class="link-muted">
                                                                     <!-- Download SVG icon from http://tabler.io/icons/icon/share -->
@@ -364,7 +366,6 @@ <h3>Similar Schematics</h3>
     })
     // @formatter:on
 </script>
-{{ if .IsAuthenticated }}
 <script>
     document.addEventListener("DOMContentLoaded", function () {
         const rating = new StarRating('#rating-default', {
@@ -408,7 +409,6 @@ <h3>Similar Schematics</h3>
         });
     })
 </script>
-{{ end }}
 {{ if .IsAuthenticated }}
 <script>
     function commentReply(id, username) {