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

updated ioutil refs and composes

Browse Source
This commit is contained in:
0xdcarns
2022-01-06 15:05:38 -05:00
parent 1387dbee4c
commit 43b9e73eaa
26 changed files with 58 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netclient/auth/auth.go
View File

@@ -3,6 +3,7 @@ package auth
import (
"encoding/json"
"fmt"
"os"
"github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/netclient/config"
@@ -10,7 +11,6 @@ import (
// "os"
"context"
"io/ioutil"
nodepb "github.com/gravitl/netmaker/grpc"
"google.golang.org/grpc/codes"
@@ -21,13 +21,13 @@ import (
// SetJWT func will used to create the JWT while signing in and signing out
func SetJWT(client nodepb.NodeServiceClient, network string) (context.Context, error) {
home := ncutils.GetNetclientPathSpecific()
tokentext, err := ioutil.ReadFile(home + "nettoken-" + network)
tokentext, err := os.ReadFile(home + "nettoken-" + network)
if err != nil {
err = AutoLogin(client, network)
if err != nil {
return nil, status.Errorf(codes.Unauthenticated, fmt.Sprintf("Something went wrong with Auto Login: %v", err))
}
tokentext, err = ioutil.ReadFile(home + "nettoken-" + network)
tokentext, err = os.ReadFile(home + "nettoken-" + network)
if err != nil {
return nil, status.Errorf(codes.Unauthenticated, fmt.Sprintf("Something went wrong: %v", err))
}
@@ -71,7 +71,7 @@ func AutoLogin(client nodepb.NodeServiceClient, network string) error {
return err
}
tokenstring := []byte(res.Data)
err = ioutil.WriteFile(home+"nettoken-"+network, tokenstring, 0644)
err = os.WriteFile(home+"nettoken-"+network, tokenstring, 0644)
if err != nil {
return err
}
@@ -81,13 +81,13 @@ func AutoLogin(client nodepb.NodeServiceClient, network string) error {
// StoreSecret - stores auth secret locally
func StoreSecret(key string, network string) error {
d1 := []byte(key)
err := ioutil.WriteFile(ncutils.GetNetclientPathSpecific()+"secret-"+network, d1, 0644)
err := os.WriteFile(ncutils.GetNetclientPathSpecific()+"secret-"+network, d1, 0644)
return err
}
// RetrieveSecret - fetches secret locally
func RetrieveSecret(network string) (string, error) {
dat, err := ioutil.ReadFile(ncutils.GetNetclientPathSpecific() + "secret-" + network)
dat, err := os.ReadFile(ncutils.GetNetclientPathSpecific() + "secret-" + network)
return string(dat), err
}