Remove user authentication and switch to simple admin password check (It wont have more than one admin user so no need for registeration (I LOVE .Net/C# btw))
This commit is contained in:
@@ -10,7 +10,7 @@ import (
|
|||||||
type AppContext struct {
|
type AppContext struct {
|
||||||
Db *gorm.DB
|
Db *gorm.DB
|
||||||
PostService *services.PostService
|
PostService *services.PostService
|
||||||
UserService *services.UserService
|
AdminPassword string
|
||||||
Instance string
|
Instance string
|
||||||
Tag string
|
Tag string
|
||||||
}
|
}
|
@@ -3,6 +3,7 @@ package helpers
|
|||||||
import (
|
import (
|
||||||
"CatsOfMastodonBotGo/internal"
|
"CatsOfMastodonBotGo/internal"
|
||||||
"CatsOfMastodonBotGo/internal/services"
|
"CatsOfMastodonBotGo/internal/services"
|
||||||
|
"log"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"gorm.io/driver/sqlite"
|
"gorm.io/driver/sqlite"
|
||||||
@@ -12,14 +13,19 @@ import (
|
|||||||
|
|
||||||
func SetupAppContext() *internal.AppContext {
|
func SetupAppContext() *internal.AppContext {
|
||||||
// Setup AppContext
|
// Setup AppContext
|
||||||
instance := os.Getenv("INSTANCE")
|
instance := os.Getenv("CAOM_INSTANCE")
|
||||||
if instance == "" {
|
if instance == "" {
|
||||||
instance = "https://mstdn.party"
|
instance = "https://mstdn.party"
|
||||||
}
|
}
|
||||||
tag := os.Getenv("TAG")
|
tag := os.Getenv("CAOM_TAG")
|
||||||
if tag == "" {
|
if tag == "" {
|
||||||
tag = "catsofmastodon"
|
tag = "catsofmastodon"
|
||||||
}
|
}
|
||||||
|
adminPassword := os.Getenv("CAOM_ADMIN_PASSWORD")
|
||||||
|
if adminPassword == "" {
|
||||||
|
log.Println("No admin password provided, using default password 'catsaregood'")
|
||||||
|
adminPassword = "catsaregood"
|
||||||
|
}
|
||||||
|
|
||||||
// Setup database
|
// Setup database
|
||||||
db, err := gorm.Open(sqlite.Open("test.db"), &gorm.Config{Logger: logger.Default.LogMode(logger.Warn)})
|
db, err := gorm.Open(sqlite.Open("test.db"), &gorm.Config{Logger: logger.Default.LogMode(logger.Warn)})
|
||||||
@@ -31,14 +37,10 @@ func SetupAppContext() *internal.AppContext {
|
|||||||
//Setup PostService
|
//Setup PostService
|
||||||
var postService = services.NewPostService(db)
|
var postService = services.NewPostService(db)
|
||||||
|
|
||||||
// Setup UserService
|
|
||||||
var userService = services.NewUserService(db)
|
|
||||||
|
|
||||||
// Inititlize AppContext
|
// Inititlize AppContext
|
||||||
var appContext = &internal.AppContext{
|
var appContext = &internal.AppContext{
|
||||||
Db: db,
|
Db: db,
|
||||||
PostService: postService,
|
PostService: postService,
|
||||||
UserService: userService,
|
|
||||||
Instance: instance,
|
Instance: instance,
|
||||||
Tag: tag,
|
Tag: tag,
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,5 @@
|
|||||||
package requestmodels
|
package requestmodels
|
||||||
|
|
||||||
type LoginInput struct {
|
type LoginInput struct {
|
||||||
Username string `json:"username" binding:"required"`
|
|
||||||
Password string `json:"password" binding:"required"`
|
Password string `json:"password" binding:"required"`
|
||||||
}
|
}
|
@@ -1,6 +0,0 @@
|
|||||||
package requestmodels
|
|
||||||
|
|
||||||
type RegisterInput struct {
|
|
||||||
Username string `json:"username" binding:"required"`
|
|
||||||
Password string `json:"password" binding:"required"`
|
|
||||||
}
|
|
@@ -19,7 +19,6 @@ func SetupRouter(appContext *internal.AppContext) *gin.Engine {
|
|||||||
admin := r.Group("/admin")
|
admin := r.Group("/admin")
|
||||||
|
|
||||||
admin.GET("/", adminDashboardHandler.AdminHomePage)
|
admin.GET("/", adminDashboardHandler.AdminHomePage)
|
||||||
admin.POST("/register", adminDashboardHandler.Register)
|
|
||||||
admin.POST("/login", adminDashboardHandler.Login)
|
admin.POST("/login", adminDashboardHandler.Login)
|
||||||
admin.POST("/approve", adminDashboardHandler.ApproveMedia)
|
admin.POST("/approve", adminDashboardHandler.ApproveMedia)
|
||||||
admin.POST("/reject", adminDashboardHandler.RejectMedia)
|
admin.POST("/reject", adminDashboardHandler.RejectMedia)
|
||||||
|
@@ -1,24 +0,0 @@
|
|||||||
package services
|
|
||||||
|
|
||||||
import (
|
|
||||||
"CatsOfMastodonBotGo/internal/models"
|
|
||||||
"gorm.io/gorm"
|
|
||||||
)
|
|
||||||
|
|
||||||
type UserService struct {
|
|
||||||
db *gorm.DB
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewUserService(db *gorm.DB) *UserService {
|
|
||||||
return &UserService{db: db}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (us *UserService) CreateUser(user models.ComUser) int {
|
|
||||||
return int(us.db.Create(&user).RowsAffected)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (us *UserService) GetUserByUsername(username string) models.ComUser {
|
|
||||||
var user models.ComUser
|
|
||||||
us.db.Where("username = ?", username).First(&user)
|
|
||||||
return user
|
|
||||||
}
|
|
@@ -2,10 +2,9 @@ package handlers_admin
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"CatsOfMastodonBotGo/internal"
|
"CatsOfMastodonBotGo/internal"
|
||||||
"CatsOfMastodonBotGo/internal/models"
|
|
||||||
requestmodels "CatsOfMastodonBotGo/internal/models/requestModels"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"CatsOfMastodonBotGo/internal/auth"
|
|
||||||
|
requestmodels "CatsOfMastodonBotGo/internal/models/requestModels"
|
||||||
|
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
)
|
)
|
||||||
@@ -38,36 +37,6 @@ func (appContext *AdminDashboardHandler) RejectMedia(c *gin.Context) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (appContext *AdminDashboardHandler) Register(c *gin.Context) {
|
|
||||||
|
|
||||||
var input requestmodels.RegisterInput
|
|
||||||
|
|
||||||
if err := c.ShouldBindJSON(&input); err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
hashedPassword, err := auth.HashPassword(input.Password)
|
|
||||||
if err != nil {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var user = models.ComUser{
|
|
||||||
Username: input.Username,
|
|
||||||
Password: hashedPassword,
|
|
||||||
}
|
|
||||||
if appContext.AppContext.UserService.CreateUser(user) == 0 {
|
|
||||||
c.JSON(http.StatusBadRequest, gin.H{
|
|
||||||
"success": false,
|
|
||||||
"error": "failed to create user",
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
c.JSON(200, gin.H{
|
|
||||||
"success": true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (appContext *AdminDashboardHandler) Login(c *gin.Context) {
|
func (appContext *AdminDashboardHandler) Login(c *gin.Context) {
|
||||||
|
|
||||||
var input requestmodels.LoginInput
|
var input requestmodels.LoginInput
|
||||||
@@ -77,14 +46,10 @@ func (appContext *AdminDashboardHandler) Login(c *gin.Context) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
var user = appContext.AppContext.UserService.GetUserByUsername(input.Username)
|
if input.Password == appContext.AppContext.AdminPassword {
|
||||||
if auth.CheckPasswordHash(input.Password, user.Password) && user.IsVerified { // TODO: Add verification process
|
|
||||||
c.JSON(200, gin.H{
|
c.JSON(200, gin.H{
|
||||||
"success": true,
|
"YouAreOn": "AdminDashboardHomePage",
|
||||||
})
|
|
||||||
} else {
|
|
||||||
c.JSON(200, gin.H{
|
|
||||||
"success": false,
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user