github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-06 12:20:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

When user clone/pull/etc a project which doesn't exist, print a nice message

Browse source 
The old behaviour was to just show an equivalent of a 500 error.
This way, we catch the 404 from the API, and print an appropriate message
to the user.
This commit is contained in:
Shane Kilkelly 2018-12-11 12:35:21 +00:00
parent 002d862389
commit 3f85dc80f4
3 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java
View file

@ -13,6 +13,7 @@ import uk.ac.ic.wlgitbridge.git.servlet.WLGitServlet;
import uk.ac.ic.wlgitbridge.server.GitBridgeServer;
import uk.ac.ic.wlgitbridge.server.Oauth2Filter;
import uk.ac.ic.wlgitbridge.snapshot.base.ForbiddenException;
import uk.ac.ic.wlgitbridge.snapshot.base.MissingRepositoryException;
import uk.ac.ic.wlgitbridge.util.Log;
import uk.ac.ic.wlgitbridge.util.Util;
@ -97,6 +98,8 @@ public class WLRepositoryResolver
} catch (ServiceNotEnabledException e) {
cannot occur
*/
} catch (MissingRepositoryException e) {
throw new ServiceMayNotContinueException(String.join("\n", e.getDescriptionLines()), e);
} catch (ServiceMayNotContinueException e) {
/* Such as FailedConnectionException */
throw e;

41
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/MissingRepositoryException.java
View file

@ -10,43 +10,40 @@ import java.util.List;
public class MissingRepositoryException extends SnapshotAPIException {
public static final List<String> GENERIC_REASON = Arrays.asList(
"This Overleaf project currently has no git access.",
"This Overleaf project currently has no git access, either",
"because the project does not exist, or git access is not enabled for the project.",
"",
"If this problem persists, please contact us."
"If this problem persists, please contact us at at support@overleaf.com"
);
static List<String> buildExportedToV2Message(String remoteUrl) {
if (remoteUrl == null) {
return Arrays.asList(
"This Overleaf project has been moved to Overleaf v2 and cannot be used with git at this time.",
"",
"If this error persists, please contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
"This Overleaf project has been moved to Overleaf v2 and cannot be used with git at this time.",
"",
"If this error persists, please contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
);
} else {
return Arrays.asList(
"This Overleaf project has been moved to Overleaf v2 and has a new identifier.",
"Please update your remote to:",
"",
" " + remoteUrl,
"",
"Assuming you are using the default \"origin\" remote, the following commands",
"will change the remote for you:",
"",
" git remote set-url origin " + remoteUrl,
"",
"If this does not work, please contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
"This Overleaf project has been moved to Overleaf v2 and has a new identifier.",
"Please update your remote to:",
"",
" " + remoteUrl,
"",
"Assuming you are using the default \"origin\" remote, the following commands",
"will change the remote for you:",
"",
" git remote set-url origin " + remoteUrl,
"",
"If this does not work, please contact us at support@overleaf.com, or",
"see https://www.overleaf.com/help/342 for more information."
);
}
}
private List<String> descriptionLines;
public MissingRepositoryException() {
descriptionLines = new ArrayList<String>();
}
public MissingRepositoryException(List<String> descriptionLines) {
this.descriptionLines = descriptionLines;
}

2
services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/snapshot/base/Request.java
View file

@ -97,7 +97,7 @@ public abstract class Request<T extends Result> {
// disregard any errors that arose while handling the JSON
}
throw new MissingRepositoryException();
throw new MissingRepositoryException(MissingRepositoryException.GENERIC_REASON);
} else if (sc >= 400 && sc < 500) {
throw new MissingRepositoryException(MissingRepositoryException.GENERIC_REASON);
}