Merge pull request #16166 from nextcloud/apppassword-onetime

Apppassword onetime

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -53,6 +53,7 @@
 import com.google.gson.reflect.TypeToken;
 import com.nextcloud.android.common.ui.color.ColorUtil;
 import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+import com.nextcloud.android.lib.resources.users.GenerateOneTimeAppPasswordRemoteOperation;
 import com.nextcloud.client.account.User;
 import com.nextcloud.client.account.UserAccountManager;
 import com.nextcloud.client.device.DeviceInfo;
@@ -61,6 +62,7 @@
 import com.nextcloud.client.onboarding.FirstRunActivity;
 import com.nextcloud.client.onboarding.OnboardingService;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.common.PlainClient;
 import com.nextcloud.operations.PostMethod;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
@@ -137,6 +139,7 @@
 import androidx.lifecycle.LifecycleEventObserver;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import okhttp3.Credentials;
 import okhttp3.FormBody;
 import okhttp3.RequestBody;
 
@@ -1594,11 +1597,43 @@ private void startQRScanner() {
                     accountManager.getAccounts().length == 1) {
                     DisplayUtils.showSnackMessage(this, R.string.no_mutliple_accounts_allowed);
                 } else {
-                    parseAndLoginFromWebView(resultData);
+                    String onetimePrefix = getString(R.string.login_data_own_scheme) + PROTOCOL_SUFFIX + "onetime-login/";
+                    
+                    if (resultData.startsWith(onetimePrefix)) {
+                        parseAndLoginFromOneTimeCode(onetimePrefix, resultData);
+                    } else {
+                        parseAndLoginFromWebView(resultData);
+                    }
                 }
             }
         });
 
+    private void parseAndLoginFromOneTimeCode(String onetimePrefix, String resultData) {
+        LoginUrlInfo loginUrlInfo = parseLoginDataUrl(onetimePrefix, resultData);
+
+        GenerateOneTimeAppPasswordRemoteOperation generateOneTimeAppPasswordRemoteOperation = new GenerateOneTimeAppPasswordRemoteOperation();
+
+        String credentials = Credentials.basic(loginUrlInfo.getLoginName(), loginUrlInfo.getAppPassword());
+        NextcloudClient nextcloudClient = new NextcloudClient(Uri.parse(loginUrlInfo.getServer()), loginUrlInfo.getLoginName(), credentials, this);
+
+        new Thread(() -> {
+            RemoteOperationResult<String> otpResult = nextcloudClient.execute(generateOneTimeAppPasswordRemoteOperation);
+
+            if (otpResult.isSuccess()) {
+                mServerInfo.mBaseUrl = AuthenticatorUrlUtils.INSTANCE.normalizeUrlSuffix(loginUrlInfo.getServer());
+                webViewUser = loginUrlInfo.getLoginName();
+                webViewPassword = otpResult.getResultData();
+
+                runOnUiThread(this::checkOcServer);
+            } else {
+                mServerStatusIcon = R.drawable.ic_alert;
+                mServerStatusText = getString(R.string.qr_could_not_be_read);
+
+                runOnUiThread(this::showServerStatus);
+            }
+        }).start();
+    }
+    
     @Override
     public void onRequestPermissionsResult(int requestCode,
                                            @NonNull String[] permissions,

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "0.31.0"
 androidGifDrawableVersion = "1.2.30"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion = "f4feed395eb081face0490447c07ce4ecd293baa"
+androidLibraryVersion = "c112fd86c76f429db250e6abca711348e5534c0a"
 androidPluginVersion = '8.13.2'
 androidsvgVersion = "1.4"
 androidxMediaVersion = "1.5.1"

gradle/verification-metadata.xml

@@ -20243,6 +20243,14 @@
             <sha256 value="bb68aa824d8769dbe93875da75891dc3794519fdd13c60a7c2bd45c1353634d8" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="c112fd86c76f429db250e6abca711348e5534c0a">
+         <artifact name="android-library-c112fd86c76f429db250e6abca711348e5534c0a.aar">
+            <sha256 value="734d60cbf9bf18f58e83bd93524e1e02c0b2ffe5d9f57c906393df7362227dbd" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-c112fd86c76f429db250e6abca711348e5534c0a.module">
+            <sha256 value="06fb9545246ae9964d83c8bc60d40fb96dc86904a88bd101896c0acc30d3d524" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="c219388da22028f36219acff61ae2d722a63f408">
          <artifact name="android-library-c219388da22028f36219acff61ae2d722a63f408.aar">
             <sha256 value="c253a126ca3c32dd5b373ab1c64668e4603305b3113b052fc0fc5e3c833a913c" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20328,6 +20336,14 @@
             <sha256 value="54aed157e9fbecdd01361b651f4f25163ffe6589d50c9506110f450e6faa9b01" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="d5cb052be9ebf363547f2cda87d81d238fe6bf3b">
+         <artifact name="android-library-d5cb052be9ebf363547f2cda87d81d238fe6bf3b.aar">
+            <sha256 value="0ee052ef0082aaa1ed6ed26103e083bb6cbb71f9df36d56d704a9a27f4c5b0a8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-d5cb052be9ebf363547f2cda87d81d238fe6bf3b.module">
+            <sha256 value="da9717be92162247352c5ba92a04e6dd5c86f97b8e0ab828b72814f3d2eb82d8" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="d5f21fa1ec5b67c564983b0c8a07bc3acd96f695">
          <artifact name="android-library-d5f21fa1ec5b67c564983b0c8a07bc3acd96f695.aar">
             <sha256 value="95c86f501a4c1a2e055ba2d1fe68f5ffeed3613492bdaf0594abbae4b21b9227" origin="Generated by Gradle" reason="Artifact is not signed"/>