Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NodeClientSharedCode
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dojo Project (HES-SO)
Projects
Shared
NodeClientSharedCode
Compare revisions
d9379b055a4626e4b35cf4cc4a7429040a4aeaf7 to dc12d17660bf9e92656c6abcb24ec7ce6ab3d675
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
dojo_project/projects/shared/nodeclientsharedcode
Select target project
No results found
dc12d17660bf9e92656c6abcb24ec7ce6ab3d675
Select Git revision
Branches
ask-user-to-delete-exercises-on-duplicates
jw_sonar
jw_sonar_backup
main
move-to-esm-only
open_tool_for_self_hosting
v5.0
v6.0
Tags
v4.1
v4.2
10 results
Swap
Target
dojo_project/projects/shared/nodeclientsharedcode
Select target project
dojo_project/projects/shared/nodeclientsharedcode
1 result
d9379b055a4626e4b35cf4cc4a7429040a4aeaf7
Select Git revision
Branches
ask-user-to-delete-exercises-on-duplicates
jw_sonar
jw_sonar_backup
main
move-to-esm-only
open_tool_for_self_hosting
v5.0
v6.0
Tags
v4.1
v4.2
10 results
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (4)
UserRole => Add enum
· 26ff3997
michael.minelli
authored
1 year ago
26ff3997
ApiRoute => Add refreshTokens route
· 796ac23c
michael.minelli
authored
1 year ago
796ac23c
User => Adapt interface to new db schema
· d7b76cdf
michael.minelli
authored
1 year ago
d7b76cdf
DojoGitlabCredentials => Add interface
· dc12d176
michael.minelli
authored
1 year ago
dc12d176
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
models/User.ts
+14
-4
14 additions, 4 deletions
models/User.ts
models/UserRole.ts
+8
-0
8 additions, 0 deletions
models/UserRole.ts
types/Dojo/ApiRoute.ts
+1
-0
1 addition, 0 deletions
types/Dojo/ApiRoute.ts
types/Dojo/DojoGitlabCredentials.ts
+7
-0
7 additions, 0 deletions
types/Dojo/DojoGitlabCredentials.ts
with
30 additions
and
4 deletions
models/User.ts
View file @
dc12d176
import
UserRole
from
'
./UserRole
'
;
import
Exercise
from
'
./Exercise
'
;
import
Assignment
from
'
./Assignment
'
;
import
GitlabProfile
from
'
../../shared/types/Gitlab/GitlabProfile
'
;
interface
User
{
interface
User
{
id
:
number
;
id
:
number
;
firstName
:
string
;
name
:
string
;
lastName
:
string
;
mail
:
string
;
mail
:
string
;
gitlabId
:
number
;
role
:
UserRole
;
role
:
string
;
gitlabUsername
:
string
;
gitlabLastInfo
:
GitlabProfile
;
isTeachingStaff
:
boolean
;
isTeachingStaff
:
boolean
;
isAdmin
:
boolean
;
deleted
:
boolean
;
deleted
:
boolean
;
assignments
?:
Array
<
Assignment
>
;
exercises
?:
Array
<
Exercise
>
;
}
}
...
...
This diff is collapsed.
Click to expand it.
models/UserRole.ts
0 → 100644
View file @
dc12d176
enum
UserRole
{
STUDENT
=
'
STUDENT
'
,
TEACHING_STAFF
=
'
TEACHING_STAFF
'
,
ADMIN
=
'
ADMIN
'
}
export
default
UserRole
;
\ No newline at end of file
This diff is collapsed.
Click to expand it.
types/Dojo/ApiRoute.ts
View file @
dc12d176
enum
ApiRoute
{
enum
ApiRoute
{
LOGIN
=
'
/login
'
,
LOGIN
=
'
/login
'
,
REFRESH_TOKENS
=
'
/refresh_tokens
'
,
TEST_SESSION
=
'
/test_session
'
,
TEST_SESSION
=
'
/test_session
'
,
GITLAB_CHECK_TEMPLATE_ACCESS
=
'
/gitlab/project/{{id}}/checkTemplateAccess
'
,
GITLAB_CHECK_TEMPLATE_ACCESS
=
'
/gitlab/project/{{id}}/checkTemplateAccess
'
,
ASSIGNMENT_GET
=
'
/assignments/{{nameOrUrl}}
'
,
ASSIGNMENT_GET
=
'
/assignments/{{nameOrUrl}}
'
,
...
...
This diff is collapsed.
Click to expand it.
types/Dojo/DojoGitlabCredentials.ts
0 → 100644
View file @
dc12d176
interface
DojoGitlabCredentials
{
refreshToken
:
string
|
null
;
accessToken
:
string
|
null
;
}
export
default
DojoGitlabCredentials
;
\ No newline at end of file
This diff is collapsed.
Click to expand it.