Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9edd95b8 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Enable OIDC support for murena.io account

parent 5b61f02b

.gitlab-ci.yml

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ stages: 
before_script:

  - echo email.key=$PEPPER >> local.properties

  - echo MURENA_CLIENT_ID=$MURENA_CLIENT_ID >> local.properties

  - echo MURENA_CLIENT_SECRET=$MURENA_CLIENT_SECRET >> local.properties

  - echo MURENA_REDIRECT_URI=$MURENA_REDIRECT_URI >> local.properties

  - echo MURENA_LOGOUT_REDIRECT_URI=$MURENA_LOGOUT_REDIRECT_URI >> local.properties

  - echo MURENA_BASE_URL=$MURENA_BASE_URL >> local.properties

app/build.gradle

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ android { 


    defaultConfig {

        buildConfigField "String", "MURENA_CLIENT_ID", "\"${retrieveKey("MURENA_CLIENT_ID")}\""

        buildConfigField "String", "MURENA_CLIENT_SECRET", "\"${retrieveKey("MURENA_CLIENT_SECRET")}\""

        buildConfigField "String", "MURENA_REDIRECT_URI", "\"${retrieveKey("MURENA_REDIRECT_URI")}\""

        buildConfigField "String", "MURENA_LOGOUT_REDIRECT_URI", "\"${retrieveKey("MURENA_LOGOUT_REDIRECT_URI")}\""

        buildConfigField "String", "MURENA_BASE_URL", "\"${retrieveKey("MURENA_BASE_URL")}\""

app/src/main/kotlin/at/bitfire/davdroid/authorization/IdentityProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ enum class IdentityProvider( 
        authEndpoint = null,

        tokenEndpoint = null,

        clientId = BuildConfig.MURENA_CLIENT_ID,

        clientSecret = BuildConfig.MURENA_CLIENT_SECRET,

        clientSecret = null,

        redirectUri = BuildConfig.MURENA_REDIRECT_URI + ":/redirect",

        logoutRedirectUri = BuildConfig.MURENA_LOGOUT_REDIRECT_URI + ":/redirect",

        scope = "openid profile email offline_access",

app/src/main/kotlin/at/bitfire/davdroid/network/HttpClient.kt

+6 −2
Original line number Diff line number Diff line
@@ -89,8 +89,12 @@ class HttpClient private constructor( 
    }



    override fun close() {

        authService?.dispose()

        try {

            okHttpClient.cache?.close()

            authService?.dispose()

        } catch (e: Exception) {

           Logger.log.log(Level.INFO, "failed to clear resource on close httpClient", e)

        }

    }

app/src/main/kotlin/at/bitfire/davdroid/syncadapter/DefaultAccountAuthenticatorService.kt

+5 −1
Original line number Diff line number Diff line
@@ -232,7 +232,11 @@ abstract class DefaultAccountAuthenticatorService : Service(), OnAccountsUpdateL 
                result.putString(AccountManager.KEY_AUTHTOKEN, authState.accessToken)

                response?.onResult(result)



                try {

                    authorizationService.dispose()

                } catch (e: Exception) {

                    Logger.log.log(Level.INFO, "failed to dispose oidc authorizationService", e)

                }

            }



            val result = Bundle()