IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-37772] Idiomatic naming (URL, URI, API) (#18128)

Browse Source 
* s/Url/URL/g & s/Uri/URI/g

* s/Api/API/g
This commit is contained in:
Ben Schumacher
2021-08-16 19:46:44 +02:00
committed by GitHub
parent a7f5512ff3
commit 757dc96461
155 changed files with 1680 additions and 1681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
shared/mfa/mfa.go
View File

@@ -44,14 +44,14 @@ func newRandomBase32String(size int) string {
return base32.StdEncoding.EncodeToString(data)
}
func getIssuerFromUrl(uri string) string {
func getIssuerFromURL(uri string) string {
issuer := "Mattermost"
siteUrl := strings.TrimSpace(uri)
siteURL := strings.TrimSpace(uri)
if siteUrl != "" {
siteUrl = strings.TrimPrefix(siteUrl, "https://")
siteUrl = strings.TrimPrefix(siteUrl, "http://")
issuer = strings.TrimPrefix(siteUrl, "www.")
if siteURL != "" {
siteURL = strings.TrimPrefix(siteURL, "https://")
siteURL = strings.TrimPrefix(siteURL, "http://")
issuer = strings.TrimPrefix(siteURL, "www.")
}
return url.QueryEscape(issuer)
@@ -59,7 +59,7 @@ func getIssuerFromUrl(uri string) string {
// GenerateSecret generates a new user mfa secret and store it with the StoreSecret function provided
func (m *MFA) GenerateSecret(siteURL, userEmail, userID string) (string, []byte, error) {
issuer := getIssuerFromUrl(siteURL)
issuer := getIssuerFromURL(siteURL)
secret := newRandomBase32String(mfaSecretSize)

4
shared/mfa/mfa_test.go
View File

@@ -47,7 +47,7 @@ func TestGenerateSecret(t *testing.T) {
})
}
func TestGetIssuerFromUrl(t *testing.T) {
func TestGetIssuerFromURL(t *testing.T) {
cases := []struct {
Input string
Expected string
@@ -64,7 +64,7 @@ func TestGetIssuerFromUrl(t *testing.T) {
}
for _, c := range cases {
assert.Equal(t, c.Expected, getIssuerFromUrl(c.Input))
assert.Equal(t, c.Expected, getIssuerFromURL(c.Input))
}
}