diff options
| -rw-r--r-- | auth/auth.go | 59 | ||||
| -rw-r--r-- | cmd/login.go | 46 | ||||
| -rw-r--r-- | mal/mal.go | 17 |
3 files changed, 112 insertions, 10 deletions
diff --git a/auth/auth.go b/auth/auth.go new file mode 100644 index 0000000..c3b2cfd --- /dev/null +++ b/auth/auth.go @@ -0,0 +1,59 @@ +/* +macli - Unofficial CLI-Based MyAnimeList Client +Copyright © 2022 Vidhu Kant Sharma <vidhukant@vidhukant.xyz> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +package auth + +import ( + "os" + "os/user" + "fmt" + "github.com/zalando/go-keyring" +) + +var serviceName string = "macli" +var userName string + +func init() { + // get user and set username + currentUser, err := user.Current() + if err != nil { + fmt.Println("Error getting current user's info", err.Error()) + os.Exit(1) + } + userName = currentUser.Username +} + +func Login(secret string) { + err := keyring.Set(serviceName, userName, secret) + if err != nil { + fmt.Println("Error while writing access token to keychain", err) + os.Exit(1) + } +} + +func GetToken() string { + // get mal secret from keyring + secret, err := keyring.Get(serviceName, userName) + if err != nil { + fmt.Println("\x1b[31mError while reading access token from keychain:", err.Error(), "\x1b[0m") + fmt.Println("Run `macli login` first to authenticate with your MyAnimeList API Token") + os.Exit(1) + } + + return secret +} diff --git a/cmd/login.go b/cmd/login.go new file mode 100644 index 0000000..bcecc3f --- /dev/null +++ b/cmd/login.go @@ -0,0 +1,46 @@ +/* +macli - Unofficial CLI-Based MyAnimeList Client +Copyright © 2022 Vidhu Kant Sharma <vidhukant@vidhukant.xyz> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +package cmd + +import ( + "github.com/spf13/cobra" + "github.com/MikunoNaka/macli/ui" + "github.com/MikunoNaka/macli/auth" +) + +var loginCmd = &cobra.Command { + Use: "login", + Short: "Login with your MyAnimeList client secret", + Long: ` +Currently, macli doesn't support logging in. +You need to manually generate an access token/client secret to authorise +macli with your MyAnimeList account. + +An easy way to generate a token is to use my python script: +https://github.com/MikunoNaka/mal-authtoken-generator +`, + Run: func(cmd *cobra.Command, args []string) { + secret := ui.PasswordInput("Enter your client secret: ", "Client secret can't be empty") + auth.Login(secret) + }, +} + +func init() { + rootCmd.AddCommand(loginCmd) +} @@ -19,9 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. package mal import ( - _ "github.com/joho/godotenv/autoload" - "os" - + "github.com/MikunoNaka/macli/auth" a "github.com/MikunoNaka/MAL2Go/anime" m "github.com/MikunoNaka/MAL2Go/manga" ua "github.com/MikunoNaka/MAL2Go/user/anime" @@ -33,13 +31,12 @@ var mangaClient m.Client var userAnimeClient ua.Client var userMangaClient um.Client -func init() { - // TODO: don't load access token from .env - var accessToken = os.Getenv("ACCESS_TOKEN") +func Init() { + secret := auth.GetToken() // initialise MAL2Go Client(s) - animeClient.AuthToken = "Bearer " + accessToken - mangaClient.AuthToken = "Bearer " + accessToken - userAnimeClient.AuthToken = "Bearer " + accessToken - userMangaClient.AuthToken = "Bearer " + accessToken + animeClient.AuthToken = "Bearer " + secret + mangaClient.AuthToken = "Bearer " + secret + userAnimeClient.AuthToken = "Bearer " + secret + userMangaClient.AuthToken = "Bearer " + secret } |