Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change app portal link #788

Merged
merged 1 commit into from
Jun 22, 2022
Merged

Change app portal link #788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
// This file was generated by swaggo/swag at
// 2022-06-21 19:34:51.881392 +0100 WAT m=+117.719621918
// 2022-06-22 15:14:39.220690699 +0100 WAT m=+89.280857578
package docs

import (
Expand Down
2 changes: 1 addition & 1 deletion server/security_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (s *SecurityIntegrationTestSuite) Test_CreateAppPortalAPIKey() {
var apiKeyResponse models.PortalAPIKeyResponse
parseResponse(s.T(), w.Result(), &apiKeyResponse)
require.NotEmpty(s.T(), apiKeyResponse.Key)
require.Equal(s.T(), apiKeyResponse.Url, fmt.Sprintf("https://app.convoy.io/app-portal/%s?groupID=%s&appId=%s", apiKeyResponse.Key, s.DefaultGroup.UID, app.UID))
require.Equal(s.T(), apiKeyResponse.Url, fmt.Sprintf("https://app.convoy.io/app/%s?groupID=%s&appId=%s", apiKeyResponse.Key, s.DefaultGroup.UID, app.UID))
require.Equal(s.T(), apiKeyResponse.Type, "app_portal")
require.Equal(s.T(), apiKeyResponse.GroupID, s.DefaultGroup.UID)
require.Equal(s.T(), apiKeyResponse.AppID, app.UID)
Expand Down
2 changes: 1 addition & 1 deletion services/security_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (ss *SecurityService) CreateAppPortalAPIKey(ctx context.Context, group *dat
}

if !util.IsStringEmpty(*baseUrl) {
*baseUrl = fmt.Sprintf("%s/app-portal/%s?groupID=%s&appId=%s", *baseUrl, key, group.UID, app.UID)
*baseUrl = fmt.Sprintf("%s/app/%s?groupID=%s&appId=%s", *baseUrl, key, group.UID, app.UID)
}

return apiKey, key, nil
Expand Down