zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-30 03:41:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

added legacy check to maintain compatibility

Browse Source
This commit is contained in:
0xdcarns
2022-01-11 19:01:20 -05:00
committed by Matthew R Kasun
parent 41401cfb58
commit be093a951f
3 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/auth_grpc.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"errors"
"log"
"github.com/gravitl/netmaker/database"
"github.com/gravitl/netmaker/functions"
@@ -108,9 +107,8 @@ func grpcAuthorize(ctx context.Context) error {
// Login - node authenticates using its password and retrieves a JWT for authorization.
func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nodepb.Object, error) {
//out := new(LoginResponse)
var reqNode models.Node
if err := json.Unmarshal([]byte(req.Data), &reqNode); err != nil {
var reqNode, err = getNewOrLegacyNode(req.Data)
if err != nil {
return nil, err
}
@@ -119,11 +117,7 @@ func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nod
password := reqNode.Password
macaddress := reqNode.MacAddress
log.Printf("authing node: %v \n", reqNode)
var result models.NodeAuth
var err error
// err := errors.New("generic server error")
if nodeID == "" {
//TODO: Set Error response
@@ -133,7 +127,7 @@ func (s *NodeServiceServer) Login(ctx context.Context, req *nodepb.Object) (*nod
err = errors.New("missing password")
return nil, err
} else {
//Search DB for node with Mac Address. Ignore pending nodes (they should not be able to authenticate with API until approved).
//Search DB for node with ID. Ignore pending nodes (they should not be able to authenticate with API until approved).
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil {
return nil, err