o01eg/freeorion-test-web - Change OMLX22X64ZF3C7XD6MAR4GJB77UWAHADMH5VX2SC6VYTVJ5UCR5QC

Show user info on cookies page

Created by O01eg on February 2, 2025

OMLX22X64ZF3C7XD6MAR4GJB77UWAHADMH5VX2SC6VYTVJ5UCR5QC

Dependencies

In channels

main

Change contents

Replacement in src/pages/slow_game.rs at line 665 [4.625]

B:BD[3.3329] → [3.3329:3392]

            log::error!("Pool RW execute insert error {}", e);

[3.3329]

[3.3392]

            log::error!("Pool RW execute insert query delegation error: {}", e);

Replacement in src/pages/log_in.rs at line 41 [6.2605]
∅:D[2.519] → [5.134:146]
B:BD[5.134] → [5.134:146]
```
    if !jar
```
[2.519]
[5.146]
```
    if jar
```

Replacement in src/pages/log_in.rs at line 44 [6.2605]

B:BD[5.214] → [5.214:261]

        .map_or(false, |x| x.value() == "yes")

[5.214]

[5.261]

        .is_none_or(|x| x.value() != "yes")

Replacement in src/pages/log_in.rs at line 69 [6.2605]
B:BD[2.747] → [2.747:759]
```
    if !jar
```
[2.747]
[2.759]
```
    // ToDo: skip this check if player accepted them
    if jar
```

Replacement in src/pages/log_in.rs at line 73 [6.2605]

B:BD[2.821] → [2.821:868]

        .map_or(false, |x| x.value() == "yes")

[2.821]

[2.868]

        .is_none_or(|x| x.value() != "yes")

Replacement in src/pages/cookies_policy.rs at line 5 [7.788]

B:BD[7.914] → [6.6676:6737]

use crate::pages::{insert_security_headers, request_to_jar};

[7.914]

use crate::pages::{insert_security_headers, request_to_jar, CommonAuthInfo};

Replacement in src/pages/cookies_policy.rs at line 9 [7.788]

B:BD[8.345] → [8.345:392]

struct CookieInfo {
    i_accept_cookie: bool,

[8.345]

[8.392]

struct CookieInfo<'a> {
    pub common_auth_info: CommonAuthInfo<'a>,
    pub i_accept_cookie: bool,

Insertion in src/pages/cookies_policy.rs at line 16 [7.788]

[2.11205]

[8.395]


    let user = jar
        .private(&data.cookies_key)
        .get("auth")
        .map(|x| x.value().to_string());

Insertion in src/pages/cookies_policy.rs at line 25 [7.788]

[8.486]

            common_auth_info: CommonAuthInfo {
                user: user.map(Into::into),
            },

Replacement in src/pages/cookies_policy.rs at line 31 [7.788]

B:BD[8.603] → [8.603:659]

                .map_or(false, |x| x.value() == "yes"),

[8.603]

[8.659]

                .is_some_and(|x| x.value() == "yes"),

File addition: 20240731_1_users_accepted_cookies.sql (----------)

[9.15]

-- Create field to store if player accepted cookies
DO $$
BEGIN
    IF NOT EXISTS (
        SELECT 1 FROM pg_class c
        INNER JOIN pg_namespace n ON n.oid = c.relnamespace
        INNER JOIN pg_attribute a ON a.attrelid = c.oid
        WHERE c.relname = 'users' AND n.nspname = 'auth' AND a.attname = 'accept_cookies'
    ) THEN
        ALTER TABLE auth.users ADD COLUMN accept_cookies BOOLEAN NULL;
    END IF;
END
$$;