Merge branch 'master' of https://github.com/Liftric/auth

Liftric · Aug 31, 2020 · 5fd4ff4 · 5fd4ff4
2 parents 90364d0 + 53f5547
commit 5fd4ff4
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 27 deletions.
diff --git a/...in/kotlin/com/liftric/base/Environment.kt → ...tlin/com/liftric/auth/base/Environment.kt b/...in/kotlin/com/liftric/base/Environment.kt → ...tlin/com/liftric/auth/base/Environment.kt
@@ -1,9 +1,9 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 actual internal class Environment {
     actual companion object {
         actual fun variable(value: String): String? {
             return System.getenv(value)
         }
     }
-}
+}
diff --git a/...src/commonMain/kotlin/com/liftric/Auth.kt → ...ommonMain/kotlin/com/liftric/auth/Auth.kt b/...src/commonMain/kotlin/com/liftric/Auth.kt → ...ommonMain/kotlin/com/liftric/auth/Auth.kt
@@ -1,6 +1,6 @@
-package com.liftric
+package com.liftric.auth
 
-import com.liftric.base.*
+import com.liftric.auth.base.*
 
 interface Auth {
     /**

diff --git a/...monMain/kotlin/com/liftric/AuthHandler.kt → ...in/kotlin/com/liftric/auth/AuthHandler.kt b/...monMain/kotlin/com/liftric/AuthHandler.kt → ...in/kotlin/com/liftric/auth/AuthHandler.kt
@@ -1,6 +1,6 @@
-package com.liftric
+package com.liftric.auth
 
-import com.liftric.base.*
+import com.liftric.auth.base.*
 import io.ktor.client.*
 import io.ktor.client.features.*
 import io.ktor.client.request.*

diff --git a/...nMain/kotlin/com/liftric/Configuration.kt → .../kotlin/com/liftric/auth/Configuration.kt b/...nMain/kotlin/com/liftric/Configuration.kt → .../kotlin/com/liftric/auth/Configuration.kt
@@ -1,7 +1,7 @@
-package com.liftric
+package com.liftric.auth
 
-import com.liftric.base.Header
-import com.liftric.base.Region
+import com.liftric.auth.base.Header
+import com.liftric.auth.base.Region
 import io.ktor.http.HeadersBuilder
 
 /**
@@ -33,4 +33,4 @@ class Configuration(origin: String, region: Region, val clientId: String) {
             builder.append(it.key, it.value)
         }
     }
-}
+}
diff --git a/...Main/kotlin/com/liftric/base/Constants.kt → ...kotlin/com/liftric/auth/base/Constants.kt b/...Main/kotlin/com/liftric/base/Constants.kt → ...kotlin/com/liftric/auth/base/Constants.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 object Header {
     const val Authority         = "authority"
@@ -59,4 +59,4 @@ enum class Region(val code: String) {
     euNorth1("eu-north-1"),
     meSouth1("me-south-1"),
     saEast1("sa-east-1")
-}
+}
diff --git a/...in/kotlin/com/liftric/base/Environment.kt → ...tlin/com/liftric/auth/base/Environment.kt b/...in/kotlin/com/liftric/base/Environment.kt → ...tlin/com/liftric/auth/base/Environment.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 expect internal class Environment() {
     companion object {
@@ -8,4 +8,4 @@ expect internal class Environment() {
          */
         fun variable(value: String): String?
     }
-}
+}
diff --git a/...onMain/kotlin/com/liftric/base/Payload.kt → ...n/kotlin/com/liftric/auth/base/Payload.kt b/...onMain/kotlin/com/liftric/base/Payload.kt → ...n/kotlin/com/liftric/auth/base/Payload.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 import kotlinx.serialization.Serializable
 
@@ -66,4 +66,4 @@ data class UserAttribute(
 internal data class UpdateUserAttributes(
     val AccessToken: String,
     val UserAttributes: List<UserAttribute>
-)
+)
diff --git a/...nMain/kotlin/com/liftric/base/Response.kt → .../kotlin/com/liftric/auth/base/Response.kt b/...nMain/kotlin/com/liftric/base/Response.kt → .../kotlin/com/liftric/auth/base/Response.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 import kotlinx.serialization.Serializable
 
@@ -11,8 +11,8 @@ data class RequestError(val __type: String, val message: String)
 
 @Serializable
 data class SignInResponse(
-        val AuthenticationResult: AuthenticationResult,
-        val ChallengeParameters: Map<String, String> = mapOf()
+    val AuthenticationResult: AuthenticationResult,
+    val ChallengeParameters: Map<String, String> = mapOf()
 )
 
 @Serializable

diff --git a/...monMain/kotlin/com/liftric/base/Result.kt → ...in/kotlin/com/liftric/auth/base/Result.kt b/...monMain/kotlin/com/liftric/base/Result.kt → ...in/kotlin/com/liftric/auth/base/Result.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 class Result<out T> constructor(val value: Any?) {
     val isSuccess: Boolean get() = value !is Failure

diff --git a/.../kotlin/com/liftric/base/Serialization.kt → ...in/com/liftric/auth/base/Serialization.kt b/.../kotlin/com/liftric/base/Serialization.kt → ...in/com/liftric/auth/base/Serialization.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerializationStrategy

diff --git a/...om/liftric/AuthHandlerIntegrationTests.kt → ...ftric/auth/AuthHandlerIntegrationTests.kt b/...om/liftric/AuthHandlerIntegrationTests.kt → ...ftric/auth/AuthHandlerIntegrationTests.kt
@@ -1,7 +1,8 @@
-package com.liftric
+package com.liftric.auth
 
-import com.liftric.base.*
-import com.liftric.base.Environment
+import com.liftric.auth.base.*
+import com.liftric.auth.base.Environment
+import com.liftric.auth.base.Region
 import kotlinx.coroutines.delay
 import kotlin.test.*
 import kotlinx.coroutines.*

diff --git a/...in/kotlin/com/liftric/base/Environment.kt → ...tlin/com/liftric/auth/base/Environment.kt b/...in/kotlin/com/liftric/base/Environment.kt → ...tlin/com/liftric/auth/base/Environment.kt
@@ -1,4 +1,4 @@
-package com.liftric.base
+package com.liftric.auth.base
 
 import platform.Foundation.NSProcessInfo
 
@@ -8,4 +8,4 @@ actual internal class Environment actual constructor() {
             return NSProcessInfo().environment[value].toString()
         }
     }
-}
+}
diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest package="com.liftric"/>
+<manifest package="com.liftric.auth"/>