Commit bcb96ea3 authored by Thomas Markiewicz's avatar Thomas Markiewicz
Browse files

Corrected librem social login bug; bumped version and updated CHANGELOG

parent ff001cd9
Pipeline #58901 failed with stage
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<AndroidXmlCodeStyleSettings>
<option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
</AndroidXmlCodeStyleSettings>
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="delegatedBuild" value="false" />
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
......
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
</component>
</project>
\ No newline at end of file
......@@ -4,6 +4,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
## [1.0.2] 2020-09-17
### Fixed
- Corrected Librem Social login to pass "scope" instead of "scopes". This was causing problems with posting new messages.
## [1.0.1] 2020-02-01
### Fixed
- fixed Librem One login issue
......
......@@ -13,8 +13,8 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
// (major * 1000000) + (minor * 10000) + (patch * 100) + candidate;
versionCode = 1000100
versionName = "1.0.1"
versionCode = 1000200
versionName = "1.0.2"
}
signingConfigs {
release {
......
......@@ -35,11 +35,14 @@ class LibremOneAccountAuthenticatorActivity : AccountAuthenticatorActivity() {
val host = "https://social.librem.one"
val scopes = "write read follow"
val scopes = "read write follow"
val regAppParams = JSONObject()
regAppParams.put("client_name", "LibremSocial")
regAppParams.put("client_name", "Librem Social")
regAppParams.put("redirect_uris", "urn:ietf:wg:oauth:2.0:oob")
// NOTE the quirk
// for initial registration the field name is "scopes" with an 's'
regAppParams.put("scopes", scopes)
val regAppRequest = JsonObjectRequest(
......@@ -55,9 +58,10 @@ class LibremOneAccountAuthenticatorActivity : AccountAuthenticatorActivity() {
loginParams.put("grant_type", "password")
loginParams.put("username", username)
loginParams.put("password", passphrase)
loginParams.put("scopes", scopes)
loginParams.put("client_id", clientId)
loginParams.put("client_secret", clientSecret)
// NOTE that *here* the field name is "scope" - singular
loginParams.put("scope", scopes)
val loginRequest = JsonObjectRequest(
Request.Method.POST,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment