
* Add log in with Google * Fix merge conflicts * Merge branch 'main' into feature/copy-add-identity-provider # Conflicts: # pages/api/auth/[...nextauth].tsx # pages/api/auth/forgot-password.ts # pages/settings/security.tsx # prisma/schema.prisma # public/static/locales/en/common.json * WIP: SAML login * fixed login * fixed verified_email check for Google * tweaks to padding * added BoxyHQ SAML service to local docker-compose * identityProvider is missing from the select clause * user may be undefined * fix for yarn build * Added SAML configuration to Settings -> Security page * UI tweaks * get saml login flag from the server * UI tweaks * moved SAMLConfiguration to a component in ee * updated saml migration date * fixed merge conflict * fixed merge conflict * lint fixes * check-types fixes * check-types fixes * fixed type errors * updated docker image for SAML Jackson * added api keys config * added default values for SAML_TENANT_ID and SAML_PRODUCT_ID * - move all env vars related to saml into a separate file for easy access - added SAML_ADMINS comma separated list of emails that will be able to configure the SAML metadata * cleanup after merging main * revert mistake during merge * revert mistake during merge * set info text to indicate SAML has been configured. * tweaks to text * tweaks to text * i18n text * i18n text * tweak * use a separate db for saml to avoid Prisma schema being out of sync * use separate docker-compose file for saml * padding tweak * Prepare for implementing SAML login for the hosted solution * WIP: Support for SAML in the hosted solution * teams view has changed, adjusting saml changes accordingly * enabled SAML only for PRO plan * if user was invited and signs in via saml/google then update the user record * WIP: embed saml lib * 302 instead of 307 * no separate docker-compose file for saml * - ogs cleanup - type fixes * fixed types for jackson * cleaned up cors, not needed by the oauth flow * updated jackson to support encryption at rest * updated saml-jackson lib * allow only the required http methods * fixed issue with latest merge with main * - Added instructions for deploying SAML support - Tweaked SAML audience identifier * fixed check for hosted Cal instance * Added a new route to initiate Google and SAML login flows * updated saml-jackson lib (node engine version is now 14.x or above) * moved SAML instructions from Google Docs to a docs file * moved randomString to lib * comment SAML_DATABASE_URL and SAML_ADMINS in .env.example so that default is SAML off. * fixed path to randomString * updated @boxyhq/saml-jackson to v0.3.0 * fixed TS errors * tweaked SAML config UI * fixed types * added e2e test for Google login * setup secrets for Google login test * test for OAuth login buttons (Google and SAML) * enabled saml for the test * added test for SAML config UI * fixed nextauth import * use pkce flow * tweaked NextAuth config for saml * updated saml-jackson * added ability to delete SAML configuration * SAML variables explainers and refactoring * Prevents constant collision * Var name changes * Env explainers * better validation for email Co-authored-by: Omar López <zomars@me.com> * enabled GOOGLE_API_CREDENTIALS in e2e tests (Github Actions secret) * cleanup (will create an issue to handle forgot password for Google and SAML identities) Co-authored-by: Chris <76668588+bytesbuffer@users.noreply.github.com> Co-authored-by: Omar López <zomars@me.com>
111 lines
3.5 KiB
YAML
111 lines
3.5 KiB
YAML
name: E2E test
|
|
on:
|
|
pull_request_target:
|
|
branches:
|
|
- main
|
|
jobs:
|
|
approve:
|
|
runs-on: ubuntu-latest
|
|
|
|
steps:
|
|
- name: Approve
|
|
run: echo For security reasons, all pull requests need to be approved first before running any automated CI.
|
|
|
|
test:
|
|
timeout-minutes: 10
|
|
name: ${{ matrix.node }} and ${{ matrix.os }}
|
|
needs: [approve] # Require the first step to finish
|
|
environment:
|
|
name: Preview
|
|
env:
|
|
DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
|
|
BASE_URL: http://localhost:3000
|
|
JWT_SECRET: secret
|
|
PLAYWRIGHT_SECRET: ${{ secrets.CI_PLAYWRIGHT_SECRET }}
|
|
GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
|
|
# CRON_API_KEY: xxx
|
|
CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
|
|
NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
|
|
STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
|
|
STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
|
|
STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
|
|
PAYMENT_FEE_PERCENTAGE: 0.005
|
|
PAYMENT_FEE_FIXED: 10
|
|
SAML_DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
|
|
SAML_ADMINS: pro@example.com
|
|
# NEXTAUTH_URL: xxx
|
|
# EMAIL_FROM: xxx
|
|
# EMAIL_SERVER_HOST: xxx
|
|
# EMAIL_SERVER_PORT: xxx
|
|
# EMAIL_SERVER_USER: xxx
|
|
# MS_GRAPH_CLIENT_ID: xxx
|
|
# MS_GRAPH_CLIENT_SECRET: xxx
|
|
# ZOOM_CLIENT_ID: xxx
|
|
# ZOOM_CLIENT_SECRET: xxx
|
|
services:
|
|
postgres:
|
|
image: postgres:12.1
|
|
env:
|
|
POSTGRES_USER: postgres
|
|
POSTGRES_DB: calendso
|
|
ports:
|
|
- 5432:5432
|
|
runs-on: ${{ matrix.os }}
|
|
strategy:
|
|
matrix:
|
|
node: ["14.x"]
|
|
os: [ubuntu-latest]
|
|
|
|
steps:
|
|
- name: Checkout repo
|
|
uses: actions/checkout@v2
|
|
with:
|
|
ref: ${{ github.event.pull_request.head.sha }}
|
|
fetch-depth: 2
|
|
|
|
- name: Use Node ${{ matrix.node }}
|
|
uses: actions/setup-node@v1
|
|
with:
|
|
node-version: ${{ matrix.node }}
|
|
|
|
- name: Install deps
|
|
uses: bahmutov/npm-install@v1
|
|
- name: Next.js cache
|
|
uses: actions/cache@v2
|
|
with:
|
|
path: ${{ github.workspace }}/.next/cache
|
|
# Generate a new cache whenever packages or source files change.
|
|
key: ${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**.[jt]s', '**.[jt]sx') }}
|
|
# If source files changed but packages didn't, rebuild from a prior cache.
|
|
restore-keys: |
|
|
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json') }}-
|
|
|
|
- run: yarn prisma migrate deploy
|
|
- run: yarn db-seed
|
|
- run: yarn test
|
|
- run: yarn build
|
|
|
|
- name: Cache playwright binaries
|
|
uses: actions/cache@v2
|
|
id: playwright-cache
|
|
with:
|
|
path: |
|
|
~/Library/Caches/ms-playwright
|
|
~/.cache/ms-playwright
|
|
**/node_modules/playwright
|
|
key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
|
|
- name: Install playwright deps
|
|
if: steps.playwright-cache.outputs.cache-hit != 'true'
|
|
run: yarn playwright install --with-deps
|
|
|
|
- run: yarn test-playwright
|
|
|
|
- name: Upload videos
|
|
if: ${{ always() }}
|
|
uses: actions/upload-artifact@v2
|
|
with:
|
|
name: videos
|
|
path: |
|
|
playwright/screenshots
|
|
playwright/videos
|
|
playwright/results
|