mirror/advplyr.audiobookshelf-app
1
0
Fork 0
mirror of https://github.com/advplyr/audiobookshelf-app.git synced 2025-07-10 14:04:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

oauth2 support on Android

Browse source
This commit is contained in:
Denis Arnst 2023-10-13 23:14:52 +02:00
parent e521ddfab6
commit 8b631f7860
6 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/capacitor.build.gradle
View file

@ -9,8 +9,8 @@ android {
apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
dependencies {
implementation project(':byteowls-capacitor-oauth2')
implementation project(':capacitor-app')
implementation project(':capacitor-browser')
implementation project(':capacitor-clipboard')
implementation project(':capacitor-dialog')
implementation project(':capacitor-haptics')

2
android/app/src/debug/res/values/strings.xml
View file

@ -3,7 +3,7 @@
<string name="app_name">audiobookshelf</string>
<string name="title_activity_main">audiobookshelf</string>
<string name="package_name">com.audiobookshelf.app</string>
<string name="custom_url_scheme">com.audiobookshelf.app.debug</string>
<string name="custom_url_scheme">audiobookshelf</string>
<string name="add_widget">Add widget</string>
<string name="app_widget_description">Simple widget for audiobookshelf playback</string>
<string name="action_jump_forward">Jump Forward</string>

8
android/app/src/main/assets/capacitor.plugins.json
View file

@ -1,12 +1,12 @@
[
{
"pkg": "@byteowls/capacitor-oauth2",
"classpath": "com.byteowls.capacitor.oauth2.OAuth2ClientPlugin"
},
{
"pkg": "@capacitor/app",
"classpath": "com.capacitorjs.plugins.app.AppPlugin"
},
{
"pkg": "@capacitor/browser",
"classpath": "com.capacitorjs.plugins.browser.BrowserPlugin"
},
{
"pkg": "@capacitor/clipboard",
"classpath": "com.capacitorjs.plugins.clipboard.ClipboardPlugin"

2
android/app/src/main/res/values/strings.xml
View file

@ -3,7 +3,7 @@
<string name="app_name">audiobookshelf</string>
<string name="title_activity_main">audiobookshelf</string>
<string name="package_name">com.audiobookshelf.app</string>
<string name="custom_url_scheme">com.audiobookshelf.app</string>
<string name="custom_url_scheme">audiobookshelf</string>
<string name="add_widget">Add widget</string>
<string name="app_widget_description">Simple widget for audiobookshelf playback</string>
<string name="action_jump_forward">Jump Forward</string>

6
android/capacitor.settings.gradle
View file

@ -2,12 +2,12 @@
include ':capacitor-android'
project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor')
include ':byteowls-capacitor-oauth2'
project(':byteowls-capacitor-oauth2').projectDir = new File('../node_modules/@byteowls/capacitor-oauth2/android')
include ':capacitor-app'
project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
include ':capacitor-browser'
project(':capacitor-browser').projectDir = new File('../node_modules/@capacitor/browser/android')
include ':capacitor-clipboard'
project(':capacitor-clipboard').projectDir = new File('../node_modules/@capacitor/clipboard/android')

17
components/connection/ServerConnectForm.vue
View file

@ -79,9 +79,10 @@
<script>
import { App } from '@capacitor/app';
import { Dialog } from '@capacitor/dialog'
import { CapacitorHttp } from '@capacitor/core'
import { Browser } from '@capacitor/browser';
import { Capacitor } from '@capacitor/core';
import { CapacitorHttp } from '@capacitor/core'
import { Dialog } from '@capacitor/dialog'
// Variable which is set to an instance of ServerConnectForm.vue used below of the listener
let serverConnectForm = null;
@ -91,7 +92,8 @@ App.addListener('appUrlOpen', async (data) => {
const url = new URL(data.url)
// audiobookshelf://oauth?code...
if (url.host === 'oauth') {
// url.hostname for iOS and url.pathname for android
if (data.url.startsWith('audiobookshelf://oauth')) {
// Extract oauth2 code to be exchanged for a token
const authCode = url.searchParams.get('code')
// Extract the state variable
@ -101,7 +103,7 @@ App.addListener('appUrlOpen', async (data) => {
await serverConnectForm.oauthExchangeCodeForToken(authCode, state)
}
} else {
console.warn(`[appUrlOpen] Unknown url: ${data.url}`)
console.warn(`[appUrlOpen] Unknown url: ${data.url} - host: ${url.hostname} - path: ${url.pathname}`)
}
});
@ -205,7 +207,8 @@ export default {
},
})
const locationHeader = response.headers["Location"]
// Depending on iOS or Android, it can be location or Location...
const locationHeader = response.headers[Object.keys(response.headers).find(key => key.toLowerCase() === 'location')];
if (locationHeader) {
const url = new URL(locationHeader)
return url
@ -226,8 +229,10 @@ export default {
const backendEndpoint = `${this.serverConfig.address}/auth/openid/callback?state=${encodeURIComponent(state)}&code=${encodeURIComponent(code)}`;
try {
// We can close the browser at this point
// We can close the browser at this point (does not work on Android)
if (Capacitor.getPlatform() === 'ios' || Capacitor.getPlatform() === 'web') {
await Browser.close()
}
const response = await CapacitorHttp.get({
url: backendEndpoint