2FAS/2fas-server
1
0
Fork 0
mirror of https://github.com/twofas/2fas-server.git synced 2024-12-04 16:20:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support empty fcm token

Browse Source
This commit is contained in:
tobiasz 2023-10-18 14:55:45 +02:00
parent 794a93fa8a
commit 49fcbeea7e
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/api/browser_extension/app/command/request_2fa_token.go
View File

@ -86,6 +86,18 @@ func (h *Request2FaTokenHandler) Handle(cmd *Request2FaToken) error {
}
for _, device := range pairedDevices {
if device.FcmToken == "" {
logging.WithFields(logging.Fields{
"extension_id": extId.String(),
"device_id": device.Id.String(),
"token_request_id": cmd.Id,
"domain": cmd.Domain,
"platform": device.Platform,
"type": "browser_extension_request",
}).Info("Cannot send push notification, missing FCM token")
continue
}
var err error
var notification *messaging.Message

2
internal/api/mobile/app/command/register_mobile_device.go
View File

@ -9,7 +9,7 @@ type RegisterMobileDevice struct {
Id uuid.UUID
Name string `json:"name" validate:"not_blank,max=128"`
Platform string `json:"platform" validate:"required,oneof=ios android huawei"`
FcmToken string `json:"fcm_token" validate:"required,max=256"`
FcmToken string `json:"fcm_token" validate:"max=256"`
}
type RegisterMobileDeviceHandler struct {

23
tests/mobile/mobile_device_test.go
View File

@ -25,28 +25,29 @@ func (s *MobileDeviceTestSuite) SetupTest() {
func (s *MobileDeviceTestSuite) TestCreateMobileDevice() {
type testCase struct {
deviceName string
fcmToken string
expectedHttpCode int
}
defaultFCMToken := "some-fake-token"
testsCases := []testCase{
{deviceName: "", expectedHttpCode: 400},
{deviceName: " ", expectedHttpCode: 400},
{deviceName: " ", expectedHttpCode: 400},
{deviceName: "john`s android", expectedHttpCode: 200},
{deviceName: "john ", expectedHttpCode: 200},
{deviceName: " john doe", expectedHttpCode: 200},
{deviceName: "", fcmToken: defaultFCMToken, expectedHttpCode: 400},
{deviceName: " ", fcmToken: defaultFCMToken, expectedHttpCode: 400},
{deviceName: " ", fcmToken: defaultFCMToken, expectedHttpCode: 400},
{deviceName: "john`s android", fcmToken: defaultFCMToken, expectedHttpCode: 200},
{deviceName: "john ", fcmToken: defaultFCMToken, expectedHttpCode: 200},
{deviceName: " john doe", fcmToken: defaultFCMToken, expectedHttpCode: 200},
// empty FCM token should be also valid.
{deviceName: " john doe", fcmToken: "", expectedHttpCode: 200},
}
for _, tc := range testsCases {
response := createDevice(s.T(), tc.deviceName)
response := createDevice(s.T(), tc.deviceName, tc.fcmToken)
assert.Equal(s.T(), tc.expectedHttpCode, response.StatusCode)
}
}
func createDevice(t *testing.T, name string) *http.Response {
fcmToken := "some-fake-token"
func createDevice(t *testing.T, name, fcmToken string) *http.Response {
payload := []byte(fmt.Sprintf(`{"name":"%s","platform":"android","fcm_token":"%s"}`, name, fcmToken))
return tests.DoAPIRequest(t, "mobile/devices", http.MethodPost, payload, nil)
}