Pro backend 0.2 + libsession 1.7 compatibility updates

protos/SignalService.proto

@@ -370,9 +370,9 @@ message GroupUpdateDeleteMemberContentMessage {
 
 message ProProof {
   optional uint32 version           = 1;
-  optional bytes  genIndexHash      = 2;
+  optional bytes  revocationTag      = 2;
   optional bytes  rotatingPublicKey = 3;
-  optional uint64 expireAtMs        = 4; // Epoch timestamp in milliseconds
+  optional uint64 expiryUnixTs      = 4; // Epoch timestamp in whole seconds (what the Session Pro backend signs over)
   optional bytes  sig               = 5;
 }
 

ts/components/dialog/debug/FeatureFlags.tsx

@@ -2,7 +2,7 @@ import { isBoolean, isNil } from 'lodash';
 import { Dispatch, useCallback, useEffect, useMemo, useState } from 'react';
 import { clipboard } from 'electron';
 import useAsync from 'react-use/lib/useAsync';
-import { ProConfig, type ProProof } from 'libsession_util_nodejs';
+import { ProConfig } from 'libsession_util_nodejs';
 import { getAppDispatch } from '../../../state/dispatch';
 import {
   getDataFeatureFlag,
@@ -740,7 +740,7 @@ function ProConfigForm({
   );
   const [sigInput, setSigInput] = useState<string>(proConfig?.proProof.signatureHex ?? '');
   const [genHashInput, setGenHashInput] = useState<string>(
-    proConfig?.proProof.genIndexHashB64 ?? ''
+    proConfig?.proProof.revocationTagB64 ?? ''
   );
   const [versionInput, setVersionInput] = useState<string>(
     proConfig?.proProof.version.toString() ?? ''
@@ -924,15 +924,12 @@ export const ProDebugSection = ({
               if (getFeatureFlag('debugServerRequests')) {
                 window?.log?.debug('getProProof response: ', response);
               }
-              if (response?.status_code === 200) {
-                const proProof: ProProof = {
-                  expiryMs: response.result.expiry_unix_ts_ms,
-                  genIndexHashB64: response.result.gen_index_hash_b64,
-                  rotatingPubkeyHex: response.result.rotating_pkey_hex,
-                  version: response.result.version,
-                  signatureHex: response.result.sig_hex,
-                };
-                await UserConfigWrapperActions.setProConfig({ proProof, rotatingSeedHex });
+              if (response && response.status === 'ok') {
+                // libsession returns a ready-made ProProof; relay it verbatim.
+                await UserConfigWrapperActions.setProConfig({
+                  proProof: response.proof,
+                  rotatingSeedHex,
+                });
               }
             }}
           >

ts/components/dialog/user-settings/pages/user-pro/ProNonOriginatingPage.tsx

@@ -1,7 +1,7 @@
 import styled from 'styled-components';
-import { type ReactNode } from 'react';
+import { type ReactNode, useEffect, useState } from 'react';
 import { getAppDispatch } from '../../../../../state/dispatch';
-import { tr } from '../../../../../localization/localeTools';
+import { isSimpleTokenNoArgs, tr } from '../../../../../localization/localeTools';
 import { Localizer } from '../../../../basic/Localizer';
 import { ModalBasicHeader } from '../../../../SessionWrapperModal';
 import { ModalBackButton } from '../../../shared/ModalBackButton';
@@ -16,6 +16,8 @@ import { LucideIcon } from '../../../../icon/LucideIcon';
 import { LUCIDE_ICONS_UNICODE, WithLucideUnicode } from '../../../../icon/lucide';
 import { SessionButton, SessionButtonColor } from '../../../../basic/SessionButton';
 import { showLinkVisitWarningDialog } from '../../../OpenUrlModal';
+import { ProWrapperActions } from '../../../../../webworker/workers/browser/libsession_worker_interface';
+import type { ProviderUrls } from 'libsession_util_nodejs';
 import { proButtonProps } from '../../../SessionCTA';
 import { Flex } from '../../../../basic/Flex';
 import type { ProNonOriginatingPageVariant } from '../../../../../types/ReduxTypes';
@@ -33,18 +35,74 @@ type VariantPageProps = {
 };
 
 const useProBackendProDetailsLocal = useProBackendProDetails;
+
+/**
+ * Provider support/management URLs are libsession's (fetched by provider slug), not client display data,
+ * so we resolve them on demand at click time via the worker rather than threading async state into the
+ * (synchronous) selector. `pick` chooses which URL from the resolved set.
+ */
+async function openProviderUrl(
+  provider: ProPaymentProvider,
+  pick: (urls: ProviderUrls) => string,
+  dispatch: Parameters<typeof showLinkVisitWarningDialog>[1]
+) {
+  const urls = await ProWrapperActions.providerUrls({ code: provider });
+  if (urls) {
+    showLinkVisitWarningDialog(pick(urls), dispatch);
+  }
+}
 const useCurrentNeverHadProLocal = useCurrentNeverHadPro;
 
 /**
  * For some texts, we want `Apple website` for apple but `Google Play Store website` for google...
  * Those two are not stored in the same field, so this hook can be used to fetch the right one
  */
 function useStoreOrPlatformFromProvider(data: ProcessedProDetails['data']) {
-  return data.provider === ProPaymentProvider.iOSAppStore
+  return data.provider === ProPaymentProvider.AppStore
     ? data.providerConstants.platform // we want `Apple website` for apple
     : data.providerConstants.store; // but `Google Play Store website` for google...
 }
 
+// The purchasable-platform slug set is a static libsession constant, so fetch it once and cache it.
+let cachedVisiblePlatformSlugs: Array<string> | null = null;
+
+/**
+ * Build the `{pro_stores}` bulleted list from the purchasable provider slugs, keeping only those with a
+ * `pro_provider_<slug>_store` translation (a new/untranslated provider is skipped gracefully). Desktop
+ * keeps libsession's order as-is (it has no "own" platform to hoist).
+ */
+function buildProStoresList(slugs: Array<string>): string {
+  return slugs
+    .map(slug => {
+      const token = `pro_provider_${slug}_store`;
+      return isSimpleTokenNoArgs(token) ? tr(token) : undefined;
+    })
+    .filter((store): store is string => !!store)
+    .map(store => `<br/>• ${store}`)
+    .join('');
+}
+
+/** The localized `{pro_stores}` list for the "purchase via …" messages (fetched once; empty until loaded). */
+function useProStoresList(): string {
+  const [slugs, setSlugs] = useState<Array<string>>(cachedVisiblePlatformSlugs ?? []);
+  useEffect(() => {
+    if (cachedVisiblePlatformSlugs) {
+      return undefined;
+    }
+    let cancelled = false;
+    void ProWrapperActions.visiblePlatforms().then(result => {
+      cachedVisiblePlatformSlugs = result;
+      if (!cancelled) {
+        setSlugs(result);
+      }
+    });
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+  return buildProStoresList(slugs);
+}
+
 function ProStatusTextUpdate() {
   const { data } = useProBackendProDetailsLocal();
   return data.autoRenew ? (
@@ -170,8 +228,8 @@ function ProInfoBlockDevice({ textElement }: { textElement: ReactNode }) {
 }
 
 function ProInfoBlockDeviceLinked() {
-  const { data } = useProBackendProDetailsLocal();
   const hasNeverHadPro = useCurrentNeverHadProLocal();
+  const proStores = useProStoresList();
 
   return (
     <ProInfoBlockItem
@@ -181,8 +239,7 @@ function ProInfoBlockDeviceLinked() {
           <strong>{tr('onLinkedDevice')}</strong>
           <Localizer
             token={hasNeverHadPro ? 'proUpgradeDesktopLinked' : 'proRenewDesktopLinked'}
-            platform_store={data.providerConstants.store} // this one is always store
-            platform_store_other={data.providerConstants.store_other}
+            pro_stores={proStores}
           />
         </ProInfoBlockText>
       }
@@ -257,15 +314,14 @@ function ProInfoBlockLayout({
 
 function ProInfoBlockUpgrade() {
   const dispatch = getAppDispatch();
-  const { data } = useProBackendProDetailsLocal();
+  const proStores = useProStoresList();
   return (
     <ProInfoBlockLayout
       titleElement={tr('proUpgradingTo')}
       descriptionElement={
         <Localizer
           token="proAccessUpgradeDesktop"
-          platform_store={data.providerConstants.store} // this one is always store
-          platform_store_other={data.providerConstants.store_other}
+          pro_stores={proStores}
           icon={LUCIDE_ICONS_UNICODE.EXTERNAL_LINK_ICON}
         />
       }
@@ -328,15 +384,15 @@ function ProInfoBlockRenew() {
   const dispatch = getAppDispatch();
   const { data } = useProBackendProDetailsLocal();
   const storeOrPlatform = useStoreOrPlatformFromProvider(data);
+  const proStores = useProStoresList();
 
   return (
     <ProInfoBlockLayout
       titleElement={tr('renewingPro')}
       descriptionElement={
         <Localizer
           token="proAccessRenewDesktop"
-          platform_store={data.providerConstants.store}
-          platform_store_other={data.providerConstants.store_other}
+          pro_stores={proStores}
           icon={LUCIDE_ICONS_UNICODE.EXTERNAL_LINK_ICON}
         />
       }
@@ -504,15 +560,13 @@ function ProInfoBlockRefund() {
   }
 
   switch (data.provider) {
-    case ProPaymentProvider.iOSAppStore:
+    case ProPaymentProvider.AppStore:
       return <ProInfoBlockRefundIOS />;
-    case ProPaymentProvider.GooglePlayStore:
+    case ProPaymentProvider.GooglePlay:
       return <ProInfoBlockRefundGooglePlay />;
-    case ProPaymentProvider.Nil:
-    case ProPaymentProvider.Rangeproof:
-      return <ProInfoBlockRefundSessionSupport />;
     default:
-      return assertUnreachable(data.provider, `Unknown pro payment provider: ${data.provider}`);
+      // Rangeproof, none (''), or an unknown/future provider slug -> the Session-support refund flow.
+      return <ProInfoBlockRefundSessionSupport />;
   }
 }
 
@@ -532,7 +586,7 @@ function ProInfoBlockRefundRequested() {
       </ProInfoBlockRefundTitle>
       <ProInfoBlockDescription
         onClick={() =>
-          showLinkVisitWarningDialog(data.providerConstants.refund_status_url, dispatch)
+          void openProviderUrl(data.provider, u => u.refundStatusUrl, dispatch)
         }
         style={{ cursor: 'pointer' }}
       >
@@ -575,7 +629,7 @@ function ProPageButtonUpdate() {
       {...proButtonProps}
       buttonColor={SessionButtonColor.Primary}
       onClick={() => {
-        showLinkVisitWarningDialog(data.providerConstants.update_subscription_url, dispatch);
+        void openProviderUrl(data.provider, u => u.updateSubscriptionUrl, dispatch);
       }}
       dataTestId="pro-open-platform-website-button"
     >
@@ -593,7 +647,7 @@ function ProPageButtonCancel() {
       {...proButtonProps}
       buttonColor={SessionButtonColor.Danger}
       onClick={() => {
-        showLinkVisitWarningDialog(data.providerConstants.cancel_subscription_url, dispatch);
+        void openProviderUrl(data.provider, u => u.cancelSubscriptionUrl, dispatch);
       }}
       dataTestId="pro-open-platform-website-button"
     >
@@ -611,10 +665,9 @@ function ProPageButtonRefund() {
       {...proButtonProps}
       buttonColor={SessionButtonColor.Danger}
       onClick={() => {
-        showLinkVisitWarningDialog(
-          data.isPlatformRefundAvailable
-            ? data.providerConstants.refund_platform_url
-            : data.providerConstants.refund_support_url,
+        void openProviderUrl(
+          data.provider,
+          u => (data.isPlatformRefundAvailable ? u.refundPlatformUrl : u.refundSupportUrl),
           dispatch
         );
       }}

ts/models/conversation.ts

@@ -795,7 +795,7 @@ export class ConversationModel extends Model<ConversationAttributes> {
       if (!proProof) {
         return false;
       }
-      if (ProRevocationCache.isB64HashEffectivelyRevoked(proProof.genIndexHashB64)) {
+      if (ProRevocationCache.isB64HashEffectivelyRevoked(proProof.revocationTagB64)) {
         // `false` because the proof is not valid (revoked)
         return false;
       }
@@ -804,12 +804,12 @@ export class ConversationModel extends Model<ConversationAttributes> {
     }
 
     const proDetails = this.dbContactProDetails();
-    if (!proDetails || !proDetails.proExpiryTsMs || !proDetails.proGenIndexHashB64) {
+    if (!proDetails || !proDetails.proExpiryTsMs || !proDetails.proRevocationTagB64) {
       return false;
     }
 
-    // make sure that genIndexHash was not revoked first
-    if (ProRevocationCache.isB64HashEffectivelyRevoked(proDetails.proGenIndexHashB64)) {
+    // make sure that revocation tag was not revoked first
+    if (ProRevocationCache.isB64HashEffectivelyRevoked(proDetails.proRevocationTagB64)) {
       // `false` because the proof is not valid (revoked)
       return false;
     }
@@ -1731,11 +1731,11 @@ export class ConversationModel extends Model<ConversationAttributes> {
     ) {
       return null;
     }
-    const proGenIndexHashB64 = this.get('proGenIndexHashB64');
+    const proRevocationTagB64 = this.get('proRevocationTagB64');
     const proExpiryTsMs = this.get('proExpiryTsMs');
     const bitsetProFeatures = this.get('bitsetProFeatures');
     return {
-      proGenIndexHashB64,
+      proRevocationTagB64,
       proExpiryTsMs,
       bitsetProFeatures,
     };

ts/models/conversationAttributes.ts

@@ -117,7 +117,7 @@ export interface ConversationAttributes {
    */
   bitsetProFeatures?: string;
 
-  proGenIndexHashB64?: string;
+  proRevocationTagB64?: string;
   proExpiryTsMs?: number;
 
   triggerNotificationsFor: ConversationNotificationSettingType;
@@ -181,7 +181,7 @@ export const fillConvoAttributesWithDefaults = (
     lastMessageInteractionStatus: null,
 
     bitsetProFeatures: undefined,
-    proGenIndexHashB64: undefined,
+    proRevocationTagB64: undefined,
     proExpiryTsMs: undefined,
 
     triggerNotificationsFor: 'all', // if the settings is not set in the db, this is the default