Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into security/archive-unarchive
- Loading branch information
Showing
74 changed files
with
2,394 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 1.17.1 | ||
| 1.17.2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
185 changes: 185 additions & 0 deletions
185
cypress/integration/dashboard/single-workspace/manageUsers.spec.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| import {commonSelectors} from "Selectors/common"; | ||
| import { fake } from "Fixtures/fake"; | ||
| import { usersSelector } from "Selectors/manageUsers"; | ||
| import { usersText } from "Texts/manageUsers"; | ||
| import * as users from "Support/utils/manageUsers"; | ||
| import * as common from "Support/utils/common"; | ||
| import { path } from "Texts/common"; | ||
| import { commonText } from "Texts/common"; | ||
|
|
||
| const firstName = fake.firstName; | ||
| const lastName = fake.lastName.replaceAll("[^A-Za-z]", ""); | ||
| const email = (`${firstName}@example.com`).toLowerCase(); | ||
|
|
||
| describe("Manage Users for single workspace", ()=>{ | ||
| before(()=>{ | ||
| cy.appUILogin(); | ||
| }); | ||
| it("Should verify the Manage users page", ()=>{ | ||
| common.navigateToManageUsers(); | ||
| users.manageUsersElements(); | ||
|
|
||
| cy.get(usersSelector.cancelButton).click(); | ||
| cy.get(usersSelector.usersElements.nameTitile).should("be.visible"); | ||
| cy.get(usersSelector.inviteUserButton).click(); | ||
|
|
||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.fisrtNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
| cy.get(usersSelector.lastNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
| cy.get(usersSelector.emailError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.clearAndType(usersSelector.firstNameInput, firstName); | ||
| cy.get(usersSelector.lastNameInput).clear(); | ||
| cy.get(usersSelector.emailInput).clear(); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.lastNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
| cy.get(usersSelector.emailError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.get(usersSelector.firstNameInput).clear(); | ||
| cy.get(usersSelector.emailInput).clear(); | ||
| cy.clearAndType(usersSelector.lastNameInput, lastName); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.fisrtNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
| cy.get(usersSelector.emailError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.get(usersSelector.firstNameInput).clear(); | ||
| cy.get(usersSelector.lastNameInput).clear(); | ||
| cy.clearAndType(usersSelector.emailInput, email); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.fisrtNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
| cy.get(usersSelector.lastNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.get(usersSelector.firstNameInput).clear(); | ||
| cy.clearAndType(usersSelector.lastNameInput, lastName); | ||
| cy.clearAndType(usersSelector.emailInput, email); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.fisrtNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.get(usersSelector.lastNameInput).clear(); | ||
| cy.clearAndType(usersSelector.firstNameInput, firstName); | ||
| cy.clearAndType(usersSelector.emailInput, email); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.lastNameError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.get(usersSelector.emailInput).clear(); | ||
| cy.clearAndType(usersSelector.firstNameInput, firstName); | ||
| cy.clearAndType(usersSelector.lastNameInput, lastName); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.get(usersSelector.emailError).should("be.visible").and("have.text", usersText.fieldRequired); | ||
|
|
||
| cy.clearAndType(usersSelector.firstNameInput, firstName); | ||
| cy.clearAndType(usersSelector.lastNameInput, lastName); | ||
| cy.clearAndType(usersSelector.emailInput, usersText.usersElements.userEmail); | ||
| cy.get(usersSelector.createUserButton).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.exsitingEmail); | ||
| }); | ||
|
|
||
| it("Should verify the confirm invite page", ()=>{ | ||
| users.inviteUser(firstName,lastName,email); | ||
|
|
||
| cy.get(usersSelector.confirmInvitePage).should("be.visible"); | ||
| cy.get(usersSelector.pageLogo).should("be.visible"); | ||
| for( const element in usersSelector.singleWorkspaceElements){ | ||
| cy.get(usersSelector.singleWorkspaceElements[element]).should("be.visible").and("have.text", usersText.singleWorkspaceElements[element]); | ||
| } | ||
| cy.get(usersSelector.finishSetup).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.passwordErrToast); | ||
| cy.get(usersSelector.passwordInput).should("have.value", ""); | ||
| cy.get(usersSelector.confirmPasswordInput).should("have.value", ""); | ||
|
|
||
| cy.clearAndType(usersSelector.passwordInput, usersText.password); | ||
| cy.wait(1000); | ||
| cy.get(usersSelector.finishSetup).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.passwordErrToast); | ||
| cy.get(usersSelector.passwordInput).should("have.value", usersText.password); | ||
| cy.get(usersSelector.confirmPasswordInput).should("have.value", ""); | ||
|
|
||
| cy.get(usersSelector.passwordInput).clear(); | ||
| cy.clearAndType(usersSelector.confirmPasswordInput, usersText.password); | ||
| cy.get(usersSelector.finishSetup).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.passwordErrToast); | ||
| cy.get(usersSelector.passwordInput).should("have.value", ""); | ||
| cy.get(usersSelector.confirmPasswordInput).should("have.value", usersText.password); | ||
|
|
||
| cy.clearAndType(usersSelector.passwordInput, usersText.password); | ||
| cy.clearAndType(usersSelector.confirmPasswordInput, usersText.mismatchPassword); | ||
| cy.get(usersSelector.finishSetup).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.passwordMismatchToast); | ||
| cy.get(usersSelector.passwordInput).should("have.value", usersText.password); | ||
| cy.get(usersSelector.confirmPasswordInput).should("have.value", usersText.mismatchPassword); | ||
|
|
||
| cy.clearAndType(usersSelector.passwordInput, usersText.password); | ||
| cy.clearAndType(usersSelector.confirmPasswordInput, usersText.password); | ||
| cy.get(usersSelector.finishSetup).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.swPasswordSuccessToast); | ||
| cy.url().should("include",path.loginPath); | ||
| }); | ||
|
|
||
| it("should verify the new user account", ()=>{ | ||
| cy.login(email,usersText.password); | ||
| cy.get(usersSelector.dropdownText).should('be.visible').and('have.text', "My workspace"); | ||
| common.logout(); | ||
|
|
||
| cy.appUILogin(); | ||
| common.navigateToManageUsers(); | ||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get('td small').should("have.text", usersText.activeStatus); | ||
| }); | ||
| }); | ||
|
|
||
| it("Should verify the archive functionality",()=>{ | ||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get('td button').click(); | ||
| }); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage,usersText.archivedToast); | ||
|
|
||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get(usersSelector.userStatus, { timeout: 9000 }).should("have.text", usersText.archivedStatus); | ||
| }); | ||
|
|
||
| common.logout(); | ||
| cy.clearAndType(commonSelectors.emailField, email); | ||
| cy.clearAndType(commonSelectors.passwordField, usersText.password); | ||
| cy.get(commonSelectors.signInButton).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, commonText.loginErrorToast); | ||
|
|
||
| cy.appUILogin(); | ||
| common.navigateToManageUsers(); | ||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get('td button').click(); | ||
| }); | ||
|
|
||
| cy.wait(2000); | ||
| cy.window().then(win => { | ||
| cy.stub(win, 'prompt').returns(win.prompt).as('copyToClipboardPrompt'); | ||
| }); | ||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get('td img').click(); | ||
| }); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.inviteCopiedToast); | ||
|
|
||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get(usersSelector.userStatus, { timeout: 9000 }).should("have.text", usersText.invitedStatus); | ||
| }); | ||
|
|
||
| cy.get('@copyToClipboardPrompt').then(prompt => { | ||
| common.logout(); | ||
| cy.visit(prompt.args[0][1]); | ||
| cy.url().should("include",path.confirmInvite); | ||
| }); | ||
|
|
||
| cy.get(usersSelector.confirmInvitePage).should("be.visible"); | ||
| cy.get(usersSelector.pageLogo).should("be.visible"); | ||
| cy.clearAndType(usersSelector.passwordInput, usersText.password); | ||
| cy.clearAndType(usersSelector.confirmPasswordInput, usersText.password); | ||
| cy.get(usersSelector.finishSetup).click(); | ||
| cy.verifyToastMessage(commonSelectors.toastMessage, usersText.swPasswordSuccessToast); | ||
| cy.url().should("include",path.loginPath); | ||
|
|
||
| cy.appUILogin(); | ||
| common.navigateToManageUsers(); | ||
| cy.contains('td', email).parent().within(() => { | ||
| cy.get('td small').should("have.text", usersText.activeStatus); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| --- | ||
| id: azuread | ||
| title: AzureAD | ||
| --- | ||
|
|
||
| # AzureAD Single Sign-on | ||
|
|
||
| :::info | ||
| To construct a Well Known URL refer this link :: https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-protocols-oidc | ||
| ::: | ||
|
|
||
| - Open your organisation page and select `app registration` | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Select `new registration` | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Open your organisation page and select app registration. | ||
|
|
||
| - Enter name, select supported account type and enter the redirect URL which can be copied from `Manage SSO -> Open Id -> Redirect URL, click on register`. | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Application will be registered and will be able to view the details | ||
|
|
||
| - Configure Application (Client) ID as `client id` in Open Id configuration page. | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Click on `Add certificate or secret` next to the **Client credentials**. | ||
|
|
||
| - Click on `+New Client Secret` | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Give a description, set the expiry, and then click on the `Add` button. | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Secret will be created, copy value and add it to the `client secret ` section of Open Id SSO config. | ||
|
|
||
| - You can brand the redirect page using the branding and properties option. | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| --- | ||
| id: okta | ||
| title: Okta | ||
| --- | ||
|
|
||
| # Okta Single Sign-on | ||
|
|
||
| - Sign in to [Okta developer console](https://developer.okta.com/) | ||
|
|
||
| - Go to the `Applications` section and click on the `Create App Integration` | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Select `Sign-in method` as `OIDC - OpenID Connect` and `Application type` as `Web Application`. Go to the next step | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Enter `App integration name` and then enter `Sign-in redirect URIs` as `<YOUR-DOMAIN>/sso/okta`. | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - Create application and configure `Client Credentials` in the UI. | ||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| - If you wish to show your application on Okta, edit the application and select `Login initiated by` section as `Either Okta or App`, set visibility according to your preference and `Login flow` should `Redirect to app to initiate login (OIDC Compliant)`. | ||
|
|
||
| <div style={{textAlign: 'center'}}> | ||
|
|
||
|  | ||
|
|
||
| </div> | ||
|
|
||
| :::info Change Grant type | ||
| To change the Login flow to `Redirect to app to initiate login (OIDC Compliant)`, its mandatory to change the `Grant type` - `Client acting on behalf of a user` section to `Implicit (hybrid)` and tick `Allow Access Token with implicit grant type`. | ||
| ::: | ||
|
|
||
| - The Okta sign-in button will now be available in your ToolJet login screen. | ||
|
|
||
| :::info | ||
| To find Well Known URL refer this Link: https://developer.okta.com/docs/concepts/auth-servers/#org-authorization-server | ||
| ::: |
Oops, something went wrong.