Merge pull request #13 from light-speak/staging

Staging

auth/claims.go

@@ -0,0 +1,17 @@
+package auth
+
+import (
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/light-speak/lighthouse/env"
+)
+
+type claim struct {
+	UserId int64 `json:"user_id"`
+	jwt.RegisteredClaims
+}
+
+var key []byte
+
+func init() {
+	key = []byte(env.GetEnv("JWT_SECRET", "IWY@*3JUI#d309HhefzX2WpLtPKtD!hn"))
+}

auth/utils.go

@@ -0,0 +1,37 @@
+package auth
+
+import (
+	"errors"
+	"time"
+
+	"github.com/golang-jwt/jwt/v5"
+)
+
+func GetToken(userId int64) (string, error) {
+	return jwt.NewWithClaims(jwt.SigningMethodHS256, buildClaims(userId)).SignedString(key)
+}
+
+func buildClaims(userId int64) *claim {
+	now := time.Now()
+	return &claim{
+		UserId: userId,
+		RegisteredClaims: jwt.RegisteredClaims{
+			ExpiresAt: jwt.NewNumericDate(now.Add(time.Hour * 24 * 30)),
+			IssuedAt:  jwt.NewNumericDate(now),
+			Issuer:    "lighthouse",
+		},
+	}
+}
+
+func GetUserId(token string) (int64, error) {
+	t, err := jwt.ParseWithClaims(token, &claim{}, func(token *jwt.Token) (interface{}, error) {
+		return key, nil
+	})
+	if err != nil {
+		return 0, err
+	}
+	if claims, ok := t.Claims.(*claim); ok && t.Valid {
+		return claims.UserId, nil
+	}
+	return 0, errors.New("invalid token")
+}

command/cli/generate/initialize/one/one.go

@@ -32,6 +32,7 @@ func Run(module string) error {
 		InitMod,
 		InitIdeHelper,
 		InitLighthouseYml,
+		InitResolver,
 	}
 
 	for _, initFunc := range initFunctions {
@@ -167,3 +168,20 @@ func InitLighthouseYml() error {
 	}
 	return template.Render(options)
 }
+
+func InitResolver() error {
+	resolverTemplate, err := oneFs.ReadFile("tpl/resolver.tpl")
+	if err != nil {
+		return err
+	}
+	options := &template.Options{
+		Path:         filepath.Join(projectName, "resolver"),
+		Template:     string(resolverTemplate),
+		FileName:     "resolver",
+		FileExt:      "go",
+		Package:      "resolver",
+		Editable:     true,
+		SkipIfExists: true,
+	}
+	return template.Render(options)
+}

command/cli/generate/initialize/one/tpl/ide-helper.tpl

@@ -2,11 +2,6 @@ type Query
 type Mutation
 type Subscription
 
-directive @external repeatable on FIELD_DEFINITION
-directive @requires(fields: [String!]!) repeatable on FIELD_DEFINITION
-directive @provides(fields: [String!]!) repeatable on FIELD_DEFINITION
-directive @key(fields: [String!]!) repeatable on OBJECT | INTERFACE
-directive @extends repeatable on OBJECT
 
 directive @paginate(scopes: [String!]) on FIELD_DEFINITION
 directive @skip(if: Boolean!) on FIELD_DEFINITION

command/cli/generate/initialize/one/tpl/resolver.tpl

@@ -0,0 +1,6 @@
+type Resolver struct {
+}
+
+func (r *Resolver) IsResolver() bool {
+	return true
+}

command/run.go

@@ -162,18 +162,14 @@ func validateRequiredFlags(cmd Command, flagValues map[string]interface{}) error
 	}
 	return nil
 }
-
 func printLogo() {
-	fmt.Print("\033[33m")
-	fmt.Printf(`
-  _     _        _	 _    _
-   |     )        |       |    |
-   |    _    __   |__  _  |_   |__     _   _   _  ___   __
-   |     |  '   \     \     |      \     \  |   |   __|  _ \
-   |___  | |    | |   |   |_   |   | |    | |_  |  __ \ '__  
-       | |  ' - | |   |     /  |   |  '- /      /     /    |
-                |                 
-            \__ /           %s           by @light-speak
-	`, version.Version)
-	fmt.Print("\033[0m\n")
+	fmt.Printf("\033[38;5;196m  _     _        _	 _    _\n")
+	fmt.Printf("\033[38;5;202m   |     )        |       |    |\n")
+	fmt.Printf("\033[38;5;208m   |    _    __   |__  _  |_   |__     _   _   _  ___   __\n")
+	fmt.Printf("\033[38;5;214m   |     |  '   \\     \\     |      \\     \\  |   |   __|  _ \\\n")
+	fmt.Printf("\033[38;5;220m   |___  | |    | |   |   |_   |   | |    | |_  |  __ \\ '__\n")
+	fmt.Printf("\033[38;5;226m       | |  ' - | |   |     /  |   |  '- /      /     /    |\n")
+	fmt.Printf("\033[38;5;190m                |\n")
+	fmt.Printf("\033[38;5;154m            \\__ /           %s           by @light-speak\n\n", version.Version)
+	fmt.Print("\033[0m")
 }

config/lighthouse.go

@@ -14,8 +14,8 @@ type Config struct {
 }
 
 type SchemaConfig struct {
-	Ext   []string    `yaml:"ext"`
-	Path  []string    `yaml:"path"`
+	Ext  []string `yaml:"ext"`
+	Path []string `yaml:"path"`
 }
 
 func ReadConfig(path string) (*Config, error) {

env/env_test.go

@@ -48,4 +48,3 @@ func TestGetEnvInt(t *testing.T) {
 		}
 	}
 }
-

example/user/go.mod

@@ -17,6 +17,7 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect

example/user/go.sum

@@ -15,6 +15,8 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
+github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=

example/user/ide-helper.graphql

@@ -3,12 +3,6 @@ type Query
 type Mutation
 type Subscription
 
-directive @external repeatable on FIELD_DEFINITION
-directive @requires(fields: [String!]!) repeatable on FIELD_DEFINITION
-directive @provides(fields: [String!]!) repeatable on FIELD_DEFINITION
-directive @key(fields: [String!]!) repeatable on OBJECT | INTERFACE
-directive @extends repeatable on OBJECT
-
 directive @skip(if: Boolean!) on FIELD_DEFINITION
 directive @include(if: Boolean!) on FIELD_DEFINITION