opensource/magistrala
1
0
Fork 0
mirror of https://github.com/absmach/magistrala.git synced 2026-06-23 04:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

NOISSUE - Remove domain from token (#2468)

Browse Source 
Signed-off-by: nyagamunene <stevenyaga2014@gmail.com>
This commit is contained in:
Steve Munene
2024-10-25 15:41:51 +03:00
committed by GitHub
parent ca8ed3b006
commit f88e11bdb2
76 changed files with 1619 additions and 1831 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/bootstrap.go
+5 -6
View File
@@ -48,14 +48,13 @@ var cmdBootstrap = []cobra.Command{
return
}
pageMetadata := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
State: State,
Name: Name,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
State: State,
Name: Name,
}
if args[0] == "all" {
l, err := sdk.Bootstraps(pageMetadata, args[2])
l, err := sdk.Bootstraps(pageMetadata, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/bootstrap_test.go
+1 -1
View File
@@ -189,7 +189,7 @@ func TestGetBootstrapConfigCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ViewBootstrap", tc.args[0], tc.args[1], tc.args[2]).Return(tc.boot, tc.sdkErr)
sdkCall1 := sdkMock.On("Bootstraps", mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall1 := sdkMock.On("Bootstraps", mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
cli/channels.go
+10 -13
View File
@@ -63,7 +63,7 @@ var cmdChannels = []cobra.Command{
}
if args[0] == all {
l, err := sdk.Channels(pageMetadata, args[2])
l, err := sdk.Channels(pageMetadata, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -134,11 +134,10 @@ var cmdChannels = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
}
cl, err := sdk.ThingsByChannel(args[0], pm, args[2])
cl, err := sdk.ThingsByChannel(args[0], pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -197,11 +196,10 @@ var cmdChannels = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
}
ul, err := sdk.ListChannelUsers(args[0], pm, args[2])
ul, err := sdk.ListChannelUsers(args[0], pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -222,11 +220,10 @@ var cmdChannels = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
}
ul, err := sdk.ListChannelUserGroups(args[0], pm, args[2])
ul, err := sdk.ListChannelUserGroups(args[0], pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/channels_test.go
+4 -4
View File
@@ -182,7 +182,7 @@ func TestGetChannelsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Channel", tc.args[0], tc.args[1], tc.args[2]).Return(tc.channel, tc.sdkErr)
sdkCall1 := sdkMock.On("Channels", mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall1 := sdkMock.On("Channels", mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -425,7 +425,7 @@ func TestListConnectionsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ThingsByChannel", tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("ThingsByChannel", tc.args[0], mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{connsCmd}, tc.args...)...)
switch tc.logType {
case entityLog:
@@ -665,7 +665,7 @@ func TestUsersChannelCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ListChannelUsers", tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("ListChannelUsers", tc.args[0], mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{usrCmd}, tc.args...)...)
switch tc.logType {
@@ -741,7 +741,7 @@ func TestListGroupCmd(t *testing.T) {
}
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ListChannelUserGroups", tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("ListChannelUserGroups", tc.args[0], mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{grpCmd}, tc.args...)...)
switch tc.logType {
case entityLog:
cli/groups.go
+15 -19
View File
@@ -84,11 +84,10 @@ var cmdGroups = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
}
l, err := sdk.Groups(pm, args[2])
l, err := sdk.Groups(pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -106,7 +105,7 @@ var cmdGroups = []cobra.Command{
Limit: Limit,
DomainID: args[2],
}
l, err := sdk.Children(args[1], pm, args[3])
l, err := sdk.Children(args[1], pm, args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -120,11 +119,10 @@ var cmdGroups = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[2],
Offset: Offset,
Limit: Limit,
}
l, err := sdk.Parents(args[1], pm, args[3])
l, err := sdk.Parents(args[1], pm, args[2], args[3])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -174,12 +172,11 @@ var cmdGroups = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Status: Status,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
Status: Status,
}
users, err := sdk.ListGroupUsers(args[0], pm, args[2])
users, err := sdk.ListGroupUsers(args[0], pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -199,12 +196,11 @@ var cmdGroups = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
Status: Status,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
Status: Status,
}
channels, err := sdk.ListGroupChannels(args[0], pm, args[2])
channels, err := sdk.ListGroupChannels(args[0], pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/groups_test.go
+18 -18
View File
@@ -156,19 +156,19 @@ func TestGetGroupsCmd(t *testing.T) {
},
logType: usageLog,
},
// {
// desc: "get children groups successfully",
// args: []string{
// childCmd,
// group.ID,
// domainID,
// token,
// },
// page: mgsdk.GroupsPage{
// Groups: []mgsdk.Group{group},
// },
// logType: entityLog,
// },
{
desc: "get children groups successfully",
args: []string{
childCmd,
group.ID,
domainID,
token,
},
page: mgsdk.GroupsPage{
Groups: []mgsdk.Group{group},
},
logType: entityLog,
},
{
desc: "get children groups with invalid args",
args: []string{
@@ -293,9 +293,9 @@ func TestGetGroupsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Group", mock.Anything, mock.Anything, mock.Anything).Return(tc.group, tc.sdkErr)
sdkCall1 := sdkMock.On("Groups", mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall2 := sdkMock.On("Parents", mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall3 := sdkMock.On("Children", mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall1 := sdkMock.On("Groups", mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall2 := sdkMock.On("Parents", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall3 := sdkMock.On("Children", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -535,7 +535,7 @@ func TestListUsersCmd(t *testing.T) {
}
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ListGroupUsers", tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("ListGroupUsers", tc.args[0], mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{usrCmd}, tc.args...)...)
switch tc.logType {
case entityLog:
@@ -610,7 +610,7 @@ func TestListChannelsCmd(t *testing.T) {
}
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ListGroupChannels", tc.args[0], mock.Anything, tc.args[2]).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("ListGroupChannels", tc.args[0], mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{chansCmd}, tc.args...)...)
switch tc.logType {
case entityLog:
cli/invitations.go
+1 -1
View File
@@ -53,7 +53,7 @@ var cmdInvitations = []cobra.Command{
Limit: Limit,
}
if args[0] == all {
l, err := sdk.Invitations(pageMetadata, args[1])
l, err := sdk.Invitations(pageMetadata, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/invitations_test.go
+3 -1
View File
@@ -113,6 +113,7 @@ func TestGetInvitationCmd(t *testing.T) {
desc: "get all invitations successfully",
args: []string{
all,
domain.ID,
token,
},
page: mgsdk.InvitationPage{
@@ -147,6 +148,7 @@ func TestGetInvitationCmd(t *testing.T) {
desc: "get all invitations with invalid token",
args: []string{
all,
domain.ID,
invalidToken,
},
logType: errLog,
@@ -169,7 +171,7 @@ func TestGetInvitationCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Invitation", tc.args[0], tc.args[1], mock.Anything).Return(tc.inv, tc.sdkErr)
sdkCall1 := sdkMock.On("Invitations", mock.Anything, tc.args[1]).Return(tc.page, tc.sdkErr)
sdkCall1 := sdkMock.On("Invitations", mock.Anything, tc.args[1], tc.args[2]).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
cli/provision.go
+1 -2
View File
@@ -166,8 +166,7 @@ var cmdProvision = []cobra.Command{
return
}
// domain login
ut, err = sdk.CreateToken(mgxsdk.Login{Identity: user.Credentials.Identity, Secret: user.Credentials.Secret, DomainID: domain.ID})
ut, err = sdk.CreateToken(mgxsdk.Login{Identity: user.Credentials.Identity, Secret: user.Credentials.Secret})
if err != nil {
logErrorCmd(*cmd, err)
return
cli/things.go
+5 -6
View File
@@ -46,7 +46,7 @@ var cmdThings = []cobra.Command{
"Usage:\n" +
"\tmagistrala-cli things get all $DOMAINID $USERTOKEN - lists all things\n" +
"\tmagistrala-cli things get all $DOMAINID $USERTOKEN --offset=10 --limit=10 - lists all things with offset and limit\n" +
"\tmagistrala-cli things get <thing_id> $USERTOKEN - shows thing with provided <thing_id>\n",
"\tmagistrala-cli things get <thing_id> $DOMAINID $USERTOKEN - shows thing with provided <thing_id>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 {
logUsageCmd(*cmd, cmd.Use)
@@ -64,7 +64,7 @@ var cmdThings = []cobra.Command{
Metadata: metadata,
}
if args[0] == all {
l, err := sdk.Things(pageMetadata, args[1])
l, err := sdk.Things(pageMetadata, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
@@ -329,11 +329,10 @@ var cmdThings = []cobra.Command{
return
}
pm := mgxsdk.PageMetadata{
Offset: Offset,
Limit: Limit,
DomainID: args[1],
Offset: Offset,
Limit: Limit,
}
ul, err := sdk.ListThingUsers(args[0], pm, args[2])
ul, err := sdk.ListThingUsers(args[0], pm, args[1], args[2])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/things_test.go
+2 -2
View File
@@ -220,7 +220,7 @@ func TestGetThingsCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("Things", mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("Things", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall1 := sdkMock.On("Thing", mock.Anything, mock.Anything, mock.Anything).Return(tc.thing, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{getCmd}, tc.args...)...)
@@ -779,7 +779,7 @@ func TestUsersThingCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("ListThingUsers", mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
sdkCall := sdkMock.On("ListThingUsers", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(tc.page, tc.sdkErr)
out := executeCommand(t, rootCmd, append([]string{usrCmd}, tc.args...)...)
switch tc.logType {
cli/users.go
+5 -12
View File
@@ -91,13 +91,13 @@ var cmdUsers = []cobra.Command{
},
},
{
Use: "token <username> <password> [<domainID>]",
Use: "token <username> <password>",
Short: "Get token",
Long: "Generate new token from username and password\n" +
"For example:\n" +
"\tmagistrala-cli users token user@example.com 12345678\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 3 && len(args) != 2 {
if len(args) != 2 {
logUsageCmd(*cmd, cmd.Use)
return
}
@@ -106,9 +106,6 @@ var cmdUsers = []cobra.Command{
Identity: args[0],
Secret: args[1],
}
if len(args) == 3 {
lg.DomainID = args[2]
}
token, err := sdk.CreateToken(lg)
if err != nil {
@@ -120,22 +117,18 @@ var cmdUsers = []cobra.Command{
},
},
{
Use: "refreshtoken <token> [<domainID>]",
Use: "refreshtoken <token>",
Short: "Get token",
Long: "Generate new token from refresh token\n" +
"For example:\n" +
"\tmagistrala-cli users refreshtoken <refresh_token>\n",
Run: func(cmd *cobra.Command, args []string) {
if len(args) != 2 && len(args) != 1 {
if len(args) != 1 {
logUsageCmd(*cmd, cmd.Use)
return
}
lg := mgxsdk.Login{}
if len(args) == 2 {
lg.DomainID = args[1]
}
token, err := sdk.RefreshToken(lg, args[0])
token, err := sdk.RefreshToken(args[0])
if err != nil {
logErrorCmd(*cmd, err)
return
cli/users_test.go
+13 -58
View File
@@ -279,7 +279,6 @@ func TestIssueTokenCmd(t *testing.T) {
rootCmd := setFlags(usersCmd)
var tkn mgsdk.Token
domainID := testsutil.GenerateUUID(t)
invalidPassword := ""
token := mgsdk.Token{
@@ -296,7 +295,7 @@ func TestIssueTokenCmd(t *testing.T) {
logType outputLog
}{
{
desc: "issue token successfully without domain id",
desc: "issue token successfully",
args: []string{
user.Credentials.Identity,
user.Credentials.Secret,
@@ -305,17 +304,6 @@ func TestIssueTokenCmd(t *testing.T) {
logType: entityLog,
token: token,
},
{
desc: "issue token successfully with domain id",
args: []string{
user.Credentials.Identity,
user.Credentials.Secret,
domainID,
},
sdkerr: nil,
logType: entityLog,
token: token,
},
{
desc: "issue token with failed authentication",
args: []string{
@@ -331,6 +319,8 @@ func TestIssueTokenCmd(t *testing.T) {
desc: "issue token with invalid args",
args: []string{
user.Credentials.Identity,
user.Credentials.Secret,
extraArg,
},
logType: usageLog,
},
@@ -338,22 +328,12 @@ func TestIssueTokenCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("CreateToken", mock.Anything).Return(tc.token, tc.sdkerr)
switch len(tc.args) {
case 2:
lg := mgsdk.Login{
Identity: tc.args[0],
Secret: tc.args[1],
}
sdkCall = sdkMock.On("CreateToken", lg).Return(tc.token, tc.sdkerr)
case 3:
lg := mgsdk.Login{
Identity: tc.args[0],
Secret: tc.args[1],
DomainID: tc.args[2],
}
sdkCall = sdkMock.On("CreateToken", lg).Return(tc.token, tc.sdkerr)
lg := mgsdk.Login{
Identity: tc.args[0],
Secret: tc.args[1],
}
sdkCall := sdkMock.On("CreateToken", lg).Return(tc.token, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{tokCmd}, tc.args...)...)
switch tc.logType {
@@ -379,8 +359,6 @@ func TestRefreshIssueTokenCmd(t *testing.T) {
rootCmd := setFlags(usersCmd)
var tkn mgsdk.Token
domainID := testsutil.GenerateUUID(t)
invalidIdentity := "invalidIdentity"
token := mgsdk.Token{
AccessToken: testsutil.GenerateUUID(t),
@@ -398,17 +376,7 @@ func TestRefreshIssueTokenCmd(t *testing.T) {
{
desc: "issue refresh token successfully without domain id",
args: []string{
user.Credentials.Identity,
},
sdkerr: nil,
logType: entityLog,
token: token,
},
{
desc: "issue refresh token successfully with domain id",
args: []string{
user.Credentials.Identity,
domainID,
"token",
},
sdkerr: nil,
logType: entityLog,
@@ -417,8 +385,7 @@ func TestRefreshIssueTokenCmd(t *testing.T) {
{
desc: "issue refresh token with invalid args",
args: []string{
user.Credentials.Identity,
domainID,
"token",
extraArg,
},
logType: usageLog,
@@ -426,7 +393,7 @@ func TestRefreshIssueTokenCmd(t *testing.T) {
{
desc: "issue refresh token with invalid identity",
args: []string{
invalidIdentity,
"invalidToken",
},
sdkerr: errors.NewSDKErrorWithStatus(svcerr.ErrAuthorization, http.StatusForbidden),
errLogMessage: fmt.Sprintf("\nerror: %s\n\n", errors.NewSDKErrorWithStatus(svcerr.ErrAuthorization, http.StatusForbidden).Error()),
@@ -437,20 +404,8 @@ func TestRefreshIssueTokenCmd(t *testing.T) {
for _, tc := range cases {
t.Run(tc.desc, func(t *testing.T) {
sdkCall := sdkMock.On("RefreshToken", mock.Anything, mock.Anything).Return(tc.token, tc.sdkerr)
switch len(tc.args) {
case 1:
lg := mgsdk.Login{
Identity: tc.args[0],
}
sdkCall = sdkMock.On("RefreshToken", lg).Return(tc.token, tc.sdkerr)
case 2:
lg := mgsdk.Login{
Identity: tc.args[0],
DomainID: tc.args[1],
}
sdkCall = sdkMock.On("RefreshToken", lg).Return(tc.token, tc.sdkerr)
}
sdkCall := sdkMock.On("RefreshToken", mock.Anything).Return(tc.token, tc.sdkerr)
out := executeCommand(t, rootCmd, append([]string{refTokCmd}, tc.args...)...)
switch tc.logType {