Merge branch 'main' into deno-task-ok

denoland · Apr 19, 2023 · 7f9f7fa · 7f9f7fa
2 parents b2fd058 + de8516c
commit 7f9f7fa
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 22 deletions.
diff --git a/.example.env b/.example.env
@@ -1,6 +1,6 @@
 SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZS1kZW1vIiwicm9sZSI6ImFub24iLCJleHAiOjE5ODM4MTI5OTZ9.CRXP1A7WOeoJeXxjNni43kdQwgnWNReilDMblYTn_I0
-SUPABASE_URL=http://localhost:54321
-SUPABASE_SERVICE_KEY=xxx
+SUPABASE_API_URL=http://localhost:54321
+SUPABASE_SERVICE_ROLE_KEY=xxx
 
 STRIPE_SECRET_KEY=sk_test_xxx
 STRIPE_WEBHOOK_SECRET=xxx
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Use Unix line endings in all text files.
+* text=auto eol=lf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,14 @@ on:
 
 jobs:
   ci:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-22.04
+          - windows-2022
+          - macOS-12
 
     steps:
       - name: Setup repo

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ Want to know where Deno SaaSKit is headed? Check out
 
 1. Clone the repo:
 
-```
+```bash
 git clone https://github.com/denoland/saaskit.git
 cd saaskit
 ```
@@ -158,20 +158,6 @@ TODO
 
 TODO
 
-## Architecture
-
-### Authentication
-
-TODO:
-
-- Blog
-- Database
-- Formatting
-- Fresh
-- Linting
-- Payments
-- Testing
-
 ## Contributing
 
 When submitting a pull request, please follow the

diff --git a/routes/login/success.tsx b/routes/login/success.tsx
@@ -4,7 +4,7 @@ import AuthFragmentCatcher from "@/islands/AuthFragmentCatcher.tsx";
 export default function OAuthSuccessPage() {
   return (
     <AuthFragmentCatcher
-      supabaseUrl={Deno.env.get("SUPABASE_URL")!}
+      supabaseUrl={Deno.env.get("SUPABASE_API_URL")!}
       supabaseKey={Deno.env.get("SUPABASE_ANON_KEY")!}
     />
   );

diff --git a/utils/supabase.ts b/utils/supabase.ts
@@ -10,7 +10,7 @@ export function createSupabaseClient(
   responseHeaders?: Headers,
 ) {
   return createServerSupabaseClient<Database>({
-    supabaseUrl: Deno.env.get("SUPABASE_URL")!,
+    supabaseUrl: Deno.env.get("SUPABASE_API_URL")!,
     supabaseKey: Deno.env.get("SUPABASE_ANON_KEY")!,
     getRequestHeader: (key) => requestHeaders.get(key) ?? undefined,
     getCookie: (name) => {
@@ -33,8 +33,8 @@ export function createSupabaseClient(
 
 // Required to bypass Row Level Security (RLS)
 export const supabaseAdminClient = createClient<Database>(
-  Deno.env.get("SUPABASE_URL")!,
-  Deno.env.get("SUPABASE_SERVICE_KEY")!,
+  Deno.env.get("SUPABASE_API_URL")!,
+  Deno.env.get("SUPABASE_SERVICE_ROLE_KEY")!,
 );
 
 async function getCustomer(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# Use Unix line endings in all text files.
		* text=auto eol=lf