parent
e3cea25e25
commit
6f5edbaa43
|
@ -55,6 +55,7 @@ func (sed ServerEndpointDetails) URLForAlias(a string) string {
|
||||||
if sed.UseSubdomainForAliases {
|
if sed.UseSubdomainForAliases {
|
||||||
u.Host = a + "." + sed.Domain
|
u.Host = a + "." + sed.Domain
|
||||||
} else {
|
} else {
|
||||||
|
u.Host = sed.Domain
|
||||||
u.Path = "/alias/" + a
|
u.Path = "/alias/" + a
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,7 @@ import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
"testing"
|
"testing"
|
||||||
|
@ -15,6 +16,8 @@ import (
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
|
|
||||||
|
"github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/network"
|
||||||
|
"github.com/ssb-ngi-pointer/go-ssb-room/v2/internal/randutil"
|
||||||
"github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb"
|
"github.com/ssb-ngi-pointer/go-ssb-room/v2/roomdb"
|
||||||
"github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router"
|
"github.com/ssb-ngi-pointer/go-ssb-room/v2/web/router"
|
||||||
refs "go.mindeco.de/ssb-refs"
|
refs "go.mindeco.de/ssb-refs"
|
||||||
|
@ -160,3 +163,27 @@ func TestAliasResolveOnAndroidChrome(t *testing.T) {
|
||||||
frag := aliasURI.Fragment
|
frag := aliasURI.Fragment
|
||||||
a.Equal("Intent;scheme=ssb;end;", frag)
|
a.Equal("Intent;scheme=ssb;end;", frag)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestURLForAlias(t *testing.T) {
|
||||||
|
ts := setup(t)
|
||||||
|
|
||||||
|
a := assert.New(t)
|
||||||
|
|
||||||
|
ts.netInfo = network.ServerEndpointDetails{
|
||||||
|
Domain: randutil.String(10),
|
||||||
|
|
||||||
|
UseSubdomainForAliases: true,
|
||||||
|
}
|
||||||
|
|
||||||
|
// test subdomain alias URLs
|
||||||
|
generatedURL := ts.netInfo.URLForAlias("dummy")
|
||||||
|
expectedURL := fmt.Sprintf("https://dummy.%s", ts.netInfo.Domain)
|
||||||
|
a.Equal(expectedURL, generatedURL)
|
||||||
|
|
||||||
|
// test alias URLs using /alias/-path
|
||||||
|
ts.netInfo.UseSubdomainForAliases = false
|
||||||
|
|
||||||
|
generatedURL = ts.netInfo.URLForAlias("dummy")
|
||||||
|
expectedURL = fmt.Sprintf("https://%s/alias/dummy", ts.netInfo.Domain)
|
||||||
|
a.Equal(expectedURL, generatedURL)
|
||||||
|
}
|
||||||
|
|
|
@ -33,6 +33,8 @@ type testSession struct {
|
||||||
Client *tester.Tester
|
Client *tester.Tester
|
||||||
URLTo web.URLMaker
|
URLTo web.URLMaker
|
||||||
|
|
||||||
|
netInfo network.ServerEndpointDetails
|
||||||
|
|
||||||
// mocked dbs
|
// mocked dbs
|
||||||
AuthDB *mockdb.FakeAuthWithSSBService
|
AuthDB *mockdb.FakeAuthWithSSBService
|
||||||
AuthFallbackDB *mockdb.FakeAuthFallbackService
|
AuthFallbackDB *mockdb.FakeAuthFallbackService
|
||||||
|
|
Loading…
Reference in New Issue