mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[feature] add authorization to the already-existing authentication (#365)
* add ensureUserIsAuthorizedOrRedirect to /oauth/authorize * adding authorization (email confirm, account approve, etc) to TokenCheck * revert un-needed changes to signin.go * oops what happened here * error css * add account.SuspendedAt check * remove redundant checks from oauth util Authed function * wip tests * tests passing * stop stripping useful information from ErrAlreadyExists * that feeling of scraping the dryer LINT off the screen * oops I didn't mean to get rid of this NewTestRouter function * make tests work with recorder * re-add ConfigureTemplatesWithGin to handle template path err Co-authored-by: tsmethurst <tobi.smethurst@protonmail.com>
This commit is contained in:
@ -20,7 +20,14 @@ package testrig
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/spf13/viper"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/config"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/db"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/router"
|
||||
)
|
||||
@ -33,3 +40,26 @@ func NewTestRouter(db db.DB) router.Router {
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
// ConfigureTemplatesWithGin will panic on any errors related to template loading during tests
|
||||
func ConfigureTemplatesWithGin(engine *gin.Engine) {
|
||||
|
||||
router.LoadTemplateFunctions(engine)
|
||||
|
||||
// https://stackoverflow.com/questions/31873396/is-it-possible-to-get-the-current-root-of-package-structure-as-a-string-in-golan
|
||||
_, runtimeCallerLocation, _, _ := runtime.Caller(0)
|
||||
projectRoot, err := filepath.Abs(filepath.Join(filepath.Dir(runtimeCallerLocation), "../"))
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
|
||||
templateBaseDir := viper.GetString(config.Keys.WebTemplateBaseDir)
|
||||
|
||||
_, err = os.Stat(filepath.Join(projectRoot, templateBaseDir, "index.tmpl"))
|
||||
if err != nil {
|
||||
panic(fmt.Errorf("%s doesn't seem to contain the templates; index.tmpl is missing: %s", filepath.Join(projectRoot, templateBaseDir), err))
|
||||
}
|
||||
|
||||
tmPath := filepath.Join(projectRoot, fmt.Sprintf("%s*", templateBaseDir))
|
||||
engine.LoadHTMLGlob(tmPath)
|
||||
}
|
||||
|
Reference in New Issue
Block a user