Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
medal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
39
Issues
39
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bwinf
medal
Commits
06a852a8
Commit
06a852a8
authored
Jun 23, 2020
by
Robert Czechowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clippy lint about too many arguments in login_foreign
parent
25a16348
Pipeline
#687
passed with stage
in 12 minutes and 54 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
29 additions
and
30 deletions
+29
-30
src/core.rs
src/core.rs
+21
-22
src/db_conn.base.rs
src/db_conn.base.rs
+2
-2
src/db_conn.rs
src/db_conn.rs
+2
-2
src/db_conn_postgres.rs
src/db_conn_postgres.rs
+2
-2
src/db_conn_sqlite_new.rs
src/db_conn_sqlite_new.rs
+2
-2
No files found.
src/core.rs
View file @
06a852a8
...
...
@@ -1234,23 +1234,22 @@ pub fn admin_show_participation<T: MedalConnection>(conn: &T, user_id: i32, cont
let
contest
=
conn
.get_contest_by_id_complete
(
contest_id
);
let
subms
:
Vec
<
(
String
,
Vec
<
(
i32
,
Vec
<
(
String
,
i32
)
>
)
>
)
>
=
contest
.taskgroups
.into_iter
()
.map
(|
tg
|
{
(
tg
.name
,
tg
.tasks
.into_iter
()
.map
(|
t
|
{
(
t
.stars
,
let
subms
:
Vec
<
(
String
,
Vec
<
(
i32
,
Vec
<
(
String
,
i32
)
>
)
>
)
>
=
contest
.taskgroups
.into_iter
()
.map
(|
tg
|
{
(
tg
.name
,
tg
.tasks
.into_iter
()
.map
(|
t
|
{
(
t
.stars
,
conn
.get_all_submissions
(
user_id
,
t
.id
.unwrap
(),
None
)
.into_iter
()
.map
(|
s
|
(
self
::
time
::
strftime
(
"%FT%T%z"
,
&
self
::
time
::
at
(
s
.date
))
.unwrap
(),
s
.grade
))
.collect
())
})
.collect
())
})
.collect
();
})
.collect
())
})
.collect
();
let
mut
data
=
json_val
::
Map
::
new
();
data
.insert
(
"submissions"
.to_string
(),
to_json
(
&
subms
));
...
...
@@ -1304,15 +1303,15 @@ pub fn login_oauth<T: MedalConnection>(conn: &T, user_data: ForeignUserData, oau
match
conn
.login_foreign
(
None
,
&
oauth_provider_id
,
&
user_data
.foreign_id
,
user_data
.foreign_type
!=
UserType
::
User
,
user_data
.foreign_type
==
UserType
::
Admin
,
&
user_data
.firstname
,
&
user_data
.lastname
,
match
user_data
.sex
{
UserSex
::
Male
=>
Some
(
1
),
UserSex
::
Female
=>
Some
(
2
),
UserSex
::
Unknown
=>
Some
(
0
),
}
)
{
(
user_data
.foreign_type
!=
UserType
::
User
,
user_data
.foreign_type
==
UserType
::
Admin
,
&
user_data
.firstname
,
&
user_data
.lastname
,
match
user_data
.sex
{
UserSex
::
Male
=>
Some
(
1
),
UserSex
::
Female
=>
Some
(
2
),
UserSex
::
Unknown
=>
Some
(
0
),
})
)
{
Ok
(
session_token
)
=>
Ok
(
session_token
),
Err
(())
=>
{
let
mut
data
=
json_val
::
Map
::
new
();
...
...
src/db_conn.base.rs
View file @
06a852a8
...
...
@@ -441,8 +441,8 @@ impl MedalConnection for Connection {
}
//TODO: use session
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
is_admin
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
(
is_teacher
,
is_admin
,
firstname
,
lastname
,
sex
):
(
bool
,
bool
,
&
str
,
&
str
,
Option
<
i32
>
)
)
->
Result
<
String
,
()
>
{
let
session_token
=
helpers
::
make_session_token
();
...
...
src/db_conn.rs
View file @
06a852a8
...
...
@@ -32,8 +32,8 @@ pub trait MedalConnection {
fn
login
(
&
self
,
session
:
Option
<&
str
>
,
username
:
&
str
,
password
:
&
str
)
->
Result
<
String
,
()
>
;
fn
login_with_code
(
&
self
,
session
:
Option
<&
str
>
,
logincode
:
&
str
)
->
Result
<
String
,
()
>
;
fn
login_foreign
(
&
self
,
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
is_admin
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
fn
login_foreign
(
&
self
,
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
_
:
(
bool
,
bool
,
&
str
,
&
str
,
Option
<
i32
>
)
)
->
Result
<
String
,
()
>
;
fn
create_user_with_groupcode
(
&
self
,
session
:
Option
<&
str
>
,
groupcode
:
&
str
)
->
Result
<
String
,
()
>
;
fn
create_group_with_users
(
&
self
,
group
:
Group
);
...
...
src/db_conn_postgres.rs
View file @
06a852a8
...
...
@@ -551,8 +551,8 @@ impl MedalConnection for Connection {
}
//TODO: use session
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
is_admin
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
(
is_teacher
,
is_admin
,
firstname
,
lastname
,
sex
):
(
bool
,
bool
,
&
str
,
&
str
,
Option
<
i32
>
)
)
->
Result
<
String
,
()
>
{
let
session_token
=
helpers
::
make_session_token
();
...
...
src/db_conn_sqlite_new.rs
View file @
06a852a8
...
...
@@ -551,8 +551,8 @@ impl MedalConnection for Connection {
}
//TODO: use session
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
is_teacher
:
bool
,
is_admin
:
bool
,
firstname
:
&
str
,
lastname
:
&
str
,
sex
:
Option
<
i32
>
)
fn
login_foreign
(
&
self
,
_
session
:
Option
<&
str
>
,
provider_id
:
&
str
,
foreign_id
:
&
str
,
(
is_teacher
,
is_admin
,
firstname
,
lastname
,
sex
):
(
bool
,
bool
,
&
str
,
&
str
,
Option
<
i32
>
)
)
->
Result
<
String
,
()
>
{
let
session_token
=
helpers
::
make_session_token
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment