teach/atsebay.t
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Display error when remote repositories can't be fetched
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
nemunaire 2022-10-17 19:38:17 +02:00
parent 891f36f6f3
commit 093c58f006
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gitlab.go
View File

@ -27,7 +27,7 @@ const (
var ( var (
gitlabClientID = "" gitlabClientID = ""
gitlabSecret = "" gitlabSecret = ""
gitlaboauth2Config oauth2.Config gitlaboauth2Config *oauth2.Config
gitlabToken func() *oauth2.Token gitlabToken func() *oauth2.Token
) )
@ -41,7 +41,7 @@ func initializeGitLabOIDC(router *gin.Engine, authrouter *gin.RouterGroup, admin
router.GET("/callback/gitlabcri/complete", GitLab_OAuth_complete) router.GET("/callback/gitlabcri/complete", GitLab_OAuth_complete)
if gitlabClientID != "" && gitlabSecret != "" { if gitlabClientID != "" && gitlabSecret != "" {
gitlaboauth2Config = oauth2.Config{ gitlaboauth2Config = &oauth2.Config{
ClientID: gitlabClientID, ClientID: gitlabClientID,
ClientSecret: gitlabSecret, ClientSecret: gitlabSecret,
RedirectURL: oidcRedirectURL + baseURL + "/callback/gitlabcri/complete", RedirectURL: oidcRedirectURL + baseURL + "/callback/gitlabcri/complete",
@ -243,6 +243,10 @@ func GitLab_GetMyRepositories(c *gin.Context) {
}*/ }*/
func GitLab_getUsersRepositories(c context.Context, u *User) ([]*GitLabRepository, error) { func GitLab_getUsersRepositories(c context.Context, u *User) ([]*GitLabRepository, error) {
if gitlaboauth2Config == nil || gitlabToken == nil {
return nil, fmt.Errorf("the connection with GitLab is not setup yet")
}
client := gitlaboauth2Config.Client(c, gitlabToken()) client := gitlaboauth2Config.Client(c, gitlabToken())
req, err := http.NewRequest("GET", gitlabBaseURL+fmt.Sprintf("/api/v4/users/%s/projects?per_page=100", u.Login), nil) req, err := http.NewRequest("GET", gitlabBaseURL+fmt.Sprintf("/api/v4/users/%s/projects?per_page=100", u.Login), nil)

6
ui/src/components/WorkRepository.svelte
View File

@ -165,7 +165,6 @@
{/each} {/each}
</select> </select>
<label>Dépôt GitLab pour ce travail&nbsp;:</label> <label>Dépôt GitLab pour ce travail&nbsp;:</label>
{/await}
<button <button
type="submit" type="submit"
class="mt-2 btn btn-primary" class="mt-2 btn btn-primary"
@ -173,6 +172,11 @@
> >
Utiliser ce dépôt Utiliser ce dépôt
</button> </button>
{:catch err}
<div class="text-danger">
{err.message} Veuillez réessyer dans quelques instants&hellip;<br>Si le problème persiste, contactez votre professeur.
</div>
{/await}
<button <button
type="button" type="button"
class="mt-2 btn btn-info" class="mt-2 btn btn-info"