Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .lycheeignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ https://your-domain/redirect.html
# Localhost used in comments

http://localhost:3000/
http://localhost:4400/

# POD OAuth endpoints that require authentication parameters

Expand Down
6 changes: 3 additions & 3 deletions client-profile.jsonld
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"@context": "https://www.w3.org/ns/solid/oidc-context.jsonld",
"client_id": "https://solidcommunity.au/apps/geopod/client-profile.jsonld",
"client_id": "https://gjwgit.github.io/geopod/client-profile.jsonld",
"client_name": "GeoPod",
"application_type": "native",
"redirect_uris": [
"https://geopod.solidcommunity.au/redirect.html",
"com.togaware.geopod://redirect",
"http://localhost:4400/redirect"
"http://localhost:4400/redirect.html"
],
"post_logout_redirect_uris": [
"https://geopod.solidcommunity.au/redirect.html",
"com.togaware.geopod://redirect",
"http://localhost:4400/redirect"
"http://localhost:4400/redirect.html"
],
"scope": "openid profile offline_access webid",
"grant_types": [
Expand Down
21 changes: 15 additions & 6 deletions lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ library;

import 'dart:async';

import 'package:flutter/foundation.dart' show kIsWeb;
import 'package:flutter/material.dart';

import 'package:solidpod/solidpod.dart' show registerLogoutCacheCallback;
Expand Down Expand Up @@ -70,12 +71,20 @@ class App extends StatelessWidget {
'encrypted_data',
'places',
],
clientId: 'https://solidcommunity.au/apps/geopod/client-profile.jsonld',
redirectUris: [
'https://geopod.solidcommunity.au/redirect.html',
'com.togaware.geopod://redirect',
'http://localhost:4400/redirect',
],
clientId: 'https://gjwgit.github.io/geopod/client-profile.jsonld',
// On web the redirect must be same-origin as where the app is served,
// otherwise redirect.html's BroadcastChannel cannot hand the auth
// response back and login hangs on the spinner. solidpod's
// pickRedirectUri simply takes the first https:// entry (it does not
// match on origin), so we derive the web entry from Uri.base.origin:
// the deployed https host in production, and http://localhost:4400
// under `flutter run -d chrome --web-port=4400`.
redirectUris: kIsWeb
? ['${Uri.base.origin}/redirect.html']
: const [
'com.togaware.geopod://redirect',
'http://localhost:4400/redirect.html',
],
child: appWithPreload,
);

Expand Down
9 changes: 3 additions & 6 deletions macos/Runner/DebugProfile.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,9 @@
<true/>
<key>com.apple.security.network.client</key>
<true/>
<!-- Note: keychain access entitlement is needed to use local secure storage and requires code signing app
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.togaware.geopod</string>
</array> -->
<key>keychain-access-groups</key>
</array>
<array/>
<key>com.apple.security.keychain</key>
<true/>
</dict>
</plist>
6 changes: 6 additions & 0 deletions macos/Runner/Release.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@
<dict>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.network.server</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>keychain-access-groups</key>
<array/>
<key>com.apple.security.keychain</key>
<true/>
</dict>
</plist>
1 change: 1 addition & 0 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies:
intl: ^0.20.1
latlong2: ^0.9.1
markdown_tooltip: ^0.0.10
media_kit_libs_video: ^1.0.5
path_provider: ^2.1.5
pdf: ^3.11.1
shared_preferences: ^2.3.3
Expand Down
39 changes: 0 additions & 39 deletions web/callback.html

This file was deleted.

Loading