Merge pull request #28 from VKCOM/public

Release v2.0.0-alpha04

CHANGELOG.md

@@ -3,6 +3,14 @@
 > **Note**\
 > Описание основных изменений в релизах VK ID SDK. Наш SDK следует [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.0.0-alpha04
+
+### Added
+- Добавлена опция CONSENT в параметр авторизации Prompt. При передаче CONSENT всегда будет показываться экран подтверждения входа при авторизации без провайдера.
+
+### Fixed
+- Исправлен автоматический вход в аккаунт при нажатии на OneTap-кнопку без подтянутого пользователя. Теперь, если в кнопке нет пользователя, всегда показывается промежуточный экран, где можно подтвердить вход или сменить аккаунт.
+
 ## 1.3.3
 
 ### Fixed

build-logic/metrics/src/main/kotlin/com/vk/id/health/metrics/git/Git.kt

@@ -6,16 +6,21 @@ internal object Git {
     val currentCommitHash get() = exec("git rev-parse --verify HEAD")
 
     fun getRootCommitHash(sourceBranch: String, targetBranch: String): String {
-        return exec("git merge-base $sourceBranch $targetBranch")
+        runCatching { exec("git fetch origin $sourceBranch:$sourceBranch") }
+        runCatching { exec("git fetch origin $targetBranch:$targetBranch") }
+        val mergeBase = exec("git merge-base $sourceBranch $targetBranch")
+        return exec("git rev-list --no-merges -n 1 $mergeBase")
     }
 
     private fun exec(command: String): String {
         val process = Runtime.getRuntime().exec(command)
         val output = StringBuilder()
+        val error = StringBuilder()
         process.inputReader().lines().forEach(output::append)
+        process.errorReader().lines().forEach { error.append("$it\n") }
         val exitCode = process.waitFor()
         if (exitCode != 0) {
-            throw IOException("Command exited with $exitCode")
+            throw IOException("Command exited with $exitCode\n$error")
         }
         return output.toString()
     }

build.gradle.kts

@@ -32,10 +32,10 @@ private fun registerGeneralTask(name: String, configuration: Task.() -> Unit = {
     }
 }
 
-//healthMetrics {
-//    gitlab()
-//    firestore(rootProject.file("build-logic/metrics/service-credentials.json"))
-//    buildSpeed {
-//        measuredTaskPaths = setOf(":clean", ":assembleDebug")
-//    }
-//}
+healthMetrics {
+    gitlab()
+    firestore(rootProject.file("build-logic/metrics/service-credentials.json"))
+    buildSpeed {
+        measuredTaskPaths = setOf(":clean", ":assembleDebug")
+    }
+}

docs/analytics/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/common/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/logger/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/multibranding-common/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/multibranding-compose/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/multibranding-xml/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/navigation.html

@@ -726,6 +726,11 @@
       <a href="vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/network/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/onetap-common/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/onetap-compose/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/onetap-xml/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/vk-sdk-support/navigation.html

@@ -726,6 +726,11 @@
       <a href="../vkid/com.vk.id.auth/-prompt/-l-o-g-i-n/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>LOGIN</span></span></span></span></a>
      </div>
     </div>
+    <div class="sideMenuPart" id="vkid-nav-submenu-1-1-2" pageid="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+     <div class="overview">
+      <a href="../vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html"><span class="nav-link-grid"><span class="nav-link-child nav-icon enum-class-kt"></span><span class="nav-link-child"><span><span>CONSENT</span></span></span></span></a>
+     </div>
+    </div>
    </div>
    <div class="sideMenuPart" id="vkid-nav-submenu-1-2" pageid="vkid::com.vk.id.auth/VKIDAuthCallback///PointingToDeclaration//753365699">
     <div class="overview">

docs/vkid/com.vk.id.auth/-prompt/-c-o-n-s-e-n-t/index.html

@@ -0,0 +1,80 @@
+<!doctype html>
+<html class="no-js">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>CONSENT</title>
+<link href="../../../../images/logo-icon.svg" rel="icon" type="image/svg">    <script>var pathToRoot = "../../../../";</script>
+    <script>document.documentElement.classList.replace("no-js","js");</script>
+    <script>const storage = localStorage.getItem("dokka-dark-mode")
+    if (storage == null) {
+        const osDarkSchemePreferred = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+        if (osDarkSchemePreferred === true) {
+            document.getElementsByTagName("html")[0].classList.add("theme-dark")
+        }
+    } else {
+        const savedDarkMode = JSON.parse(storage)
+        if(savedDarkMode === true) {
+            document.getElementsByTagName("html")[0].classList.add("theme-dark")
+        }
+    }
+    </script>
+<script type="text/javascript" src="https://unpkg.com/kotlin-playground@1/dist/playground.min.js" async></script>
+<script type="text/javascript" src="../../../../scripts/sourceset_dependencies.js" async></script>
+<link href="../../../../styles/style.css" rel="Stylesheet">
+<link href="../../../../styles/main.css" rel="Stylesheet">
+<link href="../../../../styles/prism.css" rel="Stylesheet">
+<link href="../../../../styles/logo-styles.css" rel="Stylesheet">
+<link href="../../../../styles/font-jb-sans-auto.css" rel="Stylesheet">
+<script type="text/javascript" src="../../../../scripts/clipboard.js" async></script>
+<script type="text/javascript" src="../../../../scripts/navigation-loader.js" async></script>
+<script type="text/javascript" src="../../../../scripts/platform-content-handler.js" async></script>
+<script type="text/javascript" src="../../../../scripts/main.js" defer></script>
+<script type="text/javascript" src="../../../../scripts/prism.js" async></script>
+<script type="text/javascript" src="../../../../scripts/symbol-parameters-wrapper_deferred.js" defer></script></head>
+<body>
+    <div class="root">
+<nav class="navigation" id="navigation-wrapper">
+    <div class="navigation--inner">
+        <div class="navigation-title">
+            <button class="menu-toggle" id="menu-toggle" type="button">toggle menu</button>
+            <div class="library-name">
+<a class="library-name--link" href="../../../../index.html">
+                            VKIDSDK
+                    </a>            </div>
+            <div class="library-version">
+            </div>
+        </div>
+        <div class="filter-section" id="filter-section">
+                <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":vkid:dokkaHtmlPartial/release">androidJvm</button>
+        </div>
+    </div>
+    <div class="navigation-controls">
+        <button class="navigation-controls--btn navigation-controls--theme" id="theme-toggle-button" type="button">switch theme</button>
+        <div class="navigation-controls--btn navigation-controls--search" id="searchBar" role="button">search in API</div>
+    </div>
+</nav>
+        <div id="container">
+            <div class="sidebar" id="leftColumn">
+                <div class="sidebar--inner" id="sideMenu"></div>
+            </div>
+            <div id="main">
+<div class="main-content" data-page-type="classlike" id="content" pageids="vkid::com.vk.id.auth/Prompt.CONSENT///PointingToDeclaration/{&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;:{&quot;key&quot;:&quot;org.jetbrains.dokka.links.EnumEntryDRIExtra&quot;}}/753365699">
+  <div class="breadcrumbs"><a href="../../../index.html">vkid</a><span class="delimiter">/</span><a href="../../index.html">com.vk.id.auth</a><span class="delimiter">/</span><a href="../index.html">Prompt</a><span class="delimiter">/</span><span class="current">CONSENT</span></div>
+  <div class="cover ">
+    <h1 class="cover"><span><span>CONSENT</span></span></h1>
+    <div class="platform-hinted " data-platform-hinted="data-platform-hinted"><div class="content sourceset-dependent-content" data-active="" data-togglable=":vkid:dokkaHtmlPartial/release"><div class="symbol monospace"><div class="block"><a href="index.html">CONSENT</a></div></div><p class="paragraph">Always show consent screen</p></div></div>
+  </div>
+  <div class="tabbedcontent">
+    <div class="tabs-section" tabs-section="tabs-section"></div>
+    <div class="tabs-section-body"></div>
+  </div>
+</div>
+      <div class="footer">
+        <span class="go-to-top-icon"><a href="#content" id="go-to-top-link"></a></span><span>© 2024 Copyright</span><span class="pull-right"><span>Generated by </span><a href="https://github.com/Kotlin/dokka"><span>dokka</span><span class="padded-icon"></span></a></span>
+      </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+