Skip to content

Commit f1020d3

Browse files
author
Anders
authored
change microsoft to google social login (tests) (#513)
* change microsoft to google social login (tests) * prettier * update workflow env vars * clean up microsoft social login related code/data * fix workflow file * add workflow links to cloudwatch log * increase total test timeout for social tests * prettier
1 parent 51f6f8b commit f1020d3

File tree

12 files changed

+237
-90
lines changed

12 files changed

+237
-90
lines changed

‎.github/workflows/deploy-playground-and-test.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,9 @@ jobs:
182182
env:
183183
PLAYWRIGHT_NUM_CORES: 4
184184
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
185-
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
186-
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
187-
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
188-
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
185+
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
186+
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
187+
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
189188
GITHUB_RUN_ID: ${{ github.run_id }}
190189
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
191190
GITHUB_BRANCH_NAME: ${{ github.ref_name }}
@@ -211,7 +210,7 @@ jobs:
211210
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
212211
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
213212
FAILED=$((FAILURES + ERRORS))
214-
SUMMARY="[Test Result] application=complete platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED"
213+
SUMMARY="[Test Result] application=complete platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
215214
TIMESTAMP=$(date +%s000)
216215
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
217216
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
@@ -257,7 +256,7 @@ jobs:
257256
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
258257
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
259258
FAILED=$((FAILURES + ERRORS))
260-
SUMMARY="[Test Result] application=connect platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED"
259+
SUMMARY="[Test Result] application=connect platform=react run_type=commitly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
261260
TIMESTAMP=$(date +%s000)
262261
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
263262
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"

‎.github/workflows/test-all.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ jobs:
9090
env:
9191
PLAYWRIGHT_NUM_CORES: 4
9292
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
93-
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
94-
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
95-
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
96-
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
93+
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
94+
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
95+
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
9796
GITHUB_RUN_ID: ${{ github.run_id }}
9897
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
9998
GITHUB_BRANCH_NAME: ${{ env.BRANCH_NAME_RAW }}
@@ -119,7 +118,7 @@ jobs:
119118
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
120119
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
121120
FAILED=$((FAILURES + ERRORS))
122-
SUMMARY="[Test Result] application=complete platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
121+
SUMMARY="[Test Result] application=complete platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
123122
TIMESTAMP=$(date +%s000)
124123
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
125124
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
@@ -138,10 +137,9 @@ jobs:
138137
env:
139138
PLAYWRIGHT_NUM_CORES: 4
140139
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
141-
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
142-
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
143-
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
144-
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
140+
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
141+
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
142+
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
145143
GITHUB_RUN_ID: ${{ github.run_id }}
146144
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
147145
GITHUB_BRANCH_NAME: ${{ env.BRANCH_NAME_RAW }}
@@ -167,7 +165,7 @@ jobs:
167165
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
168166
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
169167
FAILED=$((FAILURES + ERRORS))
170-
SUMMARY="[Test Result] application=complete platform=web-js run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
168+
SUMMARY="[Test Result] application=complete platform=web-js run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
171169
TIMESTAMP=$(date +%s000)
172170
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
173171
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
@@ -186,10 +184,9 @@ jobs:
186184
env:
187185
PLAYWRIGHT_NUM_CORES: 4
188186
PLAYWRIGHT_JWT_TOKEN: ${{ secrets.PLAYWRIGHT_JWT_TOKEN }}
189-
PLAYWRIGHT_MICROSOFT_EMAIL: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL }}
190-
PLAYWRIGHT_MICROSOFT_EMAIL_LINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_LINKED }}
191-
PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED: ${{ secrets.PLAYWRIGHT_MICROSOFT_EMAIL_UNLINKED }}
192-
PLAYWRIGHT_MICROSOFT_PASSWORD: ${{ secrets.PLAYWRIGHT_MICROSOFT_PASSWORD }}
187+
PLAYWRIGHT_GOOGLE_EMAIL: ${{ secrets.PLAYWRIGHT_GOOGLE_EMAIL }}
188+
PLAYWRIGHT_GOOGLE_PASSWORD: ${{ secrets.PLAYWRIGHT_GOOGLE_PASSWORD }}
189+
PLAYWRIGHT_GOOGLE_TOTP_SECRET: ${{ secrets.PLAYWRIGHT_GOOGLE_TOTP_SECRET }}
193190
GITHUB_RUN_ID: ${{ github.run_id }}
194191
SLACK_BOT_USER_OAUTH_TOKEN: ${{ secrets.SLACK_BOT_USER_OAUTH_TOKEN }}
195192
GITHUB_BRANCH_NAME: ${{ env.BRANCH_NAME_RAW }}
@@ -215,7 +212,7 @@ jobs:
215212
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
216213
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
217214
FAILED=$((FAILURES + ERRORS))
218-
SUMMARY="[Test Result] application=complete platform=web-js-script run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
215+
SUMMARY="[Test Result] application=complete platform=web-js-script run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
219216
TIMESTAMP=$(date +%s000)
220217
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
221218
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"
@@ -261,7 +258,7 @@ jobs:
261258
TIME=$(xmllint --xpath 'string(/testsuites/@time)' test-results/results.xml)
262259
PASSED=$((TESTS - FAILURES - ERRORS - SKIPPED))
263260
FAILED=$((FAILURES + ERRORS))
264-
SUMMARY="[Test Result] application=connect platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED"
261+
SUMMARY="[Test Result] application=connect platform=react run_type=nightly execution_time=$TIME passed=$PASSED failed=$FAILED link=https://github.com/corbado/javascript/actions/runs/${GITHUB_RUN_ID}"
265262
TIMESTAMP=$(date +%s000)
266263
LOG_EVENT_JSON="[{\"timestamp\":$TIMESTAMP,\"message\":\"$SUMMARY\"}]"
267264
aws logs put-log-events --log-group-name "test-results-board" --log-stream-name "$LOG_STREAM_NAME" --log-events "$LOG_EVENT_JSON"

‎package-lock.json‎

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/tests-e2e/.env.complete.example‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ PLAYWRIGHT_TEST_URL=http://localhost:3000
33
DEVELOPERPANEL_API_URL=https://console.cloud.corbado-staging.io
44
BACKEND_API_URL=https://backendapi.cloud.corbado-staging.io
55
FRONTEND_API_URL_SUFFIX=
6-
PLAYWRIGHT_JWT_TOKEN=
7-
PLAYWRIGHT_MICROSOFT_EMAIL=
8-
PLAYWRIGHT_MICROSOFT_PASSWORD=
6+
PLAYWRIGHT_GOOGLE_EMAIL=
7+
PLAYWRIGHT_GOOGLE_PASSWORD=
8+
PLAYWRIGHT_GOOGLE_TOTP_SECRET=

‎packages/tests-e2e/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"@playwright/test": "^1.47.0",
2626
"@types/node": "^20.10.5",
2727
"ngrok": "^5.0.0-beta.2",
28+
"node-2fa": "^2.0.3",
2829
"playwright-slack-report": "^1.1.72"
2930
},
3031
"dependencies": {

‎packages/tests-e2e/src/complete/models/corbado-auth-blocks/LoginInitBlockModel.ts‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Page } from '@playwright/test';
22
import { expect } from '@playwright/test';
33

44
import type { SocialProviderType } from '../../utils/constants';
5-
import { repeatSocialLogin, socialLogin } from './socialLogin';
5+
import { socialLogin } from '../../utils/externalauth';
66

77
export class LoginInitBlockModel {
88
page: Page;
@@ -39,12 +39,8 @@ export class LoginInitBlockModel {
3939
await this.page.getByRole('button', { name: 'Continue' }).click();
4040
}
4141

42-
async submitSocialMicrosoft(email: string, password: string) {
43-
await socialLogin(this.page, email, password);
44-
}
45-
46-
async resubmitSocialMicrosoft() {
47-
await repeatSocialLogin(this.page);
42+
async submitSocialGoogle(email: string, password: string, secret: string) {
43+
await socialLogin(this.page, email, password, secret);
4844
}
4945

5046
submitPasskeyButton() {

‎packages/tests-e2e/src/complete/models/corbado-auth-blocks/PasskeyAppendBlockModel.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,17 @@ export class PasskeyAppendBlockModel {
2828
}
2929
}
3030

31+
async startPasskeyOperation2(complete: boolean) {
32+
const operationTrigger = () => this.page.getByRole('button', { name: 'Create passkey' }).click();
33+
if (complete) {
34+
await this.virtualAuthenticator.startAndCompletePasskeyOperation(operationTrigger);
35+
} else {
36+
await this.virtualAuthenticator.startAndCancelPasskeyOperation(operationTrigger, () =>
37+
expectScreen(this.page, ScreenNames.PasskeyError),
38+
);
39+
}
40+
}
41+
3142
async retryPasskeyOperation(complete: boolean) {
3243
const operationTrigger = () => this.page.getByRole('button', { name: 'Try again' }).click();
3344
if (complete) {

‎packages/tests-e2e/src/complete/models/corbado-auth-blocks/SignupInitBlockModel.ts‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type { Page } from '@playwright/test';
22
import { expect } from '@playwright/test';
33

44
import type { SocialProviderType } from '../../utils/constants';
5+
import { repeatSocialLogin, socialLogin } from '../../utils/externalauth';
56
import { getRandomIntegerN } from '../../utils/random';
6-
import { repeatSocialLogin, socialLogin } from './socialLogin';
77

88
export class SignupInitBlockModel {
99
page: Page;
@@ -53,14 +53,22 @@ export class SignupInitBlockModel {
5353
return this.page.getByRole('button', { name: 'Continue', exact: true }).click();
5454
}
5555

56-
async submitSocialMicrosoft(email: string, password: string) {
57-
await socialLogin(this.page, email, password);
56+
async submitSocialGoogle(email: string, password: string, secret: string) {
57+
await socialLogin(this.page, email, password, secret);
5858
}
5959

60-
async resubmitSocialMicrosoft() {
60+
async resubmitSocialGoogle() {
6161
await repeatSocialLogin(this.page);
6262
}
6363

64+
// async submitSocialMicrosoft(email: string, password: string) {
65+
// await socialLoginDeprecated(this.page, email, password);
66+
// }
67+
//
68+
// async resubmitSocialMicrosoft() {
69+
// await repeatSocialLogin(this.page);
70+
// }
71+
6472
expectErrorMissingUsername(): Promise<void> {
6573
return this.#expectError('Please enter a username.');
6674
}

‎packages/tests-e2e/src/complete/models/corbado-auth-blocks/socialLogin.ts‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)