Skip to content
Merged
Changes from all commits
Commits
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
26 changes: 5 additions & 21 deletions backend/internxt/internxt.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,6 @@ func init() {
NewFs: NewFs,
Config: Config,
Options: []fs.Option{
{
Name: "token",
Help: "Internxt auth token (JWT).\n\nLeave blank to trigger interactive login.",
IsPassword: true,
},
{
Name: "mnemonic",
Help: "Internxt encryption mnemonic.\n\nLeave blank to trigger interactive login.",
IsPassword: true,
},
{
Name: "simulateEmptyFiles",
Default: false,
Expand Down Expand Up @@ -100,31 +90,25 @@ func Config(ctx context.Context, name string, m configmap.Mapper, configIn fs.Co
oauthToken, err := oauthutil.GetToken(name, m)
if err != nil {
fs.Errorf(nil, "Failed to get token: %v", err)
return fs.ConfigGoto("reauth")
return fs.ConfigGoto("auth")
}

if time.Until(oauthToken.Expiry) < tokenExpiry2d {
fs.Logf(nil, "Token expires soon, attempting refresh...")
err := refreshJWTToken(ctx, name, m)
if err != nil {
fs.Errorf(nil, "Failed to refresh token: %v", err)
return fs.ConfigConfirm("reauth", true, "config_reauth",
"Token refresh failed. Re-authenticate?")
return fs.ConfigGoto("auth")
}
fs.Logf(nil, "Token refreshed successfully")
return nil, nil
}

return fs.ConfigConfirm("reauth", false, "config_reauth",
"Already authenticated. Re-authenticate?")
}

return fs.ConfigGoto("auth")

case "reauth":
if configIn.Result == "false" {
// Token is valid - complete config without re-auth prompt
fs.Logf(nil, "Existing credentials are valid")
return nil, nil
}

return fs.ConfigGoto("auth")

case "auth":
Expand Down