Merge pull request #53 from pluralsh/klink/fix-posthog

fix: Incorrect initial capture settings for posthog
pluralsh · Aug 16, 2023 · cf551b7 · cf551b7
2 parents 437f019 + 3703475
commit cf551b7
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 4 deletions.
diff --git a/src/components/hooks/usePosthog.tsx b/src/components/hooks/usePosthog.tsx
@@ -9,9 +9,11 @@ function setAllowTracking(on?: boolean) {
   // opt_in_capturing() or opt_out_capturing() without having run
   // posthog.init() first. This generally only occurs when running locally.
   if (window && process.env.NEXT_PUBLIC_POSTHOG_API_KEY) {
-    if (on) {
+    if (on && !posthog.has_opted_in_capturing()) {
       posthog.opt_in_capturing()
-    } else {
+      // Make sure to capture initial page view after opting in
+      posthog.capture('$pageview')
+    } else if (!on && !posthog.has_opted_out_capturing()) {
       posthog.opt_out_capturing()
     }
   }
@@ -26,8 +28,7 @@ export function usePosthog() {
         api_host:
           process.env.NEXT_PUBLIC_POSTHOG_API_HOST ||
           'https://posthog.plural.sh',
-        opt_out_capturing_by_default:
-          window.Cookiebot?.consent?.statistics ?? false,
+        opt_out_capturing_by_default: !window.Cookiebot?.consent?.statistics,
         loaded: () => {
           setAllowTracking(window.Cookiebot?.consent?.statistics)
         },

diff --git a/src/generated/graphqlPlural.ts b/src/generated/graphqlPlural.ts
@@ -847,6 +847,10 @@ export type EntityAttributes = {
   userId?: InputMaybe<Scalars['ID']['input']>;
 };
 
+export enum ExternalOidcProvider {
+  GithubActions = 'GITHUB_ACTIONS'
+}
+
 export type File = {
   __typename?: 'File';
   blob: Scalars['String']['output'];
@@ -1772,6 +1776,16 @@ export type OidcStepResponse = {
   repository?: Maybe<Repository>;
 };
 
+export type OidcTrustRelationship = {
+  __typename?: 'OidcTrustRelationship';
+  id: Scalars['ID']['output'];
+  insertedAt?: Maybe<Scalars['DateTime']['output']>;
+  issuer: Scalars['String']['output'];
+  scopes?: Maybe<Array<Scalars['String']['output']>>;
+  trust: Scalars['String']['output'];
+  updatedAt?: Maybe<Scalars['DateTime']['output']>;
+};
+
 export type OnboardingChecklist = {
   __typename?: 'OnboardingChecklist';
   dismissed?: Maybe<Scalars['Boolean']['output']>;
@@ -2680,6 +2694,7 @@ export type RootMutationType = {
   createTerraform?: Maybe<Terraform>;
   createTest?: Maybe<Test>;
   createToken?: Maybe<PersistedToken>;
+  createTrustRelationship?: Maybe<OidcTrustRelationship>;
   createUpgrade?: Maybe<Upgrade>;
   createUserEvent?: Maybe<Scalars['Boolean']['output']>;
   createWebhook?: Maybe<Webhook>;
@@ -2714,6 +2729,7 @@ export type RootMutationType = {
   deleteStack?: Maybe<Stack>;
   deleteTerraform?: Maybe<Terraform>;
   deleteToken?: Maybe<PersistedToken>;
+  deleteTrustRelationship?: Maybe<OidcTrustRelationship>;
   deleteUser?: Maybe<User>;
   destroyCluster?: Maybe<Scalars['Boolean']['output']>;
   deviceLogin?: Maybe<DeviceLogin>;
@@ -3007,6 +3023,11 @@ export type RootMutationTypeCreateTestArgs = {
 };
 
 
+export type RootMutationTypeCreateTrustRelationshipArgs = {
+  attributes: TrustRelationshipAttributes;
+};
+
+
 export type RootMutationTypeCreateUpgradeArgs = {
   attributes: UpgradeAttributes;
   queue: Scalars['String']['input'];
@@ -3163,6 +3184,11 @@ export type RootMutationTypeDeleteTokenArgs = {
 };
 
 
+export type RootMutationTypeDeleteTrustRelationshipArgs = {
+  id: Scalars['ID']['input'];
+};
+
+
 export type RootMutationTypeDeleteUserArgs = {
   id: Scalars['ID']['input'];
 };
@@ -3594,6 +3620,7 @@ export type RootQueryType = {
   oidcConsent?: Maybe<OidcStepResponse>;
   oidcLogin?: Maybe<OidcStepResponse>;
   oidcLogins?: Maybe<OidcLoginConnection>;
+  oidcToken?: Maybe<Scalars['String']['output']>;
   platformMetrics?: Maybe<PlatformMetrics>;
   platformPlans?: Maybe<Array<Maybe<PlatformPlan>>>;
   platformSubscription?: Maybe<PlatformSubscription>;
@@ -3935,6 +3962,13 @@ export type RootQueryTypeOidcLoginsArgs = {
 };
 
 
+export type RootQueryTypeOidcTokenArgs = {
+  email: Scalars['String']['input'];
+  idToken: Scalars['String']['input'];
+  provider: ExternalOidcProvider;
+};
+
+
 export type RootQueryTypePublicKeysArgs = {
   after?: InputMaybe<Scalars['String']['input']>;
   before?: InputMaybe<Scalars['String']['input']>;
@@ -4634,6 +4668,12 @@ export enum TestType {
   Git = 'GIT'
 }
 
+export type TrustRelationshipAttributes = {
+  issuer: Scalars['String']['input'];
+  scopes?: InputMaybe<Array<Scalars['String']['input']>>;
+  trust: Scalars['String']['input'];
+};
+
 export type UpdatablePlanAttributes = {
   default?: InputMaybe<Scalars['Boolean']['input']>;
   serviceLevels?: InputMaybe<Array<InputMaybe<ServiceLevelAttributes>>>;
@@ -4785,6 +4825,7 @@ export type User = {
   publisher?: Maybe<Publisher>;
   roles?: Maybe<Roles>;
   serviceAccount?: Maybe<Scalars['Boolean']['output']>;
+  trustRelationships?: Maybe<OidcTrustRelationship>;
   updatedAt?: Maybe<Scalars['DateTime']['output']>;
 };