can decode google play referrer

Author: functora

ghcjs/delivery-calculator/delivery-calculator.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name:          delivery-calculator
-version:       0.1.0.18
+version:       0.1.0.20
 synopsis:      Delivery Calculator
 category:      Web
 build-type:    Simple

ghcjs/delivery-calculator/src/App/Types.hs

@@ -25,6 +25,7 @@ module App.Types
     cny,
     rub,
     mkGooglePlayLink,
+    unGooglePlayLink,
     testGroupLink,
     functoraLink,
     sourceLink,
@@ -529,6 +530,9 @@ mkGooglePlayLink st =
     k <- URI.mkQueryKey "referrer"
     v <-
       URI.mkQueryValue
+        . decodeUtf8
+        . B64URL.encodeUnpadded
+        . encodeUtf8
         $ URI.render
           ref
             { URI.uriQuery =
@@ -544,6 +548,13 @@ mkGooglePlayLink st =
         { URI.uriQuery = [URI.QueryParam k v]
         }
 
+unGooglePlayLink :: (MonadIO m, MonadThrow m) => Unicode -> m (St Unique)
+unGooglePlayLink raw = do
+  bs <- either throwString pure . B64URL.decodeUnpadded $ encodeUtf8 raw
+  txt <- either throw pure $ decodeUtf8Strict bs
+  uri <- URI.mkURI txt
+  either throw identityToUnique . fromQuery $ URI.uriQuery uri
+
 testGroupLink :: URI
 testGroupLink =
   either impureThrow id

ghcjs/delivery-calculator/src/Main.hs

@@ -141,14 +141,26 @@ updateModel (InitUpdate mShortSt) prevSt = do
               .~ False
             opfsSync sink nextSt
           Just ref -> do
-            alert ref
+            longSt <- unGooglePlayLink ref
+            let mLongSt = Just longSt
+            let st =
+                  ( mShortSt <|> mLongSt
+                  )
+                    & _Just
+                    . #stAssets
+                    .~ ( fromMaybe mempty $ mLongSt ^? _Just . #stAssets
+                       )
+            finSt <- newModel (nextSt ^. #modelWebOpts) mvSink (Just nextSt) st
             liftIO
               . sink
               . PushUpdate
               . PureUpdate
-              $ #modelLoading
-              .~ False
-            opfsSync sink nextSt
+              $ ( const
+                    $ finSt
+                    & #modelLoading
+                    .~ False
+                )
+            opfsSync sink finSt
       Just uri -> do
         mLongSt <- unLongUri uri
         let st =

ghcjs/delivery-calculator/trapeze.yaml

@@ -1,8 +1,8 @@
 platforms:
   android:
     appName: Delivery Calculator
-    versionCode: 18
-    versionName: 0.1.0.18
+    versionCode: 20
+    versionName: 0.1.0.20
     packageName: com.functora.delivery_calculator
     manifest:
       - file: AndroidManifest.xml