jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(spot): added missing imports

Browse source
This commit is contained in:
Alexander 2024-12-10 17:55:38 +01:00
parent ec53099eb0
commit dab822e772
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ee/backend/pkg/server/auth/authorizer.go
View file

@ -1,8 +1,12 @@
package auth
import "fmt"
import (
"fmt"
func (a *authImpl) IsAuthorized(authHeader string, permissions []string, isExtension bool) (*User, error) {
"openreplay/backend/pkg/server/user"
)
func (a *authImpl) IsAuthorized(authHeader string, permissions []string, isExtension bool) (*user.User, error) {
secret := a.secret
if isExtension {
secret = a.spotSecret

15
ee/backend/pkg/server/auth/storage.go
View file

@ -2,11 +2,13 @@ package auth
import (
"fmt"
"openreplay/backend/pkg/db/postgres/pool"
"strings"
"openreplay/backend/pkg/db/postgres/pool"
"openreplay/backend/pkg/server/user"
)
func authUser(conn pool.Pool, userID, tenantID, jwtIAT int, isExtension bool) (*User, error) {
func authUser(conn pool.Pool, userID, tenantID, jwtIAT int, isExtension bool) (*user.User, error) {
sql := `SELECT user_id, users.tenant_id, users.name, email, EXTRACT(epoch FROM spot_jwt_iat)::BIGINT AS spot_jwt_iat, roles.permissions
FROM users
JOIN tenants on users.tenant_id = tenants.tenant_id
@ -15,7 +17,7 @@ func authUser(conn pool.Pool, userID, tenantID, jwtIAT int, isExtension bool) (*
if !isExtension {
sql = strings.ReplaceAll(sql, "spot_jwt_iat", "jwt_iat")
}
user := &User{}
user := &user.User{}
var permissions []string
if err := conn.QueryRow(sql, userID, tenantID).
Scan(&user.ID, &user.TenantID, &user.Name, &user.Email, &user.JwtIat, &permissions); err != nil {
@ -33,3 +35,10 @@ func authUser(conn pool.Pool, userID, tenantID, jwtIAT int, isExtension bool) (*
}
return user, nil
}
func abs(x int) int {
if x < 0 {
return -x
}
return x
}