Upgrade v0.14

.github/workflows/e2e-tests.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   WASP_TELEMETRY_DISABLE: 1
-  WASP_VERSION: 0.13.2
+  WASP_VERSION: 0.14.0-rc1
 
 jobs:
   test:

opensaas-sh/app_diff/.env.vault.diff

@@ -7,8 +7,8 @@
 +#/--------------------------------------------------/
 +
 +# development
-+DOTENV_VAULT_DEVELOPMENT="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"
-+DOTENV_VAULT_DEVELOPMENT_VERSION=6
++DOTENV_VAULT_DEVELOPMENT="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"
++DOTENV_VAULT_DEVELOPMENT_VERSION=7
 +
 +# ci
 +DOTENV_VAULT_CI="uIKC5RKdFeJiCAzoQ9e2oaT2EbR8usJcZIYlSoFl3HTFrh7J/qfo+Z+OqBgJKQllvCVIK4oQUsLICVWCRs+7yWp5j6gn2yu67lN4lKAfX0QCF/VFYNWa6u1NWZGT1bPRlvNIY7z/YnJZfgaq8Uj+mSU+C14KHMMCpKCSkbqqFX8AWlcPSkbjXaJP4IL3HxzPUGTMfq/+XbokI9r1UjBNYi1yus6jGjI4U2OtiDc61LZJ6Y0tsBeA8NA0iT2S+lwTJBjTmGHoMMjtK08Iw8GAXv9eejETvbHZfFTOpphIjeFXjFRUsgRfuPP3p/lErfncXofQ++9KNS5lhxINGBXQIKh2CRnjhajut38Xxr848YNAj4Ie4RKzeU1+aC6BXONhbD7qZQJmm63vtwTKwrUf8ML7T27DwdpV7dTdz5/W3UWnmbzhfI1pLeCHpBC1FrLBaxhFNFlkqsXiopen4iJf4ihWICn1hMCBGGRosKQJdj+y65FJMwraBbEVHa29FHYruhAPGFqGfEIWvQ++LXlPguJM/RL2txMoVppDanOwFCM3dMO3sF55BEuSSNJWX2s72ZDgTW4/Il7YiIBwwxChPs5vOQweYKqOd21HCl4t+ocu95ja3ZGROnhff72j2pCk7cahaVl/PS8WU7nZ1JQtkv5vNRR3nHgAH1nS9tSBDJ8twKEQ4bJcu2qdhGeQwenKRsV4nrKooGnQ8UlsvoTyozYYCseds2/iXX5vlc/lhL1fgcPPxoss2p+lDaS3AIIEMq0/TUCeRF2ImYUIMnnvCEb0T32Pz8bIfPblSThETdQ5A7ZRjyU9T9Ff6lpxqQwGUWO/ElKZ/CDsoeuj1UqOVLGRBwThrOHlU7LZ6kJnBvcy6AmWccE5fLsmf1l189FwMH6CimHIg2OC4ndCbiRKiP3+3OYHL0JSkTt8Lrsu/b+Mu0Kmiks1A16Sx2Lu1lUfPSsbAgYRYni7OkpgCOJ5DdnP607LTFVIichq4+KzQsc="

opensaas-sh/app_diff/main.wasp.diff

@@ -1,7 +1,7 @@
 --- template/app/main.wasp
 +++ opensaas-sh/app/main.wasp
 @@ -3,24 +3,24 @@
-     version: "^0.13.2"
+     version: "^0.14.0"
    },
 
 -  title: "My Open SaaS App",
@@ -45,7 +45,7 @@
          },
          emailVerification: {
            clientRoute: EmailVerificationRoute,
-@@ -44,16 +44,14 @@
+@@ -44,21 +44,18 @@
          },
          userSignupFields: import { getEmailUserFields } from "@src/auth/userSignupFields",
        },
@@ -59,6 +59,11 @@
 -      //   userSignupFields: import { getGitHubUserFields } from "@src/auth/userSignupFields",
 -      //   configFn: import { getGitHubAuthConfig } from "@src/auth/userSignupFields",
 -      // },
+-      // Uncomment to enable Discord Auth (check https://wasp-lang.dev/docs/auth/social-auth/discord for setup instructions):
+-      // discord: {
+-      //   userSignupFields: import { getDiscordUserFields } from "@src/auth/userSignupFields",
+-      //   configFn: import { getDiscordAuthConfig } from "@src/auth/userSignupFields"
+-      // }
 +      google: {
 +        userSignupFields: import { getGoogleUserFields } from "@src/auth/userSignupFields",
 +        configFn: import { getGoogleAuthConfig } from "@src/auth/userSignupFields",
@@ -67,10 +72,14 @@
 +        userSignupFields: import { getGitHubUserFields } from "@src/auth/userSignupFields",
 +        configFn: import { getGitHubAuthConfig } from "@src/auth/userSignupFields",
 +      },
++      discord: {
++        userSignupFields: import { getDiscordUserFields } from "@src/auth/userSignupFields",
++        configFn: import { getDiscordAuthConfig } from "@src/auth/userSignupFields"
++      }
      },
+     onAfterSignup: import { onAfterSignup } from "@src/auth/hooks",
      onAuthFailedRedirectTo: "/login",
-     onAuthSucceededRedirectTo: "/demo-app",
-@@ -76,11 +74,11 @@
+@@ -81,11 +78,11 @@
      // NOTE: "Dummy" provider is just for local development purposes.
      //   Make sure to check the server logs for the email confirmation url (it will not be sent to an address)!
      //   Once you are ready for production, switch to e.g. "SendGrid" or "Mailgun" providers. Check out https://docs.opensaas.sh/guides/email-sending/ .
@@ -84,15 +93,3 @@
      },
    },
  }
-@@ -125,7 +123,10 @@
-   email                     String?         @unique
-   username                  String?         @unique
-   lastActiveTimestamp       DateTime        @default(now())
--  isAdmin                   Boolean         @default(false)
-+  isAdmin                   Boolean         @default(true)
-+  // isMockUser is an extra property for the demo app ensuring that all users can access
-+  // the admin dashboard but won't be able to see the other users' data, only mock user data.
-+  isMockUser                Boolean         @default(false)
-
-   stripeId                  String?         @unique
-   checkoutSessionId         String?

opensaas-sh/app_diff/migrations/20240715142249_version_14/migration.sql.diff

@@ -0,0 +1,19 @@
+--- template/app/migrations/20240715142249_version_14/migration.sql
++++ opensaas-sh/app/migrations/20240715142249_version_14/migration.sql
+@@ -0,0 +1,16 @@
++/*
++  Warnings:
++
++  - You are about to drop the column `sendEmail` on the `User` table. All the data in the column will be lost.
++  - You are about to drop the column `subscriptionTier` on the `User` table. All the data in the column will be lost.
++  - A unique constraint covering the columns `[stripeId]` on the table `User` will be added. If there are existing duplicate values, this will fail.
++
++*/
++-- AlterTable
++ALTER TABLE "User" DROP COLUMN "sendEmail",
++DROP COLUMN "subscriptionTier",
++ADD COLUMN     "sendNewsletter" BOOLEAN NOT NULL DEFAULT false,
++ADD COLUMN     "subscriptionPlan" TEXT;
++
++-- CreateIndex
++CREATE UNIQUE INDEX "User_stripeId_key" ON "User"("stripeId");

opensaas-sh/app_diff/schema.prisma.diff

@@ -0,0 +1,14 @@
+--- template/app/schema.prisma
++++ opensaas-sh/app/schema.prisma
+@@ -14,7 +14,10 @@
+   email                     String?         @unique
+   username                  String?         @unique
+   lastActiveTimestamp       DateTime        @default(now())
+-  isAdmin                   Boolean         @default(false)
++  isAdmin                   Boolean         @default(true)
++  // isMockUser is an extra property for the demo app ensuring that all users can access
++  // the admin dashboard but won't be able to see the other users' data, only mock user data.
++  isMockUser                Boolean         @default(false)
+
+   stripeId                  String?         @unique
+   checkoutSessionId         String?

opensaas-sh/app_diff/src/admin/dashboards/analytics/AnalyticsDashboardPage.tsx.diff

@@ -1,20 +1,18 @@
 --- template/app/src/admin/dashboards/analytics/AnalyticsDashboardPage.tsx
 +++ opensaas-sh/app/src/admin/dashboards/analytics/AnalyticsDashboardPage.tsx
-@@ -1,4 +1,5 @@
- import { type User } from 'wasp/entities';
+@@ -1,4 +1,6 @@
++import { Link } from "wasp/client/router";
+ import { type AuthUser } from 'wasp/auth';
 +import { useState, useEffect } from 'react';
  import { useQuery, getDailyStats } from 'wasp/client/operations';
  import TotalSignupsCard from './TotalSignupsCard';
  import TotalPageViewsCard from './TotalPageViewsCard';
-@@ -10,6 +11,7 @@
- import { useHistory } from 'react-router-dom';
+@@ -10,12 +12,45 @@
+ import { useRedirectHomeUnlessUserIsAdmin } from '../../useRedirectHomeUnlessUserIsAdmin'
 
- const Dashboard = ({ user }: { user: User }) => {
+ const Dashboard = ({ user }: { user: AuthUser }) => {
 +  const [isDemoInfoVisible, setIsDemoInfoVisible] = useState(false);
-   const history = useHistory();
-   if (!user.isAdmin) {
-     history.push('/');
-@@ -17,8 +19,40 @@
+   useRedirectHomeUnlessUserIsAdmin({ user })
 
    const { data: stats, isLoading, error } = useQuery(getDailyStats);
 
@@ -40,7 +38,7 @@
 +  };
 +
    return (
-     <DefaultLayout>
+     <DefaultLayout user={user}>
 +      {/* Floating Demo Announcement */}
 +      {isDemoInfoVisible && (
 +        <div className='fixed z-999 bottom-0 mb-2 left-1/2 -translate-x-1/2 lg:mb-4 bg-gray-700 rounded-full px-3.5 py-2 text-sm text-white duration-300 ease-in-out hover:bg-gray-800 focus-visible:outline focus-visible:outline-2 focus-visible:outline-indigo-600'>

opensaas-sh/app_diff/src/admin/dashboards/users/UsersDashboardPage.tsx.diff

@@ -0,0 +1,54 @@
+--- template/app/src/admin/dashboards/users/UsersDashboardPage.tsx
++++ opensaas-sh/app/src/admin/dashboards/users/UsersDashboardPage.tsx
+@@ -1,14 +1,50 @@
+ import { type AuthUser } from 'wasp/auth';
++import { useState, useEffect } from 'react';
+ import UsersTable from './UsersTable';
+ import Breadcrumb from '../../layout/Breadcrumb';
+ import DefaultLayout from '../../layout/DefaultLayout';
+ import { useRedirectHomeUnlessUserIsAdmin } from '../../useRedirectHomeUnlessUserIsAdmin';
+
+ const Users = ({ user }: { user: AuthUser }) => {
+-  useRedirectHomeUnlessUserIsAdmin({user})
++  const [isDemoInfoVisible, setIsDemoInfoVisible] = useState(false);
++  useRedirectHomeUnlessUserIsAdmin({user});
++
++  useEffect(() => {
++    try {
++      if (localStorage.getItem('isDemoInfoVisible') === 'false') {
++        // do nothing
++      } else {
++        setIsDemoInfoVisible(true);
++      }
++    } catch (error) {
++      console.error(error);
++    }
++  }, []);
++
++  const handleDemoInfoClose = () => {
++    try {
++      localStorage.setItem('isDemoInfoVisible', 'false');
++      setIsDemoInfoVisible(false);
++    } catch (error) {
++      console.error(error);
++    }
++  };
+
+   return (
+     <DefaultLayout user={user}>
++      {/* Floating Demo Announcement */}
++      {isDemoInfoVisible && (
++        <div className='fixed z-999 bottom-0 mb-2 left-1/2 -translate-x-1/2 lg:mb-4 bg-gray-700 rounded-full px-3.5 py-2 text-sm text-white duration-300 ease-in-out hover:bg-gray-800 focus-visible:outline focus-visible:outline-2 focus-visible:outline-indigo-600'>
++          <div className='px-4 flex flex-row gap-2 items-center my-1'>
++            <span className='text-gray-100'>
++              You are viewing mock user data only ;)
++            </span>
++            <button className=' pl-2.5 text-gray-400 text-xl font-bold' onClick={() => handleDemoInfoClose()}>
++              X
++            </button>
++          </div>
++        </div>
++      )}
+       <Breadcrumb pageName='Users' />
+       <div className='flex flex-col gap-10'>
+         <UsersTable />

opensaas-sh/app_diff/src/admin/dashboards/users/UsersTable.tsx.diff

@@ -1,56 +1,10 @@
 --- template/app/src/admin/dashboards/users/UsersTable.tsx
 +++ opensaas-sh/app/src/admin/dashboards/users/UsersTable.tsx
-@@ -9,8 +9,10 @@
+@@ -9,6 +9,7 @@
    const [skip, setskip] = useState(0);
    const [page, setPage] = useState(1);
    const [email, setEmail] = useState<string | undefined>(undefined);
 +  
    const [isAdminFilter, setIsAdminFilter] = useState<boolean | undefined>(undefined);
    const [statusOptions, setStatusOptions] = useState<SubscriptionStatus[]>([]);
-+  const [isDemoInfoVisible, setIsDemoInfoVisible] = useState(false);
    const { data, isLoading, error } = useQuery(getPaginatedUsers, {
-     skip,
-     emailContains: email,
-@@ -26,8 +28,42 @@
-     setskip((page - 1) * 10);
-   }, [page]);
-
-+    useEffect(() => {
-+    try {
-+      if (localStorage.getItem('isDemoInfoVisible') === 'false') {
-+        // do nothing
-+      } else {
-+        setIsDemoInfoVisible(true);
-+      }
-+    } catch (error) {
-+      console.error(error);
-+    }
-+  }, []);
-+
-+  const handleDemoInfoClose = () => {
-+    try {
-+      localStorage.setItem('isDemoInfoVisible', 'false');
-+      setIsDemoInfoVisible(false);
-+    } catch (error) {
-+      console.error(error);
-+    }
-+  };
-+
-   return (
-     <div className='flex flex-col gap-4'>
-+      {/* Floating Demo Announcement */}
-+      {isDemoInfoVisible && (
-+        <div className='fixed z-999 bottom-0 mb-2 left-1/2 -translate-x-1/2 lg:mb-4 bg-gray-700 rounded-full px-3.5 py-2 text-sm text-white duration-300 ease-in-out hover:bg-gray-800 focus-visible:outline focus-visible:outline-2 focus-visible:outline-indigo-600'>
-+          <div className='px-4 flex flex-row gap-2 items-center my-1'>
-+            <span className='text-gray-100'>
-+              You are viewing mock user data only ;)
-+            </span>
-+            <button className=' pl-2.5 text-gray-400 text-xl font-bold' onClick={() => handleDemoInfoClose()}>
-+              X
-+            </button>
-+          </div>
-+        </div>
-+      )}
-       <div className='rounded-sm border border-stroke bg-white shadow-default dark:border-strokedark dark:bg-boxdark'>
-         <div className='flex-col flex items-start justify-between p-6 gap-3 w-full bg-gray-100/40 dark:bg-gray-700/50'>
-           <span className='text-sm font-medium'>Filters:</span>

opensaas-sh/app_diff/src/auth/userSignupFields.ts.diff

@@ -0,0 +1,36 @@
+--- template/app/src/auth/userSignupFields.ts
++++ opensaas-sh/app/src/auth/userSignupFields.ts
+@@ -1,11 +1,8 @@
+ import { z } from 'zod';
+ import { defineUserSignupFields } from 'wasp/auth/providers/types';
+
+-const adminEmails = process.env.ADMIN_EMAILS?.split(',') || [];
+-
+ export const getEmailUserFields = defineUserSignupFields({
+   username: (data: any) => data.email,
+-  isAdmin: (data: any) => adminEmails.includes(data.email),
+   email: (data: any) => data.email,
+ });
+
+@@ -29,10 +26,6 @@
+     const githubData = githubDataSchema.parse(data);
+     return githubData.profile.login;
+   },
+-  isAdmin: (data) => {
+-    const githubData = githubDataSchema.parse(data);
+-    return adminEmails.includes(githubData.profile.emails[0].email);
+-  },
+ });
+
+ // NOTE: if we don't want to access users' emails, we can use scope ["user:read"]
+@@ -58,10 +51,6 @@
+     const googleData = googleDataSchema.parse(data);
+     return googleData.profile.email;
+   },
+-  isAdmin: (data) => {
+-    const googleData = googleDataSchema.parse(data);
+-    return adminEmails.includes(googleData.profile.email);
+-  },
+ });
+
+ export function getGoogleAuthConfig() {

opensaas-sh/blog/src/content/docs/general/admin-dashboard.md

@@ -2,8 +2,7 @@
 title: Admin Dashboard
 banner:
   content: |
-    ⚠️ Open SaaS is now running on <a href='https://wasp-lang.dev'>Wasp v0.13</a>! If you're running an older version of Open SaaS, please follow the 
-    <a href="https://wasp-lang.dev/docs/migrate-from-0-12-to-0-13">migration instructions here</a> ⚠️ 
+    Open SaaS is now running on <a href='https://wasp-lang.dev'>Wasp v0.14</a>! <br/>🐝🚀<br/>If you're running an older version, please follow the <a href="https://wasp-lang.dev/docs/migrate-from-0-13-to-0-14">migration instructions.</a>
 ---
 This is a reference on how the Admin dashboard is set up and works.
 

opensaas-sh/blog/src/content/docs/general/user-overview.md

@@ -2,8 +2,7 @@
 title: User Overview
 banner:
   content: |
-    ⚠️ Open SaaS is now running on <a href='https://wasp-lang.dev'>Wasp v0.13</a>! If you're running an older version of Open SaaS, please follow the 
-    <a href="https://wasp-lang.dev/docs/migrate-from-0-12-to-0-13">migration instructions here</a> ⚠️ 
+    Open SaaS is now running on <a href='https://wasp-lang.dev'>Wasp v0.14</a>! <br/>🐝🚀<br/>If you're running an older version, please follow the <a href="https://wasp-lang.dev/docs/migrate-from-0-13-to-0-14">migration instructions.</a>
 ---
 
 This reference will help you understand how the User entity works in this template.

opensaas-sh/blog/src/content/docs/guides/analytics.md

@@ -2,8 +2,7 @@
 title: Analytics
 banner:
   content: |
-    ⚠️ Open SaaS is now running on <a href='https://wasp-lang.dev'>Wasp v0.13</a>! If you're running an older version of Open SaaS, please follow the 
-    <a href="https://wasp-lang.dev/docs/migrate-from-0-12-to-0-13">migration instructions here</a> ⚠️ 
+    Open SaaS is now running on <a href='https://wasp-lang.dev'>Wasp v0.14</a>! <br/>🐝🚀<br/>If you're running an older version, please follow the <a href="https://wasp-lang.dev/docs/migrate-from-0-13-to-0-14">migration instructions.</a>
 ---
 This guide will show you how to integrate analytics for your app. You can choose between [Google Analytics](#google-analytics) and [Plausible](#plausible).