Skip to content

Commit b0c3dbd

Browse files
gfyraggfyrag
committed
feat: upgrade membership
1 parent c274726 commit b0c3dbd

File tree

290 files changed

+18486
-5505
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+18486
-5505
lines changed

‎cmd/auth/clients/create.go‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,32 @@ func (c *CreateController) GetStore() *CreateStore {
7474
}
7575

7676
func (c *CreateController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
77-
store := fctl.GetStackStore(cmd.Context())
77+
cfg, err := fctl.LoadConfig(cmd)
78+
if err != nil {
79+
return nil, err
80+
}
81+
82+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
83+
if err != nil {
84+
return nil, err
85+
}
86+
87+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
88+
if err != nil {
89+
return nil, err
90+
}
91+
92+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
93+
if err != nil {
94+
return nil, err
95+
}
96+
97+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
98+
if err != nil {
99+
return nil, err
100+
}
78101

79-
if !fctl.CheckStackApprobation(cmd, store.Stack(), "You are about to create a new OAuth2 client") {
102+
if !fctl.CheckStackApprobation(cmd, "You are about to create a new OAuth2 client") {
80103
return nil, fctl.ErrMissingApproval
81104
}
82105

@@ -93,7 +116,7 @@ func (c *CreateController) Run(cmd *cobra.Command, args []string) (fctl.Renderab
93116
PostLogoutRedirectUris: fctl.GetStringSlice(cmd, c.postLogoutRedirectUriFlag),
94117
Scopes: fctl.GetStringSlice(cmd, c.scopes),
95118
}
96-
response, err := store.Client().Auth.V1.CreateClient(cmd.Context(), &request)
119+
response, err := stackClient.Auth.V1.CreateClient(cmd.Context(), &request)
97120
if err != nil {
98121
return nil, err
99122
}

‎cmd/auth/clients/delete.go‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,39 @@ func (c *DeleteController) GetStore() *DeleteStore {
4444
}
4545

4646
func (c *DeleteController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
47-
store := fctl.GetStackStore(cmd.Context())
47+
cfg, err := fctl.LoadConfig(cmd)
48+
if err != nil {
49+
return nil, err
50+
}
51+
52+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
53+
if err != nil {
54+
return nil, err
55+
}
56+
57+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
58+
if err != nil {
59+
return nil, err
60+
}
61+
62+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
63+
if err != nil {
64+
return nil, err
65+
}
66+
67+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
68+
if err != nil {
69+
return nil, err
70+
}
4871

49-
if !fctl.CheckStackApprobation(cmd, store.Stack(), "You are about to delete an OAuth2 client") {
72+
if !fctl.CheckStackApprobation(cmd, "You are about to delete an OAuth2 client") {
5073
return nil, fctl.ErrMissingApproval
5174
}
5275

5376
request := operations.DeleteClientRequest{
5477
ClientID: args[0],
5578
}
56-
response, err := store.Client().Auth.V1.DeleteClient(cmd.Context(), request)
79+
response, err := stackClient.Auth.V1.DeleteClient(cmd.Context(), request)
5780
if err != nil {
5881
return nil, err
5982
}

‎cmd/auth/clients/list.go‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,32 @@ func (c *ListController) GetStore() *ListStore {
5151
}
5252

5353
func (c *ListController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
54-
store := fctl.GetStackStore(cmd.Context())
54+
cfg, err := fctl.LoadConfig(cmd)
55+
if err != nil {
56+
return nil, err
57+
}
58+
59+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
60+
if err != nil {
61+
return nil, err
62+
}
63+
64+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
65+
if err != nil {
66+
return nil, err
67+
}
68+
69+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
70+
if err != nil {
71+
return nil, err
72+
}
73+
74+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
75+
if err != nil {
76+
return nil, err
77+
}
5578

56-
clients, err := store.Client().Auth.V1.ListClients(cmd.Context())
79+
clients, err := stackClient.Auth.V1.ListClients(cmd.Context())
5780
if err != nil {
5881
return nil, err
5982
}

‎cmd/auth/clients/secrets/create.go‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,32 @@ func (c *CreateController) GetStore() *CreateStore {
4747

4848
func (c *CreateController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
4949

50-
store := fctl.GetStackStore(cmd.Context())
50+
cfg, err := fctl.LoadConfig(cmd)
51+
if err != nil {
52+
return nil, err
53+
}
54+
55+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
56+
if err != nil {
57+
return nil, err
58+
}
59+
60+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
61+
if err != nil {
62+
return nil, err
63+
}
64+
65+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
66+
if err != nil {
67+
return nil, err
68+
}
69+
70+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
71+
if err != nil {
72+
return nil, err
73+
}
5174

52-
if !fctl.CheckStackApprobation(cmd, store.Stack(), "You are about to create a new client secret") {
75+
if !fctl.CheckStackApprobation(cmd, "You are about to create a new client secret") {
5376
return nil, fctl.ErrMissingApproval
5477
}
5578

@@ -60,7 +83,7 @@ func (c *CreateController) Run(cmd *cobra.Command, args []string) (fctl.Renderab
6083
Metadata: nil,
6184
},
6285
}
63-
response, err := store.Client().Auth.V1.CreateSecret(cmd.Context(), request)
86+
response, err := stackClient.Auth.V1.CreateSecret(cmd.Context(), request)
6487
if err != nil {
6588
return nil, err
6689
}

‎cmd/auth/clients/secrets/delete.go‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,40 @@ func (c *DeleteController) GetStore() *DeleteStore {
4545

4646
func (c *DeleteController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
4747

48-
store := fctl.GetStackStore(cmd.Context())
48+
cfg, err := fctl.LoadConfig(cmd)
49+
if err != nil {
50+
return nil, err
51+
}
52+
53+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
54+
if err != nil {
55+
return nil, err
56+
}
57+
58+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
59+
if err != nil {
60+
return nil, err
61+
}
62+
63+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
64+
if err != nil {
65+
return nil, err
66+
}
67+
68+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
69+
if err != nil {
70+
return nil, err
71+
}
4972

50-
if !fctl.CheckStackApprobation(cmd, store.Stack(), "You are about to delete a client secret") {
73+
if !fctl.CheckStackApprobation(cmd, "You are about to delete a client secret") {
5174
return nil, fctl.ErrMissingApproval
5275
}
5376

5477
request := operations.DeleteSecretRequest{
5578
ClientID: args[0],
5679
SecretID: args[1],
5780
}
58-
response, err := store.Client().Auth.V1.DeleteSecret(cmd.Context(), request)
81+
response, err := stackClient.Auth.V1.DeleteSecret(cmd.Context(), request)
5982
if err != nil {
6083
return nil, err
6184
}

‎cmd/auth/clients/show.go‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,35 @@ func (c *ShowController) GetStore() *ShowStore {
4545
}
4646

4747
func (c *ShowController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
48-
store := fctl.GetStackStore(cmd.Context())
48+
cfg, err := fctl.LoadConfig(cmd)
49+
if err != nil {
50+
return nil, err
51+
}
52+
53+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
54+
if err != nil {
55+
return nil, err
56+
}
57+
58+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
59+
if err != nil {
60+
return nil, err
61+
}
62+
63+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
64+
if err != nil {
65+
return nil, err
66+
}
67+
68+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
69+
if err != nil {
70+
return nil, err
71+
}
4972

5073
request := operations.ReadClientRequest{
5174
ClientID: args[0],
5275
}
53-
response, err := store.Client().Auth.V1.ReadClient(cmd.Context(), request)
76+
response, err := stackClient.Auth.V1.ReadClient(cmd.Context(), request)
5477
if err != nil {
5578
return nil, err
5679
}

‎cmd/auth/clients/update.go‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,32 @@ func (c *UpdateController) GetStore() *UpdateStore {
8282

8383
func (c *UpdateController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
8484

85-
store := fctl.GetStackStore(cmd.Context())
85+
cfg, err := fctl.LoadConfig(cmd)
86+
if err != nil {
87+
return nil, err
88+
}
89+
90+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
91+
if err != nil {
92+
return nil, err
93+
}
94+
95+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
96+
if err != nil {
97+
return nil, err
98+
}
99+
100+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
101+
if err != nil {
102+
return nil, err
103+
}
104+
105+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
106+
if err != nil {
107+
return nil, err
108+
}
86109

87-
if !fctl.CheckStackApprobation(cmd, store.Stack(), "You are about to delete an OAuth2 client") {
110+
if !fctl.CheckStackApprobation(cmd, "You are about to update an OAuth2 client") {
88111
return nil, fctl.ErrMissingApproval
89112
}
90113

@@ -104,7 +127,7 @@ func (c *UpdateController) Run(cmd *cobra.Command, args []string) (fctl.Renderab
104127
Scopes: fctl.GetStringSlice(cmd, c.scopes),
105128
},
106129
}
107-
response, err := store.Client().Auth.V1.UpdateClient(cmd.Context(), request)
130+
response, err := stackClient.Auth.V1.UpdateClient(cmd.Context(), request)
108131
if err != nil {
109132
return nil, err
110133
}

‎cmd/auth/root.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,5 @@ func NewCommand() *cobra.Command {
1414
clients.NewCommand(),
1515
users.NewCommand(),
1616
),
17-
fctl.WithPersistentPreRunE(func(cmd *cobra.Command, args []string) error {
18-
return fctl.NewStackStore(cmd)
19-
}),
2017
)
2118
}

‎cmd/auth/users/list.go‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,32 @@ func (c *ListController) GetStore() *ListStore {
4848
}
4949

5050
func (c *ListController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
51-
store := fctl.GetStackStore(cmd.Context())
52-
listUsersResponse, err := store.Client().Auth.V1.ListUsers(cmd.Context())
51+
cfg, err := fctl.LoadConfig(cmd)
52+
if err != nil {
53+
return nil, err
54+
}
55+
56+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
57+
if err != nil {
58+
return nil, err
59+
}
60+
61+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
62+
if err != nil {
63+
return nil, err
64+
}
65+
66+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
67+
if err != nil {
68+
return nil, err
69+
}
70+
71+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
72+
if err != nil {
73+
return nil, err
74+
}
75+
76+
listUsersResponse, err := stackClient.Auth.V1.ListUsers(cmd.Context())
5377
if err != nil {
5478
return nil, err
5579
}

‎cmd/auth/users/show.go‎

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,35 @@ func (c *ShowController) GetStore() *ShowStore {
4242
}
4343

4444
func (c *ShowController) Run(cmd *cobra.Command, args []string) (fctl.Renderable, error) {
45-
store := fctl.GetStackStore(cmd.Context())
45+
cfg, err := fctl.LoadConfig(cmd)
46+
if err != nil {
47+
return nil, err
48+
}
49+
50+
profile, profileName, relyingParty, err := fctl.LoadAndAuthenticateCurrentProfile(cmd, *cfg)
51+
if err != nil {
52+
return nil, err
53+
}
54+
55+
organizationID, err := fctl.ResolveOrganizationID(cmd, *profile)
56+
if err != nil {
57+
return nil, err
58+
}
59+
60+
stackID, err := fctl.ResolveStackID(cmd, *profile, organizationID)
61+
if err != nil {
62+
return nil, err
63+
}
64+
65+
stackClient, err := fctl.NewStackClient(cmd, relyingParty, fctl.NewPTermDialog(), profileName, *profile, organizationID, stackID)
66+
if err != nil {
67+
return nil, err
68+
}
4669

4770
request := operations.ReadUserRequest{
4871
UserID: args[0],
4972
}
50-
readUserResponse, err := store.Client().Auth.V1.ReadUser(cmd.Context(), request)
73+
readUserResponse, err := stackClient.Auth.V1.ReadUser(cmd.Context(), request)
5174
if err != nil {
5275
return nil, err
5376
}

0 commit comments

Comments
 (0)