Skip to content

Commit 8bc4f17

Browse files
p1gp1gp1gp1g
committed
Rename APNSDeviceToken
1 parent 5cf1a9c commit 8bc4f17

File tree

9 files changed

+44
-43
lines changed

9 files changed

+44
-43
lines changed

‎src/Simplex/Messaging/Agent/Client.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1316,7 +1316,7 @@ runNTFServerTest c@AgentClient {presetDomains} nm userId (ProtoServerWithAuth sr
13161316
(nKey, npKey) <- atomically $ C.generateAuthKeyPair a g
13171317
(dhKey, _) <- atomically $ C.generateKeyPair g
13181318
r <- runExceptT $ do
1319-
let deviceToken = DeviceToken PPApnsNull "test_ntf_token"
1319+
let deviceToken = APNSDeviceToken PPApnsNull "test_ntf_token"
13201320
(tknId, _) <- liftError (testErr TSCreateNtfToken) $ ntfRegisterToken ntf nm npKey (NewNtfTkn deviceToken nKey dhKey)
13211321
liftError (testErr TSDeleteNtfToken) $ ntfDeleteToken ntf nm npKey tknId
13221322
ok <- netTimeoutInt (tcpTimeout $ networkConfig cfg) nm `timeout` closeProtocolClient ntf

‎src/Simplex/Messaging/Agent/Store/AgentStore.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,7 +1382,7 @@ deleteCommand db cmdId =
13821382
DB.execute db "DELETE FROM commands WHERE command_id = ?" (Only cmdId)
13831383

13841384
createNtfToken :: DB.Connection -> NtfToken -> IO ()
1385-
createNtfToken db NtfToken {deviceToken = DeviceToken provider token, ntfServer = srv@ProtocolServer {host, port}, ntfTokenId, ntfPubKey, ntfPrivKey, ntfDhKeys = (ntfDhPubKey, ntfDhPrivKey), ntfDhSecret, ntfTknStatus, ntfTknAction, ntfMode} = do
1385+
createNtfToken db NtfToken {deviceToken = APNSDeviceToken provider token, ntfServer = srv@ProtocolServer {host, port}, ntfTokenId, ntfPubKey, ntfPrivKey, ntfDhKeys = (ntfDhPubKey, ntfDhPrivKey), ntfDhSecret, ntfTknStatus, ntfTknAction, ntfMode} = do
13861386
upsertNtfServer_ db srv
13871387
DB.execute
13881388
db
@@ -1409,10 +1409,10 @@ getSavedNtfToken db = do
14091409
let ntfServer = NtfServer host port keyHash
14101410
ntfDhKeys = (ntfDhPubKey, ntfDhPrivKey)
14111411
ntfMode = fromMaybe NMPeriodic ntfMode_
1412-
in NtfToken {deviceToken = DeviceToken provider dt, ntfServer, ntfTokenId, ntfPubKey, ntfPrivKey, ntfDhKeys, ntfDhSecret, ntfTknStatus, ntfTknAction, ntfMode}
1412+
in NtfToken {deviceToken = APNSDeviceToken provider dt, ntfServer, ntfTokenId, ntfPubKey, ntfPrivKey, ntfDhKeys, ntfDhSecret, ntfTknStatus, ntfTknAction, ntfMode}
14131413

14141414
updateNtfTokenRegistration :: DB.Connection -> NtfToken -> NtfTokenId -> C.DhSecretX25519 -> IO ()
1415-
updateNtfTokenRegistration db NtfToken {deviceToken = DeviceToken provider token, ntfServer = ProtocolServer {host, port}} tknId ntfDhSecret = do
1415+
updateNtfTokenRegistration db NtfToken {deviceToken = APNSDeviceToken provider token, ntfServer = ProtocolServer {host, port}} tknId ntfDhSecret = do
14161416
updatedAt <- getCurrentTime
14171417
DB.execute
14181418
db
@@ -1424,7 +1424,7 @@ updateNtfTokenRegistration db NtfToken {deviceToken = DeviceToken provider token
14241424
(tknId, ntfDhSecret, NTRegistered, Nothing :: Maybe NtfTknAction, updatedAt, provider, token, host, port)
14251425

14261426
updateDeviceToken :: DB.Connection -> NtfToken -> DeviceToken -> IO ()
1427-
updateDeviceToken db NtfToken {deviceToken = DeviceToken provider token, ntfServer = ProtocolServer {host, port}} (DeviceToken toProvider toToken) = do
1427+
updateDeviceToken db NtfToken {deviceToken = APNSDeviceToken provider token, ntfServer = ProtocolServer {host, port}} (APNSDeviceToken toProvider toToken) = do
14281428
updatedAt <- getCurrentTime
14291429
DB.execute
14301430
db
@@ -1436,7 +1436,7 @@ updateDeviceToken db NtfToken {deviceToken = DeviceToken provider token, ntfServ
14361436
(toProvider, toToken, NTRegistered, Nothing :: Maybe NtfTknAction, updatedAt, provider, token, host, port)
14371437

14381438
updateNtfMode :: DB.Connection -> NtfToken -> NotificationsMode -> IO ()
1439-
updateNtfMode db NtfToken {deviceToken = DeviceToken provider token, ntfServer = ProtocolServer {host, port}} ntfMode = do
1439+
updateNtfMode db NtfToken {deviceToken = APNSDeviceToken provider token, ntfServer = ProtocolServer {host, port}} ntfMode = do
14401440
updatedAt <- getCurrentTime
14411441
DB.execute
14421442
db
@@ -1448,7 +1448,7 @@ updateNtfMode db NtfToken {deviceToken = DeviceToken provider token, ntfServer =
14481448
(ntfMode, updatedAt, provider, token, host, port)
14491449

14501450
updateNtfToken :: DB.Connection -> NtfToken -> NtfTknStatus -> Maybe NtfTknAction -> IO ()
1451-
updateNtfToken db NtfToken {deviceToken = DeviceToken provider token, ntfServer = ProtocolServer {host, port}} tknStatus tknAction = do
1451+
updateNtfToken db NtfToken {deviceToken = APNSDeviceToken provider token, ntfServer = ProtocolServer {host, port}} tknStatus tknAction = do
14521452
updatedAt <- getCurrentTime
14531453
DB.execute
14541454
db
@@ -1460,7 +1460,7 @@ updateNtfToken db NtfToken {deviceToken = DeviceToken provider token, ntfServer
14601460
(tknStatus, tknAction, updatedAt, provider, token, host, port)
14611461

14621462
removeNtfToken :: DB.Connection -> NtfToken -> IO ()
1463-
removeNtfToken db NtfToken {deviceToken = DeviceToken provider token, ntfServer = ProtocolServer {host, port}} =
1463+
removeNtfToken db NtfToken {deviceToken = APNSDeviceToken provider token, ntfServer = ProtocolServer {host, port}} =
14641464
DB.execute
14651465
db
14661466
[sql|
@@ -1785,7 +1785,7 @@ getActiveNtfToken db =
17851785
let ntfServer = NtfServer host port keyHash
17861786
ntfDhKeys = (ntfDhPubKey, ntfDhPrivKey)
17871787
ntfMode = fromMaybe NMPeriodic ntfMode_
1788-
in NtfToken {deviceToken = DeviceToken provider dt, ntfServer, ntfTokenId, ntfPubKey, ntfPrivKey, ntfDhKeys, ntfDhSecret, ntfTknStatus, ntfTknAction, ntfMode}
1788+
in NtfToken {deviceToken = APNSDeviceToken provider dt, ntfServer, ntfTokenId, ntfPubKey, ntfPrivKey, ntfDhKeys, ntfDhSecret, ntfTknStatus, ntfTknAction, ntfMode}
17891789

17901790
getNtfRcvQueue :: DB.Connection -> SMPQueueNtf -> IO (Either StoreError (ConnId, Int64, RcvNtfDhSecret, Maybe UTCTime))
17911791
getNtfRcvQueue db SMPQueueNtf {smpServer = (SMPServer host port _), notifierId} =

‎src/Simplex/Messaging/Notifications/Protocol.hs‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -411,32 +411,33 @@ instance FromField PushProvider where fromField = fromTextField_ $ eitherToMaybe
411411

412412
instance ToField PushProvider where toField = toField . decodeLatin1 . strEncode
413413

414-
data DeviceToken = DeviceToken PushProvider ByteString
414+
data DeviceToken
415+
= APNSDeviceToken PushProvider ByteString
415416
deriving (Eq, Ord, Show)
416417

417418
instance Encoding DeviceToken where
418-
smpEncode (DeviceToken p t) = smpEncode (p, t)
419-
smpP = DeviceToken <$> smpP <*> smpP
419+
smpEncode (APNSDeviceToken p t) = smpEncode (p, t)
420+
smpP = APNSDeviceToken <$> smpP <*> smpP
420421

421422
instance StrEncoding DeviceToken where
422-
strEncode (DeviceToken p t) = strEncode p <> " " <> t
423+
strEncode (APNSDeviceToken p t) = strEncode p <> " " <> t
423424
strP = nullToken <|> hexToken
424425
where
425-
nullToken = "apns_null test_ntf_token" $> DeviceToken PPApnsNull "test_ntf_token"
426-
hexToken = DeviceToken <$> strP <* A.space <*> hexStringP
426+
nullToken = "apns_null test_ntf_token" $> APNSDeviceToken PPApnsNull "test_ntf_token"
427+
hexToken = APNSDeviceToken <$> strP <* A.space <*> hexStringP
427428
hexStringP =
428429
A.takeWhile (`B.elem` "0123456789abcdef") >>= \s ->
429430
if even (B.length s) then pure s else fail "odd number of hex characters"
430431

431432
instance ToJSON DeviceToken where
432-
toEncoding (DeviceToken pp t) = J.pairs $ "pushProvider" .= decodeLatin1 (strEncode pp) <> "token" .= decodeLatin1 t
433-
toJSON (DeviceToken pp t) = J.object ["pushProvider" .= decodeLatin1 (strEncode pp), "token" .= decodeLatin1 t]
433+
toEncoding (APNSDeviceToken pp t) = J.pairs $ "pushProvider" .= decodeLatin1 (strEncode pp) <> "token" .= decodeLatin1 t
434+
toJSON (APNSDeviceToken pp t) = J.object ["pushProvider" .= decodeLatin1 (strEncode pp), "token" .= decodeLatin1 t]
434435

435436
instance FromJSON DeviceToken where
436437
parseJSON = J.withObject "DeviceToken" $ \o -> do
437438
pp <- strDecode . encodeUtf8 <$?> o .: "pushProvider"
438439
t <- encodeUtf8 <$> o .: "token"
439-
pure $ DeviceToken pp t
440+
pure $ APNSDeviceToken pp t
440441

441442
-- List of PNMessageData uses semicolon-separated encoding instead of strEncode,
442443
-- because strEncode of NonEmpty list uses comma for separator,

‎src/Simplex/Messaging/Notifications/Server.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,7 @@ showServer' = decodeLatin1 . strEncode . host
629629

630630
ntfPush :: NtfPushServer -> M ()
631631
ntfPush s@NtfPushServer {pushQ} = forever $ do
632-
(srvHost_, tkn@NtfTknRec {ntfTknId, token = t@(DeviceToken pp _), tknStatus}, ntf) <- atomically (readTBQueue pushQ)
632+
(srvHost_, tkn@NtfTknRec {ntfTknId, token = t@(APNSDeviceToken pp _), tknStatus}, ntf) <- atomically (readTBQueue pushQ)
633633
liftIO $ logDebug $ "sending push notification to " <> T.pack (show pp)
634634
st <- asks store
635635
case ntf of
@@ -905,7 +905,7 @@ withNtfStore stAction continue = do
905905
Right a -> continue a
906906

907907
incNtfStatT :: DeviceToken -> (NtfServerStats -> IORef Int) -> M ()
908-
incNtfStatT (DeviceToken PPApnsNull _) _ = pure ()
908+
incNtfStatT (APNSDeviceToken PPApnsNull _) _ = pure ()
909909
incNtfStatT _ statSel = incNtfStat statSel
910910
{-# INLINE incNtfStatT #-}
911911

‎src/Simplex/Messaging/Notifications/Server/Push/APNS.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ data APNSErrorResponse = APNSErrorResponse {reason :: Text}
256256
$(JQ.deriveFromJSON defaultJSON ''APNSErrorResponse)
257257

258258
apnsPushProviderClient :: APNSPushClient -> PushProviderClient
259-
apnsPushProviderClient c@APNSPushClient {nonceDrg, apnsCfg} tkn@NtfTknRec {token = DeviceToken _ tknStr} pn = do
259+
apnsPushProviderClient c@APNSPushClient {nonceDrg, apnsCfg} tkn@NtfTknRec {token = APNSDeviceToken _ tknStr} pn = do
260260
http2 <- liftHTTPS2 $ getApnsHTTP2Client c
261261
nonce <- atomically $ C.randomCbNonce nonceDrg
262262
apnsNtf <- liftEither $ first PPCryptoError $ apnsNotification tkn nonce (paddedNtfLength apnsCfg) pn

‎src/Simplex/Messaging/Notifications/Server/Store/Postgres.hs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ insertNtfTknQuery =
126126
|]
127127

128128
replaceNtfToken :: NtfPostgresStore -> NtfTknRec -> IO (Either ErrorType ())
129-
replaceNtfToken st NtfTknRec {ntfTknId, token = token@(DeviceToken pp ppToken), tknStatus, tknRegCode = code@(NtfRegCode regCode)} =
129+
replaceNtfToken st NtfTknRec {ntfTknId, token = token@(APNSDeviceToken pp ppToken), tknStatus, tknRegCode = code@(NtfRegCode regCode)} =
130130
withFastDB "replaceNtfToken" st $ \db -> runExceptT $ do
131131
ExceptT $ assertUpdated <$>
132132
DB.execute
@@ -141,7 +141,7 @@ replaceNtfToken st NtfTknRec {ntfTknId, token = token@(DeviceToken pp ppToken),
141141

142142
ntfTknToRow :: NtfTknRec -> NtfTknRow
143143
ntfTknToRow NtfTknRec {ntfTknId, token, tknStatus, tknVerifyKey, tknDhPrivKey, tknDhSecret, tknRegCode, tknCronInterval, tknUpdatedAt} =
144-
let DeviceToken pp ppToken = token
144+
let APNSDeviceToken pp ppToken = token
145145
NtfRegCode regCode = tknRegCode
146146
in (ntfTknId, pp, Binary ppToken, tknStatus, tknVerifyKey, tknDhPrivKey, tknDhSecret, Binary regCode, tknCronInterval, tknUpdatedAt)
147147

@@ -151,7 +151,7 @@ getNtfToken st tknId =
151151
getNtfToken_ st " WHERE token_id = ?" (Only tknId)
152152

153153
findNtfTokenRegistration :: NtfPostgresStore -> NewNtfEntity 'Token -> IO (Either ErrorType (Maybe NtfTknRec))
154-
findNtfTokenRegistration st (NewNtfTkn (DeviceToken pp ppToken) tknVerifyKey _) =
154+
findNtfTokenRegistration st (NewNtfTkn (APNSDeviceToken pp ppToken) tknVerifyKey _) =
155155
getNtfToken_ st " WHERE push_provider = ? AND push_provider_token = ? AND verify_key = ?" (pp, Binary ppToken, tknVerifyKey)
156156

157157
getNtfToken_ :: ToRow q => NtfPostgresStore -> Query -> q -> IO (Either ErrorType (Maybe NtfTknRec))
@@ -179,7 +179,7 @@ ntfTknQuery =
179179

180180
rowToNtfTkn :: NtfTknRow -> NtfTknRec
181181
rowToNtfTkn (ntfTknId, pp, Binary ppToken, tknStatus, tknVerifyKey, tknDhPrivKey, tknDhSecret, Binary regCode, tknCronInterval, tknUpdatedAt) =
182-
let token = DeviceToken pp ppToken
182+
let token = APNSDeviceToken pp ppToken
183183
tknRegCode = NtfRegCode regCode
184184
in NtfTknRec {ntfTknId, token, tknStatus, tknVerifyKey, tknDhPrivKey, tknDhSecret, tknRegCode, tknCronInterval, tknUpdatedAt}
185185

@@ -374,7 +374,7 @@ setTknStatusConfirmed st NtfTknRec {ntfTknId} =
374374
when (updated > 0) $ withLog "updateTknStatus" st $ \sl -> logTokenStatus sl ntfTknId NTConfirmed
375375

376376
setTokenActive :: NtfPostgresStore -> NtfTknRec -> IO (Either ErrorType ())
377-
setTokenActive st tkn@NtfTknRec {ntfTknId, token = DeviceToken pp ppToken} =
377+
setTokenActive st tkn@NtfTknRec {ntfTknId, token = APNSDeviceToken pp ppToken} =
378378
withFastDB' "setTokenActive" st $ \db -> do
379379
updateTknStatus_ st db tkn NTActive
380380
-- this removes other instances of the same token, e.g. because of repeated token registration attempts

‎tests/AgentTests/NotificationTests.hs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ runNtfTestCfg (t, msType) baseId smpCfg ntfCfg aCfg bCfg runTest = do
218218
testNotificationToken :: APNSMockServer -> IO ()
219219
testNotificationToken apns = do
220220
withAgent 1 agentCfg initAgentServers testDB $ \a -> runRight_ $ do
221-
let tkn = DeviceToken PPApnsTest "abcd"
221+
let tkn = APNSDeviceToken PPApnsTest "abcd"
222222
NTRegistered <- registerNtfToken a tkn NMPeriodic
223223
APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData}} <-
224224
getMockNotification apns tkn
@@ -242,7 +242,7 @@ v .-> key = do
242242
testNtfTokenRepeatRegistration :: APNSMockServer -> IO ()
243243
testNtfTokenRepeatRegistration apns = do
244244
withAgent 1 agentCfg initAgentServers testDB $ \a -> runRight_ $ do
245-
let tkn = DeviceToken PPApnsTest "abcd"
245+
let tkn = APNSDeviceToken PPApnsTest "abcd"
246246
NTRegistered <- registerNtfToken a tkn NMPeriodic
247247
APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData}} <-
248248
getMockNotification apns tkn
@@ -261,7 +261,7 @@ testNtfTokenRepeatRegistration apns = do
261261
testNtfTokenSecondRegistration :: APNSMockServer -> IO ()
262262
testNtfTokenSecondRegistration apns =
263263
withAgentClients2 $ \a a' -> runRight_ $ do
264-
let tkn = DeviceToken PPApnsTest "abcd"
264+
let tkn = APNSDeviceToken PPApnsTest "abcd"
265265
NTRegistered <- registerNtfToken a tkn NMPeriodic
266266
APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData}} <-
267267
getMockNotification apns tkn
@@ -290,7 +290,7 @@ testNtfTokenSecondRegistration apns =
290290

291291
testNtfTokenServerRestart :: ASrvTransport -> APNSMockServer -> IO ()
292292
testNtfTokenServerRestart t apns = do
293-
let tkn = DeviceToken PPApnsTest "abcd"
293+
let tkn = APNSDeviceToken PPApnsTest "abcd"
294294
ntfData <- withAgent 1 agentCfg initAgentServers testDB $ \a ->
295295
withNtfServer t $ runRight $ do
296296
NTRegistered <- registerNtfToken a tkn NMPeriodic
@@ -311,7 +311,7 @@ testNtfTokenServerRestart t apns = do
311311

312312
testNtfTokenServerRestartReverify :: ASrvTransport -> APNSMockServer -> IO ()
313313
testNtfTokenServerRestartReverify t apns = do
314-
let tkn = DeviceToken PPApnsTest "abcd"
314+
let tkn = APNSDeviceToken PPApnsTest "abcd"
315315
withAgent 1 agentCfg initAgentServers testDB $ \a -> do
316316
ntfData <- withNtfServer t $ runRight $ do
317317
NTRegistered <- registerNtfToken a tkn NMPeriodic
@@ -334,7 +334,7 @@ testNtfTokenServerRestartReverify t apns = do
334334

335335
testNtfTokenServerRestartReverifyTimeout :: ASrvTransport -> APNSMockServer -> IO ()
336336
testNtfTokenServerRestartReverifyTimeout t apns = do
337-
let tkn = DeviceToken PPApnsTest "abcd"
337+
let tkn = APNSDeviceToken PPApnsTest "abcd"
338338
withAgent 1 agentCfg initAgentServers testDB $ \a@AgentClient {agentEnv = Env {store}} -> do
339339
(nonce, verification) <- withNtfServer t $ runRight $ do
340340
NTRegistered <- registerNtfToken a tkn NMPeriodic
@@ -369,7 +369,7 @@ testNtfTokenServerRestartReverifyTimeout t apns = do
369369

370370
testNtfTokenServerRestartReregister :: ASrvTransport -> APNSMockServer -> IO ()
371371
testNtfTokenServerRestartReregister t apns = do
372-
let tkn = DeviceToken PPApnsTest "abcd"
372+
let tkn = APNSDeviceToken PPApnsTest "abcd"
373373
withAgent 1 agentCfg initAgentServers testDB $ \a ->
374374
withNtfServer t $ runRight $ do
375375
NTRegistered <- registerNtfToken a tkn NMPeriodic
@@ -393,7 +393,7 @@ testNtfTokenServerRestartReregister t apns = do
393393

394394
testNtfTokenServerRestartReregisterTimeout :: ASrvTransport -> APNSMockServer -> IO ()
395395
testNtfTokenServerRestartReregisterTimeout t apns = do
396-
let tkn = DeviceToken PPApnsTest "abcd"
396+
let tkn = APNSDeviceToken PPApnsTest "abcd"
397397
withAgent 1 agentCfg initAgentServers testDB $ \a@AgentClient {agentEnv = Env {store}} -> do
398398
withNtfServer t $ runRight $ do
399399
NTRegistered <- registerNtfToken a tkn NMPeriodic
@@ -434,7 +434,7 @@ getTestNtfTokenPort a =
434434

435435
testNtfTokenMultipleServers :: ASrvTransport -> APNSMockServer -> IO ()
436436
testNtfTokenMultipleServers t apns = do
437-
let tkn = DeviceToken PPApnsTest "abcd"
437+
let tkn = APNSDeviceToken PPApnsTest "abcd"
438438
withAgent 1 agentCfg initAgentServers2 testDB $ \a ->
439439
withNtfServerThreadOn t ntfTestPort ntfTestDBCfg $ \ntf ->
440440
withNtfServerThreadOn t ntfTestPort2 ntfTestDBCfg2 $ \ntf2 -> runRight_ $ do
@@ -554,7 +554,7 @@ testNotificationSubscriptionExistingConnection apns baseId alice@AgentClient {ag
554554
get alice ##> ("", bobId, CON)
555555
get bob ##> ("", aliceId, CON)
556556
-- register notification token
557-
let tkn = DeviceToken PPApnsTest "abcd"
557+
let tkn = APNSDeviceToken PPApnsTest "abcd"
558558
NTRegistered <- registerNtfToken alice tkn NMInstant
559559
APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData}} <-
560560
getMockNotification apns tkn
@@ -607,9 +607,9 @@ testNotificationSubscriptionNewConnection :: HasCallStack => APNSMockServer -> A
607607
testNotificationSubscriptionNewConnection apns baseId alice bob =
608608
runRight_ $ do
609609
-- alice registers notification token
610-
DeviceToken {} <- registerTestToken alice "abcd" NMInstant apns
610+
APNSDeviceToken {} <- registerTestToken alice "abcd" NMInstant apns
611611
-- bob registers notification token
612-
DeviceToken {} <- registerTestToken bob "bcde" NMInstant apns
612+
APNSDeviceToken {} <- registerTestToken bob "bcde" NMInstant apns
613613
-- establish connection
614614
liftIO $ threadDelay 50000
615615
(bobId, qInfo) <- createConnection alice 1 True SCMInvitation Nothing SMSubscribe
@@ -645,7 +645,7 @@ testNotificationSubscriptionNewConnection apns baseId alice bob =
645645

646646
registerTestToken :: AgentClient -> ByteString -> NotificationsMode -> APNSMockServer -> ExceptT AgentErrorType IO DeviceToken
647647
registerTestToken a token mode apns = do
648-
let tkn = DeviceToken PPApnsTest token
648+
let tkn = APNSDeviceToken PPApnsTest token
649649
NTRegistered <- registerNtfToken a tkn mode
650650
Just APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData'}} <-
651651
timeout 1000000 $ getMockNotification apns tkn

‎tests/NtfClient.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ getAPNSMockServer config@HTTP2ServerConfig {qSize} = do
293293
sendApnsResponse $ APNSRespError N.badRequest400 "bad_request_body"
294294

295295
getMockNotification :: MonadIO m => APNSMockServer -> DeviceToken -> m APNSMockRequest
296-
getMockNotification APNSMockServer {notifications} (DeviceToken _ token) = do
296+
getMockNotification APNSMockServer {notifications} (APNSDeviceToken _ token) = do
297297
atomically $ TM.lookup token notifications >>= maybe retry readTBQueue
298298

299299
getAnyMockNotification :: MonadIO m => APNSMockServer -> m APNSMockRequest

‎tests/NtfServerTests.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ testNotificationSubscription (ATransport t, msType) createQueue =
107107
(nPub, nKey) <- atomically $ C.generateAuthKeyPair C.SEd25519 g
108108
(tknPub, tknKey) <- atomically $ C.generateAuthKeyPair C.SEd25519 g
109109
(dhPub, dhPriv :: C.PrivateKeyX25519) <- atomically $ C.generateKeyPair g
110-
let tkn = DeviceToken PPApnsTest "abcd"
110+
let tkn = APNSDeviceToken PPApnsTest "abcd"
111111
withAPNSMockServer $ \apns ->
112112
smpTest2 t msType $ \rh sh ->
113113
ntfTest t $ \nh -> do
@@ -160,7 +160,7 @@ testNotificationSubscription (ATransport t, msType) createQueue =
160160
(msgBody, "hello") #== "delivered from queue"
161161
Resp "6" _ OK <- signSendRecv rh rKey ("6", rId, ACK mId1)
162162
-- replace token
163-
let tkn' = DeviceToken PPApnsTest "efgh"
163+
let tkn' = APNSDeviceToken PPApnsTest "efgh"
164164
RespNtf "7" tId' NROk <- signSendRecvNtf nh tknKey ("7", tId, TRPL tkn')
165165
tId `shouldBe` tId'
166166
APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData2}} <-
@@ -237,7 +237,7 @@ registerToken nh apns token = do
237237
g <- C.newRandom
238238
(tknPub, tknKey) <- atomically $ C.generateAuthKeyPair C.SEd25519 g
239239
(dhPub, dhPriv :: C.PrivateKeyX25519) <- atomically $ C.generateKeyPair g
240-
let tkn = DeviceToken PPApnsTest token
240+
let tkn = APNSDeviceToken PPApnsTest token
241241
RespNtf "1" NoEntity (NRTknId tId ntfDh) <- signSendRecvNtf nh tknKey ("1", NoEntity, TNEW $ NewNtfTkn tkn tknPub dhPub)
242242
APNSMockRequest {notification = APNSNotification {aps = APNSBackground _, notificationData = Just ntfData}} <-
243243
getMockNotification apns tkn

0 commit comments

Comments
 (0)