@umbraco/playwright-testhelpers 17.0.8 → 17.0.10

package/dist/lib/helpers/LoginApiHelper.d.ts

@@ -6,16 +6,12 @@ export declare class LoginApiHelper {
     constructor(api: ApiHelpers, page: Page);
     login(userEmail: string, password: string): Promise<{
         cookie: string;
-        accessToken: "" | {
-            value: string;
-        } | undefined;
-        refreshToken: "" | {
-            value: string;
-        } | undefined;
+        setCookies: string;
     }>;
+    extractPKCECodeFromSetCookie(setCookies: string): Promise<string>;
     getCookie(userEmail: string, password: string): Promise<string>;
     createCodeChallenge(codeVerifier: string): Promise<string>;
-    getAuthorizationCode(codeChallenge: string, cookie: string, stateValue: string): Promise<string | null>;
-    getCookiesWithAccessTokenAndRefreshToken(cookie: string, codeVerifier: string, authorizationCode: any): Promise<string>;
+    getAuthorizationSetCookie(codeChallenge: string, cookie: string, stateValue: string): Promise<string>;
+    getCookiesWithAccessTokenAndRefreshToken(cookie: string, codeVerifier: string, PKCECookie: string): Promise<string>;
     getAccessToken(cookie: string, refreshToken: string): Promise<any>;
 }

package/dist/lib/helpers/LoginApiHelper.js

@@ -14,12 +14,14 @@ class LoginApiHelper {
         const stateValue = 'myStateValue'; // A static state value for testing
         const cookie = await this.getCookie(userEmail, password);
         const codeChallenge = await this.createCodeChallenge(codeVerifier);
-        const authorizationCode = await this.getAuthorizationCode(codeChallenge, cookie, stateValue);
-        const setCookies = await this.getCookiesWithAccessTokenAndRefreshToken(cookie, codeVerifier, authorizationCode);
-        let tokens = await this.api.updateLocalStorageTokens(setCookies);
-        const accessToken = tokens.accessToken;
-        const refreshToken = tokens.refreshToken;
-        return { cookie, accessToken, refreshToken };
+        const authorizationSetCookie = await this.getAuthorizationSetCookie(codeChallenge, cookie, stateValue);
+        const PKCECookie = await this.extractPKCECodeFromSetCookie(authorizationSetCookie);
+        const setCookies = await this.getCookiesWithAccessTokenAndRefreshToken(cookie, codeVerifier, PKCECookie);
+        return { cookie, setCookies };
+    }
+    async extractPKCECodeFromSetCookie(setCookies) {
+        const match = setCookies.match(/.*(__Host-umbPkceCode=[A-Za-z0-9_-]+;)/s);
+        return match?.[1] ?? "";
     }
     async getCookie(userEmail, password) {
         const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/login', {
@@ -40,7 +42,7 @@ class LoginApiHelper {
     async createCodeChallenge(codeVerifier) {
         return (0, crypto_1.createHash)('sha256').update(codeVerifier, 'utf8').digest('base64').replace(/=/g, '').trim();
     }
-    async getAuthorizationCode(codeChallenge, cookie, stateValue) {
+    async getAuthorizationSetCookie(codeChallenge, cookie, stateValue) {
         const authorizationUrl = `${this.api.baseUrl}/umbraco/management/api/v1/security/back-office/authorize?client_id=umbraco-back-office&response_type=code&redirect_uri=${encodeURIComponent(this.api.baseUrl + '/umbraco/oauth_complete')}&code_challenge_method=S256&code_challenge=${codeChallenge}&state=${stateValue}&scope=offline_access&prompt=consent&access_type=offline`;
         const response = await this.page.request.get(authorizationUrl, {
             headers: {
@@ -50,26 +52,23 @@ class LoginApiHelper {
             ignoreHTTPSErrors: true,
             maxRedirects: 0
         });
-        // Parse the authorization code from the redirect URL
-        const locationHeader = response.headers()['location'];
-        if (!locationHeader) {
-            throw new Error('Authorization redirect location not found');
+        if (response.status() !== 200) {
+            console.error('Failed to retrieve cookie');
         }
-        // Extract the authorization code from the location header
-        return new URLSearchParams(locationHeader.split('?')[1]).get('code');
+        return response.headers()['set-cookie'];
     }
-    async getCookiesWithAccessTokenAndRefreshToken(cookie, codeVerifier, authorizationCode) {
+    async getCookiesWithAccessTokenAndRefreshToken(cookie, codeVerifier, PKCECookie) {
         const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/token', {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded',
-                Cookie: cookie,
+                Cookie: PKCECookie + cookie,
                 Origin: this.api.baseUrl
             },
             form: {
                 grant_type: 'authorization_code',
                 client_id: 'umbraco-back-office',
                 redirect_uri: this.api.baseUrl + '/umbraco/oauth_complete',
-                code: authorizationCode,
+                code: '[redacted]',
                 code_verifier: codeVerifier
             },
             ignoreHTTPSErrors: true

package/dist/lib/helpers/LoginApiHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoginApiHelper.js","sourceRoot":"","sources":["../../../lib/helpers/LoginApiHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import {ApiHelpers} from \"./ApiHelpers\";\nimport {Page} from \"@playwright/test\";\nimport {createHash} from \"crypto\";\n\nexport class LoginApiHelper {\n  api: ApiHelpers;\n  page: Page;\n\n  constructor(api: ApiHelpers, page: Page) {\n    this.api = api;\n    this.page = page;\n  }\n\n  public async login(userEmail: string, password: string) {\n    const codeVerifier = \"12345\"; // A static state value for testing\n    const stateValue = 'myStateValue'; // A static state value for testing\n    const cookie = await this.getCookie(userEmail, password);\n    const codeChallenge = await this.createCodeChallenge(codeVerifier);\n    const authorizationCode = await this.getAuthorizationCode(codeChallenge, cookie, stateValue);\n    const setCookies = await this.getCookiesWithAccessTokenAndRefreshToken(cookie, codeVerifier, authorizationCode);\n    let tokens = await this.api.updateLocalStorageTokens(setCookies);\n    const accessToken = tokens.accessToken;\n    const refreshToken = tokens.refreshToken;\n    return {cookie, accessToken, refreshToken};\n  }\n\n  async getCookie(userEmail: string, password: string) {\n    const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/login', {\n      headers: {\n        'Content-Type': 'application/json',\n        Referer: this.api.baseUrl,\n        Origin: this.api.baseUrl,\n      },\n      data: {\n        username: userEmail,\n        password: password\n      },\n      ignoreHTTPSErrors: true\n    });\n\n    // Ensure the cookie is properly captured\n    return response.headers()['set-cookie'];\n  }\n\n  async createCodeChallenge(codeVerifier: string) {\n    return createHash('sha256').update(codeVerifier, 'utf8').digest('base64').replace(/=/g, '').trim();\n  }\n\n  async getAuthorizationCode(codeChallenge: string, cookie: string, stateValue: string) {\n    const authorizationUrl = `${this.api.baseUrl}/umbraco/management/api/v1/security/back-office/authorize?client_id=umbraco-back-office&response_type=code&redirect_uri=${encodeURIComponent(this.api.baseUrl + '/umbraco/oauth_complete')}&code_challenge_method=S256&code_challenge=${codeChallenge}&state=${stateValue}&scope=offline_access&prompt=consent&access_type=offline`;\n    const response = await this.page.request.get(authorizationUrl, {\n      headers: {\n        Cookie: cookie,\n        Referer: this.api.baseUrl,\n      },\n      ignoreHTTPSErrors: true,\n      maxRedirects: 0\n    });\n\n    // Parse the authorization code from the redirect URL\n    const locationHeader = response.headers()['location'];\n    if (!locationHeader) {\n      throw new Error('Authorization redirect location not found');\n    }\n    // Extract the authorization code from the location header\n    return new URLSearchParams(locationHeader.split('?')[1]).get('code');\n  }\n\n  async getCookiesWithAccessTokenAndRefreshToken(cookie: string, codeVerifier: string, authorizationCode) {\n    const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/token', {\n      headers: {\n        'Content-Type': 'application/x-www-form-urlencoded',\n        Cookie: cookie,\n        Origin: this.api.baseUrl\n      },\n      form: {\n        grant_type: 'authorization_code',\n        client_id: 'umbraco-back-office',\n        redirect_uri: this.api.baseUrl + '/umbraco/oauth_complete',\n        code: authorizationCode,\n        code_verifier: codeVerifier\n      },\n      ignoreHTTPSErrors: true\n    });\n\n    if (response.status() !== 200) {\n      console.error('Failed to retrieve cookie');\n    }\n    return response.headers()['set-cookie'];\n  }\n\n  async getAccessToken(cookie: string, refreshToken: string) {\n    const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/token', {\n      headers: {\n        'Content-Type': 'application/x-www-form-urlencoded',\n        Cookie: cookie,\n        Origin: this.api.baseUrl\n      },\n      form: {\n        grant_type: 'refresh_token',\n        client_id: 'umbraco-back-office',\n        redirect_uri: this.api.baseUrl + '/umbraco/oauth_complete',\n        refresh_token: refreshToken,\n      },\n      ignoreHTTPSErrors: true\n    });\n\n    if (response.status() === 200) {\n      console.log('Login successful');\n    } else {\n      console.error('Login failed');\n    }\n    return await response.json();\n  }\n}\n"]}
+{"version":3,"file":"LoginApiHelper.js","sourceRoot":"","sources":["../../../lib/helpers/LoginApiHelper.ts"],"names":[],"mappings":"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","sourcesContent":["import {ApiHelpers} from \"./ApiHelpers\";\nimport {Page} from \"@playwright/test\";\nimport {createHash} from \"crypto\";\n\nexport class LoginApiHelper {\n  api: ApiHelpers;\n  page: Page;\n\n  constructor(api: ApiHelpers, page: Page) {\n    this.api = api;\n    this.page = page;\n  }\n\n  public async login(userEmail: string, password: string) {\n    const codeVerifier = \"12345\"; // A static state value for testing\n    const stateValue = 'myStateValue'; // A static state value for testing\n    const cookie = await this.getCookie(userEmail, password);\n    const codeChallenge = await this.createCodeChallenge(codeVerifier);\n    const authorizationSetCookie = await this.getAuthorizationSetCookie(codeChallenge, cookie, stateValue);\n    const PKCECookie = await this.extractPKCECodeFromSetCookie(authorizationSetCookie);\n    const setCookies = await this.getCookiesWithAccessTokenAndRefreshToken(cookie, codeVerifier, PKCECookie);\n    return {cookie, setCookies};\n  }\n\n  async extractPKCECodeFromSetCookie(setCookies: string) {\n    const match = setCookies.match(/.*(__Host-umbPkceCode=[A-Za-z0-9_-]+;)/s);\n    return match?.[1] ?? \"\";\n  }\n\n  async getCookie(userEmail: string, password: string) {\n    const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/login', {\n      headers: {\n        'Content-Type': 'application/json',\n        Referer: this.api.baseUrl,\n        Origin: this.api.baseUrl,\n      },\n      data: {\n        username: userEmail,\n        password: password\n      },\n      ignoreHTTPSErrors: true\n    });\n\n    // Ensure the cookie is properly captured\n    return response.headers()['set-cookie'];\n  }\n\n  async createCodeChallenge(codeVerifier: string) {\n    return createHash('sha256').update(codeVerifier, 'utf8').digest('base64').replace(/=/g, '').trim();\n  }\n\n  async getAuthorizationSetCookie(codeChallenge: string, cookie: string, stateValue: string) {\n    const authorizationUrl = `${this.api.baseUrl}/umbraco/management/api/v1/security/back-office/authorize?client_id=umbraco-back-office&response_type=code&redirect_uri=${encodeURIComponent(this.api.baseUrl + '/umbraco/oauth_complete')}&code_challenge_method=S256&code_challenge=${codeChallenge}&state=${stateValue}&scope=offline_access&prompt=consent&access_type=offline`;\n    const response = await this.page.request.get(authorizationUrl, {\n      headers: {\n        Cookie: cookie,\n        Referer: this.api.baseUrl,\n      },\n      ignoreHTTPSErrors: true,\n      maxRedirects: 0\n    });\n\n    if (response.status() !== 200) {\n      console.error('Failed to retrieve cookie');\n    }\n    return response.headers()['set-cookie'];\n  }\n\n  async getCookiesWithAccessTokenAndRefreshToken(cookie: string, codeVerifier: string, PKCECookie: string) {\n    const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/token', {\n      headers: {\n        'Content-Type': 'application/x-www-form-urlencoded',\n        Cookie: PKCECookie + cookie,\n        Origin: this.api.baseUrl\n      },\n      form: {\n        grant_type: 'authorization_code',\n        client_id: 'umbraco-back-office',\n        redirect_uri: this.api.baseUrl + '/umbraco/oauth_complete',\n        code: '[redacted]',\n        code_verifier: codeVerifier\n      },\n      ignoreHTTPSErrors: true\n    });\n\n    if (response.status() !== 200) {\n      console.error('Failed to retrieve cookie');\n    }\n    return response.headers()['set-cookie'];\n  }\n\n  async getAccessToken(cookie: string, refreshToken: string) {\n    const response = await this.page.request.post(this.api.baseUrl + '/umbraco/management/api/v1/security/back-office/token', {\n      headers: {\n        'Content-Type': 'application/x-www-form-urlencoded',\n        Cookie: cookie,\n        Origin: this.api.baseUrl\n      },\n      form: {\n        grant_type: 'refresh_token',\n        client_id: 'umbraco-back-office',\n        redirect_uri: this.api.baseUrl + '/umbraco/oauth_complete',\n        refresh_token: refreshToken,\n      },\n      ignoreHTTPSErrors: true\n    });\n\n    if (response.status() === 200) {\n      console.log('Login successful');\n    } else {\n      console.error('Login failed');\n    }\n    return await response.json();\n  }\n}\n"]}

package/dist/lib/helpers/UiBaseLocators.d.ts

@@ -151,8 +151,12 @@ export declare class UiBaseLocators {
     readonly openedModal: Locator;
     readonly uiLoader: Locator;
     readonly createDocumentBlueprintModal: Locator;
+    readonly inputDropzone: Locator;
+    readonly imageCropperField: Locator;
+    readonly inputUploadField: Locator;
     readonly entityItem: Locator;
     readonly sectionLinks: Locator;
+    readonly backOfficeMain: Locator;
     constructor(page: Page);
     clickActionsMenuForNameInSectionSidebar(name: string): Promise<void>;
     clickActionsMenuForName(name: string): Promise<void>;
@@ -357,4 +361,8 @@ export declare class UiBaseLocators {
     enterMonacoEditorValue(value: string): Promise<void>;
     waitUntilUiLoaderIsNoLongerVisible(): Promise<void>;
     isWorkspaceViewTabWithAliasVisible(alias: string, isVisible?: boolean): Promise<void>;
+    isInputDropzoneVisible(isVisible?: boolean): Promise<void>;
+    isImageCropperFieldVisible(isVisible?: boolean): Promise<void>;
+    isInputUploadFieldVisible(isVisible?: boolean): Promise<void>;
+    isBackOfficeMainVisible(isVisible?: boolean): Promise<void>;
 }

package/dist/lib/helpers/UiBaseLocators.js

@@ -155,8 +155,12 @@ class UiBaseLocators {
     openedModal;
     uiLoader;
     createDocumentBlueprintModal;
+    inputDropzone;
+    imageCropperField;
+    inputUploadField;
     entityItem;
     sectionLinks;
+    backOfficeMain;
     constructor(page) {
         this.page = page;
         this.saveBtn = page.getByLabel('Save', { exact: true });
@@ -313,7 +317,11 @@ class UiBaseLocators {
         this.monacoEditor = page.locator('.monaco-editor');
         this.openedModal = page.locator('uui-modal-container[backdrop]');
         this.uiLoader = page.locator('uui-loader');
+        this.inputDropzone = page.locator('umb-input-dropzone');
+        this.imageCropperField = page.locator('umb-image-cropper-field');
+        this.inputUploadField = page.locator('umb-input-upload-field').locator('#wrapperInner');
         this.entityItem = page.locator('umb-entity-item-ref');
+        this.backOfficeMain = page.locator('umb-backoffice-main');
     }
     async clickActionsMenuForNameInSectionSidebar(name) {
         await this.sectionSidebar.locator('[label="' + name + '"]').hover();
@@ -727,7 +735,10 @@ class UiBaseLocators {
         await this.page.waitForTimeout(400);
         await this.unnamedTabTxt.clear();
         await this.unnamedTabTxt.fill(tabName);
-        await (0, test_1.expect)(this.page.getByTestId('tab:' + tabName)).toBeVisible();
+        // We use this to make sure the test id is updated
+        await this.page.getByRole('tab', { name: 'Design' }).click();
+        // We click again to make sure the tab is focused
+        await this.page.getByTestId('tab:' + tabName).click();
     }
     async searchForTypeToFilterValue(searchValue) {
         await (0, test_1.expect)(this.typeToFilterSearchTxt).toBeVisible();
@@ -1244,6 +1255,18 @@ class UiBaseLocators {
     async isWorkspaceViewTabWithAliasVisible(alias, isVisible = true) {
         await (0, test_1.expect)(this.page.getByTestId('workspace:view-link:' + alias)).toBeVisible({ visible: isVisible });
     }
+    async isInputDropzoneVisible(isVisible = true) {
+        await (0, test_1.expect)(this.inputDropzone).toBeVisible({ visible: isVisible });
+    }
+    async isImageCropperFieldVisible(isVisible = true) {
+        await (0, test_1.expect)(this.imageCropperField).toBeVisible({ visible: isVisible });
+    }
+    async isInputUploadFieldVisible(isVisible = true) {
+        await (0, test_1.expect)(this.inputUploadField).toBeVisible({ visible: isVisible });
+    }
+    async isBackOfficeMainVisible(isVisible = true) {
+        await (0, test_1.expect)(this.backOfficeMain).toBeVisible({ visible: isVisible });
+    }
 }
 exports.UiBaseLocators = UiBaseLocators;
 //# sourceMappingURL=UiBaseLocators.js.map