Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ignore upstream url; #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
23 changes: 14 additions & 9 deletions unpub/lib/src/app.dart
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ class App {
final PackageStore packageStore;

/// upstream url, default: https://pub.dev
final String upstream;
final String? upstream;

/// http(s) proxy to call googleapis (to get uploader email)
final String? googleapisProxy;
@@ -76,6 +76,15 @@ class App {

http.Client? _googleapisClient;

shelf.Response _performUpStreamIfNeeded(String path) {
if (upstream == null) {
return shelf.Response.notFound('Not Found');
} else {
return shelf.Response.found(
Uri.parse(upstream!).resolve(path).toString());
}
}

Future<String> _getUploaderEmail(shelf.Request req) async {
if (overrideUploaderEmail != null) return overrideUploaderEmail!;

@@ -139,8 +148,7 @@ class App {
var package = await metaStore.queryPackage(name);

if (package == null) {
return shelf.Response.found(
Uri.parse(upstream).resolve('/api/packages/$name').toString());
return _performUpStreamIfNeeded('/api/packages/$name');
}

package.versions.sort((a, b) {
@@ -171,9 +179,7 @@ class App {

var package = await metaStore.queryPackage(name);
if (package == null) {
return shelf.Response.found(Uri.parse(upstream)
.resolve('/api/packages/$name/versions/$version')
.toString());
return _performUpStreamIfNeeded('/api/packages/$name/versions/$version');
}

var packageVersion =
@@ -190,9 +196,8 @@ class App {
shelf.Request req, String name, String version) async {
var package = await metaStore.queryPackage(name);
if (package == null) {
return shelf.Response.found(Uri.parse(upstream)
.resolve('/packages/$name/versions/$version.tar.gz')
.toString());
return _performUpStreamIfNeeded(
'/packages/$name/versions/$version.tar.gz');
}

if (isPubClient(req)) {