[Products] Add support for setting the product password when signing in using site credentials #12642

hichamboushaba · 2024-09-18T17:18:49Z

Depends on wordpress-mobile/WordPress-FluxC-Android#3096

Description

This PR adds support for setting the product visibility password using REST API, this support was added since WooCommerce 8.1.0.
With this, the logic is as follows:

If a site has WooCommerce 8.1.0 or later, we'll use the CORE REST API support directly (/wc/v3/products)
If a site has an older WooCommerce, and the user is connected using WordPress.com, we'll use the WPCom API.
If a site has an older WooCommerce, and the user is connected using Site Credentials, we'll hide the "Password Protected" option.

Steps to reproduce

Open a product in the app.
Open the product settings from the overflow menu.
Tap on Visibility.
Select Password protected option.
Type a password.
Save changes.

Testing information

TC 1: Site using the latest version of WooCommerce and signed in using Site Credentials -> you should be able to set the password from the app.
TC 2: Site using the latest version of WooCommerce and signed in using WordPress.com -> you should be able to set the password from the app.
TC 3: Site using WooCommerce 8.0.0 and signed in using WordPress.com -> you should be able to set the password from the app.
TC 4: Site using WooCommerce 8.0.0 and signed in using Site Credentials -> the option should be hidden.

The tests that have been performed

The above test cases.

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

Reviewer (or Author, in the case of optional code reviews):

Please make sure these conditions are met before approving the PR, or request changes if the PR needs improvement:

The PR is small and has a clear, single focus, or a valid explanation is provided in the description. If needed, please request to split it into smaller PRs.
Ensure Adequate Unit Test Coverage: The changes are reasonably covered by unit tests or an explanation is provided in the PR description.
Manual Testing: The author listed all the tests they ran, including smoke tests when needed (e.g., for refactorings). The reviewer confirmed that the PR works as expected on big (tablet) and small (phone) in case of UI changes, and no regressions are added.

wpmobilebot · 2024-09-18T17:27:13Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`526a54d`
	Direct Download	`woocommerce-wear-prototype-build-pr12642-526a54d.apk`

wpmobilebot · 2024-09-18T17:39:21Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`526a54d`
	Direct Download	`woocommerce-prototype-build-pr12642-526a54d.apk`

hichamboushaba · 2024-09-19T15:13:35Z

...mmerce/src/main/kotlin/com/woocommerce/android/ui/products/details/ProductDetailViewModel.kt

-        val storedPassword: String? = null,
-        val draftPassword: String? = null,


Instead of saving the passwords on separate fields, we keep a single source of truth for all cases regardless of the API to be used: the stored password will be part of the storedProduct property, and the draft one will be part of the draftProduct property.

wpmobilebot · 2024-09-20T19:57:56Z

Version 20.5 has now entered code-freeze, so the milestone of this PR has been updated to 20.6.

JorgeMucientes

Great job @hichamboushaba everything works as described and code looks good ✅

# Conflicts: # build.gradle

wpmobilebot · 2024-09-24T12:29:26Z

Found 1 violations:

The PR caused the following dependency changes:

expand

-+--- org.wordpress:fluxc:2.97.0
-|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
-|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
-|    |    +--- com.google.crypto.tink:tink-android:1.5.0
-|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
-|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0 (*)
-|    +--- androidx.room:room-runtime:2.6.1 (*)
-|    +--- androidx.room:room-ktx:2.6.1
-|    |    +--- androidx.room:room-common:2.6.1 (*)
-|    |    +--- androidx.room:room-runtime:2.6.1 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
-|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
-|    |    +--- androidx.room:room-common:2.6.1 (c)
-|    |    \--- androidx.room:room-runtime:2.6.1 (c)
-|    +--- com.google.dagger:dagger:2.51.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:2.97.0
-|    +--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
++--- org.wordpress:fluxc:trunk-fe905a6c501a32182e3d1f22eefca6ab39fb99d8
+|    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:1.9.25
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.9.25
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6
+|    |    \--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    +--- androidx.security:security-crypto:1.0.0 -> 1.1.0-alpha03
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.8.0 (*)
+|    |    +--- com.google.crypto.tink:tink-android:1.5.0
+|    |    \--- androidx.collection:collection:1.1.0 -> 1.4.0 (*)
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0
+|    |    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10 -> 1.9.10 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0 (*)
+|    +--- androidx.room:room-runtime:2.6.1 (*)
+|    +--- androidx.room:room-ktx:2.6.1
+|    |    +--- androidx.room:room-common:2.6.1 (*)
+|    |    +--- androidx.room:room-runtime:2.6.1 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.8.22 -> 1.9.25 (*)
+|    |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 -> 1.8.1 (*)
+|    |    +--- androidx.room:room-common:2.6.1 (c)
+|    |    \--- androidx.room:room-runtime:2.6.1 (c)
+|    +--- com.google.dagger:dagger:2.51.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.8.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-fe905a6c501a32182e3d1f22eefca6ab39fb99d8
+|    +--- org.greenrobot:eventbus:3.3.1 (*)
+|    +--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.12.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.0
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.8.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.7.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.7.0 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.2 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
-\--- org.wordpress.fluxc.plugins:woocommerce:2.97.0
-     +--- org.wordpress:fluxc:2.97.0 (*)
-     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-     +--- com.google.dagger:dagger:2.51.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
-     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
-     +--- androidx.room:room-runtime:2.6.1 (*)
-     +--- org.wordpress:wellsql:2.0.0 (*)
-     +--- org.wordpress.fluxc:fluxc-annotations:2.97.0
-     +--- androidx.room:room-ktx:2.6.1 (*)
-     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)
+\--- org.wordpress.fluxc.plugins:woocommerce:trunk-fe905a6c501a32182e3d1f22eefca6ab39fb99d8
+     +--- org.wordpress:fluxc:trunk-fe905a6c501a32182e3d1f22eefca6ab39fb99d8 (*)
+     +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+     +--- com.google.dagger:dagger:2.51.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1 (*)
+     +--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1 (*)
+     +--- androidx.room:room-runtime:2.6.1 (*)
+     +--- org.wordpress:wellsql:2.0.0 (*)
+     +--- org.wordpress.fluxc:fluxc-annotations:trunk-fe905a6c501a32182e3d1f22eefca6ab39fb99d8
+     +--- androidx.room:room-ktx:2.6.1 (*)
+     \--- org.jetbrains.kotlin:kotlin-stdlib:1.9.25 (*)

Please review and act accordingly

hichamboushaba added 8 commits September 18, 2024 15:30

Bump fluxc

47958ee

Simplify expression

40da28e

Add password to the presentation model

3a790df

Add a helper class to determine the API to use to use

107741c

Update the logic of showing the product password option

3885f6f

Check for password value when checking for equality

4a66ddc

Handle saving product password with both APIs

6d5d3b0

Update view state logic to have a single truth for the password draft

52bc7de

hichamboushaba added type: enhancement A request for an enhancement. feature: product details Related to adding or editing products, includes product settings. labels Sep 18, 2024

Add and fix unit tests

753bd48

hichamboushaba added the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Sep 19, 2024

hichamboushaba mentioned this pull request Sep 19, 2024

Product Password using site credentials wordpress-mobile/WordPress-FluxC-Android#3096

Merged

hichamboushaba marked this pull request as ready for review September 19, 2024 13:52

hichamboushaba requested review from irfano and JorgeMucientes September 19, 2024 13:53

hichamboushaba added 2 commits September 19, 2024 14:55

Add a release notes entry

c7cac7b

treat storedProduct as single source of truth for password

06f6e0c

hichamboushaba force-pushed the issue/12638-product-password-rest branch from 4a719fa to 06f6e0c Compare September 19, 2024 15:06

hichamboushaba commented Sep 19, 2024

View reviewed changes

hichamboushaba added this to the 20.5 milestone Sep 19, 2024

wpmobilebot modified the milestones: 20.5, 20.6 Sep 20, 2024

JorgeMucientes self-assigned this Sep 24, 2024

JorgeMucientes approved these changes Sep 24, 2024

View reviewed changes

hichamboushaba added 2 commits September 24, 2024 12:50

Bump fluxc

42c785c

Merge branch 'trunk' into issue/12638-product-password-rest

c7d4c7a

# Conflicts: # build.gradle

Move release note to the correct version

8ba734c

hichamboushaba removed the status: do not merge Dependent on another PR, ready for review but not ready for merge. label Sep 24, 2024

hichamboushaba enabled auto-merge September 24, 2024 11:53

Fix unit tests

526a54d

hichamboushaba merged commit 3d6cab5 into trunk Sep 24, 2024
15 checks passed

hichamboushaba deleted the issue/12638-product-password-rest branch September 24, 2024 14:16

hichamboushaba mentioned this pull request Oct 17, 2024

[Application Passwords] Add ability to manage product passwords #9801

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Products] Add support for setting the product password when signing in using site credentials #12642

[Products] Add support for setting the product password when signing in using site credentials #12642

hichamboushaba commented Sep 18, 2024 •

edited by JorgeMucientes

Loading

wpmobilebot commented Sep 18, 2024 •

edited

Loading

wpmobilebot commented Sep 18, 2024 •

edited

Loading

hichamboushaba Sep 19, 2024

wpmobilebot commented Sep 20, 2024

JorgeMucientes left a comment

wpmobilebot commented Sep 24, 2024

		val storedPassword: String? = null,
		val draftPassword: String? = null,

[Products] Add support for setting the product password when signing in using site credentials #12642

[Products] Add support for setting the product password when signing in using site credentials #12642

Conversation

hichamboushaba commented Sep 18, 2024 • edited by JorgeMucientes Loading

Description

Steps to reproduce

Testing information

The tests that have been performed

Reviewer (or Author, in the case of optional code reviews):

wpmobilebot commented Sep 18, 2024 • edited Loading

wpmobilebot commented Sep 18, 2024 • edited Loading

hichamboushaba Sep 19, 2024

Choose a reason for hiding this comment

wpmobilebot commented Sep 20, 2024

JorgeMucientes left a comment

Choose a reason for hiding this comment

wpmobilebot commented Sep 24, 2024

The PR caused the following dependency changes:

hichamboushaba commented Sep 18, 2024 •

edited by JorgeMucientes

Loading

wpmobilebot commented Sep 18, 2024 •

edited

Loading

wpmobilebot commented Sep 18, 2024 •

edited

Loading