Expose alternative cookie manager used for registration
This commit is contained in:
parent
6c7c919978
commit
212f0e33d5
6 changed files with 14 additions and 1 deletions
|
@ -6,6 +6,7 @@ public final class io/github/wulkanowy/sdk/scrapper/Scrapper {
|
||||||
public final fun deleteMessages (Ljava/util/List;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
public final fun deleteMessages (Ljava/util/List;ZLkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
||||||
public final fun excuseForAbsence (Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
public final fun excuseForAbsence (Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
||||||
public static synthetic fun excuseForAbsence$default (Lio/github/wulkanowy/sdk/scrapper/Scrapper;Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
public static synthetic fun excuseForAbsence$default (Lio/github/wulkanowy/sdk/scrapper/Scrapper;Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
||||||
|
public final fun getAlternativeCookieManager ()Ljava/net/CookieManager;
|
||||||
public final fun getAndroidVersion ()Ljava/lang/String;
|
public final fun getAndroidVersion ()Ljava/lang/String;
|
||||||
public final fun getAttendance (Ljava/time/LocalDate;Ljava/time/LocalDate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
public final fun getAttendance (Ljava/time/LocalDate;Ljava/time/LocalDate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
||||||
public static synthetic fun getAttendance$default (Lio/github/wulkanowy/sdk/scrapper/Scrapper;Ljava/time/LocalDate;Ljava/time/LocalDate;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
public static synthetic fun getAttendance$default (Lio/github/wulkanowy/sdk/scrapper/Scrapper;Ljava/time/LocalDate;Ljava/time/LocalDate;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
||||||
|
|
|
@ -68,6 +68,10 @@ class Scrapper {
|
||||||
setCookiePolicy(CookiePolicy.ACCEPT_ALL)
|
setCookiePolicy(CookiePolicy.ACCEPT_ALL)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val alternativeCookieManager = CookieManager().apply {
|
||||||
|
setCookiePolicy(CookiePolicy.ACCEPT_ALL)
|
||||||
|
}
|
||||||
|
|
||||||
var logLevel: HttpLoggingInterceptor.Level = HttpLoggingInterceptor.Level.BASIC
|
var logLevel: HttpLoggingInterceptor.Level = HttpLoggingInterceptor.Level.BASIC
|
||||||
set(value) {
|
set(value) {
|
||||||
if (field != value) changeManager.reset()
|
if (field != value) changeManager.reset()
|
||||||
|
@ -214,6 +218,7 @@ class Scrapper {
|
||||||
ServiceManager(
|
ServiceManager(
|
||||||
okHttpClientBuilderFactory = okHttpFactory,
|
okHttpClientBuilderFactory = okHttpFactory,
|
||||||
cookies = cookieManager,
|
cookies = cookieManager,
|
||||||
|
alternativeCookies = alternativeCookieManager,
|
||||||
logLevel = logLevel,
|
logLevel = logLevel,
|
||||||
loginType = loginType,
|
loginType = loginType,
|
||||||
schema = schema,
|
schema = schema,
|
||||||
|
|
|
@ -36,6 +36,7 @@ import javax.net.ssl.X509TrustManager
|
||||||
internal class ServiceManager(
|
internal class ServiceManager(
|
||||||
private val okHttpClientBuilderFactory: OkHttpClientBuilderFactory,
|
private val okHttpClientBuilderFactory: OkHttpClientBuilderFactory,
|
||||||
private val cookies: CookieManager,
|
private val cookies: CookieManager,
|
||||||
|
private val alternativeCookies: CookieManager,
|
||||||
logLevel: HttpLoggingInterceptor.Level,
|
logLevel: HttpLoggingInterceptor.Level,
|
||||||
private val loginType: Scrapper.LoginType,
|
private val loginType: Scrapper.LoginType,
|
||||||
private val schema: String,
|
private val schema: String,
|
||||||
|
@ -233,7 +234,7 @@ internal class ServiceManager(
|
||||||
-> sslSocketFactory(TLSSocketFactory(), trustManager)
|
-> sslSocketFactory(TLSSocketFactory(), trustManager)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.cookieJar(if (!separateJar) JavaNetCookieJar(cookies) else JavaNetCookieJar(CookieManager()))
|
.cookieJar(if (!separateJar) JavaNetCookieJar(cookies) else JavaNetCookieJar(alternativeCookies))
|
||||||
.apply {
|
.apply {
|
||||||
interceptors.forEach {
|
interceptors.forEach {
|
||||||
if (it.first is ErrorInterceptor || it.first is AutoLoginInterceptor) {
|
if (it.first is ErrorInterceptor || it.first is AutoLoginInterceptor) {
|
||||||
|
|
|
@ -24,6 +24,7 @@ class ServiceManagerTest : BaseLocalTest() {
|
||||||
val manager = ServiceManager(
|
val manager = ServiceManager(
|
||||||
okHttpClientBuilderFactory = OkHttpClientBuilderFactory(),
|
okHttpClientBuilderFactory = OkHttpClientBuilderFactory(),
|
||||||
cookies = CookieManager(),
|
cookies = CookieManager(),
|
||||||
|
alternativeCookies = CookieManager(),
|
||||||
logLevel = HttpLoggingInterceptor.Level.NONE,
|
logLevel = HttpLoggingInterceptor.Level.NONE,
|
||||||
loginType = Scrapper.LoginType.STANDARD,
|
loginType = Scrapper.LoginType.STANDARD,
|
||||||
schema = "http",
|
schema = "http",
|
||||||
|
@ -58,6 +59,7 @@ class ServiceManagerTest : BaseLocalTest() {
|
||||||
val manager = ServiceManager(
|
val manager = ServiceManager(
|
||||||
okHttpClientBuilderFactory = OkHttpClientBuilderFactory(),
|
okHttpClientBuilderFactory = OkHttpClientBuilderFactory(),
|
||||||
cookies = CookieManager(),
|
cookies = CookieManager(),
|
||||||
|
alternativeCookies = CookieManager(),
|
||||||
logLevel = HttpLoggingInterceptor.Level.NONE,
|
logLevel = HttpLoggingInterceptor.Level.NONE,
|
||||||
loginType = Scrapper.LoginType.STANDARD,
|
loginType = Scrapper.LoginType.STANDARD,
|
||||||
schema = "http",
|
schema = "http",
|
||||||
|
@ -130,6 +132,7 @@ class ServiceManagerTest : BaseLocalTest() {
|
||||||
val manager = ServiceManager(
|
val manager = ServiceManager(
|
||||||
okHttpClientBuilderFactory = OkHttpClientBuilderFactory(),
|
okHttpClientBuilderFactory = OkHttpClientBuilderFactory(),
|
||||||
cookies = CookieManager(),
|
cookies = CookieManager(),
|
||||||
|
alternativeCookies = CookieManager(),
|
||||||
logLevel = HttpLoggingInterceptor.Level.NONE,
|
logLevel = HttpLoggingInterceptor.Level.NONE,
|
||||||
loginType = Scrapper.LoginType.STANDARD,
|
loginType = Scrapper.LoginType.STANDARD,
|
||||||
schema = "http",
|
schema = "http",
|
||||||
|
|
|
@ -7,6 +7,7 @@ public final class io/github/wulkanowy/sdk/Sdk {
|
||||||
public static synthetic fun deleteMessages$default (Lio/github/wulkanowy/sdk/Sdk;Ljava/util/List;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
public static synthetic fun deleteMessages$default (Lio/github/wulkanowy/sdk/Sdk;Ljava/util/List;ZLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
||||||
public final fun excuseForAbsence (Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
public final fun excuseForAbsence (Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
||||||
public static synthetic fun excuseForAbsence$default (Lio/github/wulkanowy/sdk/Sdk;Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
public static synthetic fun excuseForAbsence$default (Lio/github/wulkanowy/sdk/Sdk;Ljava/util/List;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
|
||||||
|
public final fun getAlternativeCookieManager ()Ljava/net/CookieManager;
|
||||||
public final fun getAndroidVersion ()Ljava/lang/String;
|
public final fun getAndroidVersion ()Ljava/lang/String;
|
||||||
public final fun getAttendance (Ljava/time/LocalDate;Ljava/time/LocalDate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
public final fun getAttendance (Ljava/time/LocalDate;Ljava/time/LocalDate;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
||||||
public final fun getAttendanceSummary (Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
public final fun getAttendanceSummary (Ljava/lang/Integer;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
|
||||||
|
|
|
@ -100,6 +100,8 @@ class Sdk {
|
||||||
|
|
||||||
val cookieManager: CookieManager = scrapper.cookieManager
|
val cookieManager: CookieManager = scrapper.cookieManager
|
||||||
|
|
||||||
|
val alternativeCookieManager: CookieManager = scrapper.alternativeCookieManager
|
||||||
|
|
||||||
var mode = Mode.SCRAPPER
|
var mode = Mode.SCRAPPER
|
||||||
|
|
||||||
var mobileBaseUrl = ""
|
var mobileBaseUrl = ""
|
||||||
|
|
Loading…
Reference in a new issue