Skip to content

Commit b9ba6fb

Browse files
authored
Fixes Auth UI (#1447)
1 parent 99c9021 commit b9ba6fb

File tree

7 files changed

+20
-6
lines changed

7 files changed

+20
-6
lines changed

waspc/data/Generator/templates/react-app/src/auth/forms/internal/common/LoginSignupForm.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{{={= =}=}}
22
import { useContext } from 'react'
33
import { useForm, UseFormReturn } from 'react-hook-form'
4+
import { styled } from '../../../../stitches.config'
5+
import config from '../../../../config'
46

57
import { AuthContext } from '../../Auth'
68
import {

waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/.waspchecksums

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

waspc/e2e-test/test-outputs/waspComplexTest-golden/waspComplexTest/.wasp/out/web-app/src/auth/forms/internal/common/LoginSignupForm.tsx

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
TEST_ENV_VAR="I am test"
2-
DATABASE_URL=postgresql://postgres:postgres@localhost/todoapp
3-
#PORT=3001
1+
GOOGLE_CLIENT_ID="mock-client-id"
2+
GOOGLE_CLIENT_SECRET="mock-client-secret"

waspc/headless-test/examples/todoApp/todoApp.wasp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ app todoApp {
99
],
1010
auth: {
1111
userEntity: User,
12+
externalAuthEntity: SocialLogin,
1213
methods: {
1314
email: {
1415
fromField: {
@@ -25,6 +26,7 @@ app todoApp {
2526
},
2627
allowUnverifiedLogin: true,
2728
},
29+
google: {}
2830
},
2931
onAuthFailedRedirectTo: "/login",
3032
onAuthSucceededRedirectTo: "/profile"

waspc/headless-test/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
"scripts": {
77
"example-app:start": "node start.js",
88
"example-app:start-db": "npm run example-app:cleanup-db && cd ./examples/todoApp && cabal run wasp-cli start db",
9-
"example-app:start-app": "npm run example-app:wait-for-db && cd ./examples/todoApp && cabal run wasp-cli db migrate-dev && cabal run wasp-cli start",
9+
"example-app:start-app": "npm run example-app:wait-for-db && npm run example-app:prepare-env && cd ./examples/todoApp && cabal run wasp-cli db migrate-dev && cabal run wasp-cli start",
1010
"example-app:wait-for-db": "sleep 5 && ./node_modules/.bin/wait-port 5432",
11+
"example-app:prepare-env": "cp ./examples/todoApp/sample.env.server ./examples/todoApp/.env.server",
1112
"example-app:cleanup-db": "(docker container rm $(docker container ls -f name=^wasp-dev-db-todoApp- -q) -f || true) && docker volume rm $(docker volume ls -f name=^wasp-dev-db-todoApp- -q) -f || true"
1213
},
1314
"keywords": [],

waspc/headless-test/tests/simple.spec.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,22 @@ test.describe("signup and login", () => {
1212

1313
test.describe.configure({ mode: "serial" });
1414

15+
test("social button renders", async ({ page }) => {
16+
await page.goto("/signup");
17+
18+
await page.waitForSelector("text=Create a new account");
19+
20+
await expect(page.locator("a[href='http://localhost:3001/auth/google/login']")).toBeVisible();
21+
});
22+
1523
test("can sign up", async ({ page }) => {
1624
await page.goto("/signup");
1725

1826
await page.waitForSelector("text=Create a new account");
1927

2028
await page.locator("input[type='email']").fill(randomEmail);
2129
await page.locator("input[type='password']").fill(password);
22-
await page.getByText("Sign up").click();
30+
await page.locator("button").click();
2331

2432
await expect(page).toHaveURL("/profile");
2533
});

0 commit comments

Comments
 (0)