Skip to content

feat: update token on login (rebase) #4447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

feat: update token on login (rebase) #4447

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b5eb71d
feat: update token on login
david972 Apr 19, 2024
4df52a7
test: update identity tests
FaeyUmbrea Jul 6, 2025
350d3f1
test: update oauth strategy test
FaeyUmbrea Jul 6, 2025
4442a79
revert: remove unused method from oidc credential
FaeyUmbrea Jul 6, 2025
4f7e109
fix: correct code inconsistencies caused in rebase
FaeyUmbrea Jul 6, 2025
80e6552
chore: clean up code
FaeyUmbrea Jul 6, 2025
7333416
fix: correct wrong assignment
FaeyUmbrea Jul 6, 2025
33f8f9b
fix: save tokens if not merging identities
FaeyUmbrea Jul 6, 2025
92fee23
fix: execute post login hook after updating tokens
FaeyUmbrea Jul 6, 2025
0c5db27
feat: add login token capture feature flag
FaeyUmbrea Jul 6, 2025
b24dc9f
chore: format files
FaeyUmbrea Jul 6, 2025
92b6316
test: update tests for last token feature flag
FaeyUmbrea Jul 6, 2025
dff7df9
revert: capture_last_tokens accidentally added to required param test
FaeyUmbrea Jul 6, 2025
99750dc
fix: move capture_last_tokens: true to correct test definition
FaeyUmbrea Jul 6, 2025
7a689b6
test: update spa test
FaeyUmbrea Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmd/identities/get_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ func TestGetCmd(t *testing.T) {
InitialAccessToken: transform(accessToken + "0"),
InitialRefreshToken: transform(refreshToken + "0"),
InitialIDToken: transform(idToken + "0"),
LastAccessToken: transform(accessToken + "0"),
LastRefreshToken: transform(refreshToken + "0"),
LastIDToken: transform(idToken + "0"),
Organization: "foo-org-id",
},
{
Expand All @@ -87,6 +90,9 @@ func TestGetCmd(t *testing.T) {
InitialAccessToken: transform(accessToken + "1"),
InitialRefreshToken: transform(refreshToken + "1"),
InitialIDToken: transform(idToken + "1"),
LastAccessToken: transform(accessToken + "1"),
LastRefreshToken: transform(refreshToken + "1"),
LastIDToken: transform(idToken + "1"),
Organization: "bar-org-id",
},
}}),
Expand Down
20 changes: 16 additions & 4 deletions ...ler-case=should_be_able_to_import_users-with_cleartext_password_and_oidc_credentials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,20 @@
"provider": "google",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "import-2",
"provider": "github",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down Expand Up @@ -44,14 +50,20 @@
"provider": "okta",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "import-saml-2",
"provider": "onelogin",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
12 changes: 12 additions & 0 deletions ...dler-case=should_be_able_to_import_users-with_organization_oidc_and_saml_credentials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "ad6a7dac-4eef-4f09-8e58-c099c14b6c36"
},
{
Expand All @@ -18,6 +21,9 @@
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "ad6a7dac-4eef-4f09-8e58-c099c14b6c36"
}
]
Expand Down Expand Up @@ -46,6 +52,9 @@
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "ad6a7dac-4eef-4f09-8e58-c099c14b6c36"
},
{
Expand All @@ -54,6 +63,9 @@
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "ad6a7dac-4eef-4f09-8e58-c099c14b6c36"
}
]
Expand Down
2 changes: 1 addition & 1 deletion ...ties_with_credentials-include_credential=oidc_should_include_OIDC_credentials_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
"{\"providers\":[{\"initial_id_token\":\"id_token0\",\"initial_access_token\":\"access_token0\",\"initial_refresh_token\":\"refresh_token0\",\"subject\":\"foo\",\"provider\":\"bar\"},{\"initial_id_token\":\"id_token1\",\"initial_access_token\":\"access_token1\",\"initial_refresh_token\":\"refresh_token1\",\"subject\":\"baz\",\"provider\":\"zab\"}]}"
"{\"providers\":[{\"initial_id_token\":\"id_token0\",\"initial_access_token\":\"access_token0\",\"initial_refresh_token\":\"refresh_token0\",\"last_id_token\":\"id_token_current0\",\"last_access_token\":\"access_token_current0\",\"last_refresh_token\":\"refresh_token_current0\",\"subject\":\"foo\",\"provider\":\"bar\"},{\"initial_id_token\":\"id_token1\",\"initial_access_token\":\"access_token1\",\"initial_refresh_token\":\"refresh_token1\",\"last_id_token\":\"id_token_current1\",\"last_access_token\":\"access_token_current1\",\"last_refresh_token\":\"refresh_token_current1\",\"subject\":\"baz\",\"provider\":\"zab\"}]}"
3 changes: 3 additions & 0 deletions identity/.snapshots/TestImportCredentials-OIDC_new_credential_with_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "e7e3cbae-04cc-45f3-ae52-ea749a2ffaff"
}
]
Expand Down
5 changes: 4 additions & 1 deletion identity/.snapshots/TestImportCredentials-OIDC_new_credential_without_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"provider": "github",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion identity/.snapshots/TestImportCredentials-OIDC_update_credential_with_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@
"provider": "google",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "12345",
"provider": "github",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "e7e3cbae-04cc-45f3-ae52-ea749a2ffaff"
}
]
Expand Down
10 changes: 8 additions & 2 deletions identity/.snapshots/TestImportCredentials-OIDC_update_credential_without_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@
"provider": "google",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "12345",
"provider": "github",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
13 changes: 11 additions & 2 deletions identity/.snapshots/TestImportCredentials-OIDC_update_with_multiple_providers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,31 @@
"provider": "google",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "12345",
"provider": "github",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "e7e3cbae-04cc-45f3-ae52-ea749a2ffaff"
},
{
"subject": "abcdef",
"provider": "gitlab",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
3 changes: 3 additions & 0 deletions identity/.snapshots/TestImportCredentials-SAML_new_credential_with_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "e7e3cbae-04cc-45f3-ae52-ea749a2ffaff"
}
]
Expand Down
5 changes: 4 additions & 1 deletion identity/.snapshots/TestImportCredentials-SAML_new_credential_without_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"provider": "okta",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
8 changes: 7 additions & 1 deletion identity/.snapshots/TestImportCredentials-SAML_update_credential_with_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@
"provider": "onelogin",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "user123",
"provider": "okta",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "e7e3cbae-04cc-45f3-ae52-ea749a2ffaff"
}
]
Expand Down
10 changes: 8 additions & 2 deletions identity/.snapshots/TestImportCredentials-SAML_update_credential_without_organization.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@
"provider": "onelogin",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "user123",
"provider": "okta",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
13 changes: 11 additions & 2 deletions identity/.snapshots/TestImportCredentials-SAML_update_with_multiple_providers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,31 @@
"provider": "onelogin",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
},
{
"subject": "user123",
"provider": "okta",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": "",
"organization": "e7e3cbae-04cc-45f3-ae52-ea749a2ffaff"
},
{
"subject": "user789",
"provider": "auth0",
"initial_id_token": "",
"initial_access_token": "",
"initial_refresh_token": ""
"initial_refresh_token": "",
"last_id_token": "",
"last_access_token": "",
"last_refresh_token": ""
}
]
},
Expand Down
3 changes: 3 additions & 0 deletions identity/.snapshots/TestWithDeclassifiedCredentials-case=oidc-credential=oidc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"initial_id_token": "foo",
"initial_access_token": "",
"initial_refresh_token": "",
"last_id_token": "foo",
"last_access_token": "",
"last_refresh_token": "",
"subject": "bar",
"provider": "oidc1"
}
Expand Down
8 changes: 8 additions & 0 deletions identity/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
package identity

import (
"bytes"
"context"
"database/sql"
"encoding/json"
"reflect"
"time"

"github.com/pkg/errors"

"github.com/gofrs/uuid"
"github.com/wI2L/jsondiff"

Expand Down Expand Up @@ -191,6 +195,10 @@ func (c Credentials) GetID() uuid.UUID {
return c.ID
}

func (c Credentials) UnmarshalConfig(target interface{}) error {
return errors.WithStack(json.NewDecoder(bytes.NewBuffer(c.Config)).Decode(&target))
}

type (
// swagger:ignore
CredentialIdentifier struct {
Expand Down
8 changes: 7 additions & 1 deletion identity/credentials_oidc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type CredentialsOIDC struct {
Providers []CredentialsOIDCProvider `json:"providers"`
}

// CredentialsOIDCProvider is contains a specific OpenID COnnect credential for a particular connection (e.g. Google).
// CredentialsOIDCProvider is contains a specific OpenID Connect credential for a particular connection (e.g. Google).
//
// swagger:model identityCredentialsOidcProvider
type CredentialsOIDCProvider struct {
Expand All @@ -29,6 +29,9 @@ type CredentialsOIDCProvider struct {
InitialIDToken string `json:"initial_id_token"`
InitialAccessToken string `json:"initial_access_token"`
InitialRefreshToken string `json:"initial_refresh_token"`
LastIDToken string `json:"last_id_token"`
LastAccessToken string `json:"last_access_token"`
LastRefreshToken string `json:"last_refresh_token"`
Organization string `json:"organization,omitempty"`
UseAutoLink bool `json:"use_auto_link,omitzero"`
}
Expand Down Expand Up @@ -85,6 +88,9 @@ func NewOIDCLikeCredentials(tokens *CredentialsOIDCEncryptedTokens, t Credential
InitialIDToken: tokens.GetIDToken(),
InitialAccessToken: tokens.GetAccessToken(),
InitialRefreshToken: tokens.GetRefreshToken(),
LastIDToken: tokens.GetIDToken(),
LastAccessToken: tokens.GetAccessToken(),
LastRefreshToken: tokens.GetRefreshToken(),
Organization: organization,
},
},
Expand Down
Loading
Loading