From 671eee7a3bab0e65955ed179c93be738b5b87654 Mon Sep 17 00:00:00 2001 From: Hylke Visser Date: Fri, 23 Dec 2016 09:16:31 +0100 Subject: [PATCH] Use v2 AS --- .env/ttnctl.yml.dev-example | 1 - README.md | 2 +- api/API_AUTHENTICATION.md | 4 ++-- core/component/auth_test.go | 8 ++++---- docker-compose.yml | 2 +- mqtt/README.md | 2 +- ttnctl/cmd/root.go | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.env/ttnctl.yml.dev-example b/.env/ttnctl.yml.dev-example index 3acc3ea2b..c6dc2fa70 100644 --- a/.env/ttnctl.yml.dev-example +++ b/.env/ttnctl.yml.dev-example @@ -1,5 +1,4 @@ discovery-address: localhost:1900 -auth-server: https://preview.account.thethingsnetwork.org router-id: dev handler-id: dev mqtt-address: localhost:1883 diff --git a/README.md b/README.md index 705860edb..65fec8b5f 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ You can check your `ttnctl` configuration by running `ttnctl config`. It should config file: /home/your-user/.ttnctl.yml data dir: /home/your-user/.ttnctl - auth-server: https://preview.account.thethingsnetwork.org + auth-server: https://account.thethingsnetwork.org discovery-address: localhost:1900 router-id: dev handler-id: dev diff --git a/api/API_AUTHENTICATION.md b/api/API_AUTHENTICATION.md index f91bcc32b..29287163e 100644 --- a/api/API_AUTHENTICATION.md +++ b/api/API_AUTHENTICATION.md @@ -44,7 +44,7 @@ You can authenticate to the gRPC endpoint by supplying a `key` field in the Meta ```go md := metadata.Pairs( - "key", "ttn-account-preview.n4BAoKOGuK2hj7MXg_OVtpLO0BTJI8lLzt66UsvTlUvZPsi6FADOptnmSH3e3PuQzbLLEUhXxYhkxr34xyUqBQ", + "key", "ttn-account-v2.n4BAoKOGuK2hj7MXg_OVtpLO0BTJI8lLzt66UsvTlUvZPsi6FADOptnmSH3e3PuQzbLLEUhXxYhkxr34xyUqBQ", ) ctx := metadata.NewContext(context.Background(), md) ``` @@ -56,5 +56,5 @@ For HTTP Endpoints, you should supply the `Authorization` header: `Authorization **Example:** ``` -Authorization: Key ttn-account-preview.n4BAoKOGuK2hj7MXg_OVtpLO0BTJI8lLzt66UsvTlUvZPsi6FADOptnmSH3e3PuQzbLLEUhXxYhkxr34xyUqBQ +Authorization: Key ttn-account-v2.n4BAoKOGuK2hj7MXg_OVtpLO0BTJI8lLzt66UsvTlUvZPsi6FADOptnmSH3e3PuQzbLLEUhXxYhkxr34xyUqBQ ``` diff --git a/core/component/auth_test.go b/core/component/auth_test.go index d9bd483b3..4cc584395 100644 --- a/core/component/auth_test.go +++ b/core/component/auth_test.go @@ -111,7 +111,7 @@ func TestValidateTTNAuthContext(t *testing.T) { c := new(Component) c.Config.KeyDir = os.TempDir() c.Config.AuthServers = map[string]string{ - "ttn-account-preview": accountServer, + "ttn-account-v2": accountServer, } err := c.initAuthServers() a.So(err, assertions.ShouldBeNil) @@ -141,7 +141,7 @@ func TestValidateTTNAuthContext(t *testing.T) { { md := metadata.Pairs( "id", "dev", - "token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJ0dG4tYWNjb3VudC1wcmV2aWV3Iiwic3ViIjoiZGV2IiwidHlwZSI6InJvdXRlciIsImlhdCI6MTQ3NjQzOTQzOH0.Duz-E5aMYEPY_Nf5Pky7Qmjbs1dMp9PN9nMqbSzoU079b8TPL4DH2SKcRHrrMqieB3yhJb3YaQBfY6dKWfgVz8BmTeKlGXfFrqEj91y30J7r9_VsHRzgDMJedlqXryvf0S_yD27TsJ7TMbGYyE00T4tAX3Uf6wQZDhdyHNGtdf4jtoAjzOxVAodNtXZp26LR7fFk56UstBxOxztBMzyzmAdiTG4lSyEqq7zsuJcFjmHB9MfEoD4ZT-iTRL1ohFjGuj2HN49oPyYlZAVPP7QajLyNsLnv-nDqXE_QecOjAcEq4PLNJ3DpXtX-lo8I_F1eV9yQnDdQQi4EUvxmxZWeBA", + "token", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0dG4tYWNjb3VudC12MiIsInN1YiI6ImRldiIsInR5cGUiOiJnYXRld2F5IiwiaWF0IjoxNDgyNDIxMTEyfQ.obhobeREK9bOpi-YO5lZ8rpW4CkXZUSrRBRIjbFThhvAsj_IjkFmCovIVLsGlaDVEKciZmXmWnY-6ZEgUEu6H6_GG4AD6HNHXnT0o0XSPgf5_Bc6dpzuI5FCEpcELihpBMaW3vPUt29NecLo4LvZGAuOllUYKHsZi34GYnR6PFlOgi40drN_iU_8aMCxFxm6ki83QlcyHEmDAh5GAGIym0qnUDh5_L1VE_upmoR72j8_l5lSuUA2_w8CH5_Z9CrXlTKQ2XQXsQXprkhbmOKKC8rfbTjRsB_nxObu0qcTWLH9tMd4KGFkJ20mdMw38fg2Vt7eLrkU1R1kl6a65eo6LZi0JvRSsboVZFWLwI02Azkwsm903K5n1r25Wq2oiwPJpNq5vsYLdYlb-WdAPsEDnfQGLPaqxd5we8tDcHsF4C1JHTwLsKy2Sqj8WNVmLgXiFER0DNfISDgS5SYdOxd9dUf5lTlIYdJU6aG1yYLSEhq80QOcdhCqNMVu1uRIucn_BhHbKo_LCMmD7TGppaXcQ2tCL3qHQaW8GCoun_UPo4C67LIMYUMfwd_h6CaykzlZvDlLa64ZiQ3XPmMcT_gVT7MJS2jGPbtJmcLHAVa5NZLv2d6WZfutPAocl3bYrY-sQmaSwJrzakIb2D-DNsg0qBJAZcm2o021By8U4bKAAFQ", ) ctx := metadata.NewContext(context.Background(), md) _, err = c.ValidateTTNAuthContext(ctx) @@ -160,7 +160,7 @@ func TestExchangeAppKeyForToken(t *testing.T) { c := new(Component) c.Config.KeyDir = os.TempDir() c.Config.AuthServers = map[string]string{ - "ttn-account-preview": fmt.Sprintf("%s://%s:%s@%s", + "ttn-account-v2": fmt.Sprintf("%s://%s:%s@%s", os.Getenv("ACCOUNT_SERVER_PROTO"), os.Getenv("ACCOUNT_SERVER_USERNAME"), os.Getenv("ACCOUNT_SERVER_PASSWORD"), @@ -170,7 +170,7 @@ func TestExchangeAppKeyForToken(t *testing.T) { c.initAuthServers() { - token, err := c.ExchangeAppKeyForToken(os.Getenv("APP_ID"), "ttn-account-preview."+os.Getenv("APP_TOKEN")) + token, err := c.ExchangeAppKeyForToken(os.Getenv("APP_ID"), "ttn-account-v2."+os.Getenv("APP_TOKEN")) a.So(err, assertions.ShouldBeNil) a.So(token, assertions.ShouldNotBeEmpty) } diff --git a/docker-compose.yml b/docker-compose.yml index 687a902f8..5dcf5fbc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,4 +115,4 @@ services: # gateway "dev" TTN_GATEWAY_EUI: 0102030405060708 TTN_GATEWAY_ID: dev - TTN_GATEWAY_TOKEN: eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJ0dG4tYWNjb3VudC1wcmV2aWV3Iiwic3ViIjoiZGV2IiwidHlwZSI6ImdhdGV3YXkiLCJpYXQiOjE0NzY0Mzk0Mzh9.kEOiLe9j4qRElZOt_bAXmZlva1nV6duIL0MDVa3bx2SEWC3qredaBWXWq4FmV4PKeI_zndovQtOoValH0B_6MW6vXuWL1wYzV6foTH5gQdxmn-iuQ1AmAIYbZeyHl9a-NPqDgkXLwKmo2iB1hUi9wV6HXfIOalguDtGJbmMfJ2tommsgmuNCXd-2zqhStSy8ArpROFXPm7voGDTcgm4hfchr7zhn-Er76R-eJa3RZ1Seo9BsiWrQ0N3VDSuh7ycCakZtkaLD4OTutAemcbzbrNJSOCvvZr8Asn-RmMkjKUdTN4Bgn3qlacIQ9iZikPLT8XyjFkj-8xjs3KAobWg40A + TTN_GATEWAY_TOKEN: eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0dG4tYWNjb3VudC12MiIsInN1YiI6ImRldiIsInR5cGUiOiJnYXRld2F5IiwiaWF0IjoxNDgyNDIxMTEyfQ.obhobeREK9bOpi-YO5lZ8rpW4CkXZUSrRBRIjbFThhvAsj_IjkFmCovIVLsGlaDVEKciZmXmWnY-6ZEgUEu6H6_GG4AD6HNHXnT0o0XSPgf5_Bc6dpzuI5FCEpcELihpBMaW3vPUt29NecLo4LvZGAuOllUYKHsZi34GYnR6PFlOgi40drN_iU_8aMCxFxm6ki83QlcyHEmDAh5GAGIym0qnUDh5_L1VE_upmoR72j8_l5lSuUA2_w8CH5_Z9CrXlTKQ2XQXsQXprkhbmOKKC8rfbTjRsB_nxObu0qcTWLH9tMd4KGFkJ20mdMw38fg2Vt7eLrkU1R1kl6a65eo6LZi0JvRSsboVZFWLwI02Azkwsm903K5n1r25Wq2oiwPJpNq5vsYLdYlb-WdAPsEDnfQGLPaqxd5we8tDcHsF4C1JHTwLsKy2Sqj8WNVmLgXiFER0DNfISDgS5SYdOxd9dUf5lTlIYdJU6aG1yYLSEhq80QOcdhCqNMVu1uRIucn_BhHbKo_LCMmD7TGppaXcQ2tCL3qHQaW8GCoun_UPo4C67LIMYUMfwd_h6CaykzlZvDlLa64ZiQ3XPmMcT_gVT7MJS2jGPbtJmcLHAVa5NZLv2d6WZfutPAocl3bYrY-sQmaSwJrzakIb2D-DNsg0qBJAZcm2o021By8U4bKAAFQ diff --git a/mqtt/README.md b/mqtt/README.md index e41e46c3a..bc04dd8cb 100644 --- a/mqtt/README.md +++ b/mqtt/README.md @@ -2,7 +2,7 @@ * Host: `.thethings.network`, where `` is last part of the handler you registered your application to, e.g. `eu`. * Port: `1883` or `8883` for TLS -* PEM encoded CA certificate for TLS: [mqtt-ca.pem](https://preview.console.thethingsnetwork.org/mqtt-ca.pem) +* PEM encoded CA certificate for TLS: [mqtt-ca.pem](https://console.thethingsnetwork.org/mqtt-ca.pem) * Username: Application ID * Password: Application Access Key diff --git a/ttnctl/cmd/root.go b/ttnctl/cmd/root.go index 3eb70219e..3b77aec63 100644 --- a/ttnctl/cmd/root.go +++ b/ttnctl/cmd/root.go @@ -89,7 +89,7 @@ func init() { viper.BindPFlag("auth-server", RootCmd.PersistentFlags().Lookup("auth-server")) viper.SetDefault("gateway-id", "dev") - viper.SetDefault("gateway-token", "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJpc3MiOiJ0dG4tYWNjb3VudC1wcmV2aWV3Iiwic3ViIjoiZGV2IiwidHlwZSI6ImdhdGV3YXkiLCJpYXQiOjE0NzY0Mzk0Mzh9.kEOiLe9j4qRElZOt_bAXmZlva1nV6duIL0MDVa3bx2SEWC3qredaBWXWq4FmV4PKeI_zndovQtOoValH0B_6MW6vXuWL1wYzV6foTH5gQdxmn-iuQ1AmAIYbZeyHl9a-NPqDgkXLwKmo2iB1hUi9wV6HXfIOalguDtGJbmMfJ2tommsgmuNCXd-2zqhStSy8ArpROFXPm7voGDTcgm4hfchr7zhn-Er76R-eJa3RZ1Seo9BsiWrQ0N3VDSuh7ycCakZtkaLD4OTutAemcbzbrNJSOCvvZr8Asn-RmMkjKUdTN4Bgn3qlacIQ9iZikPLT8XyjFkj-8xjs3KAobWg40A") + viper.SetDefault("gateway-token", "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0dG4tYWNjb3VudC12MiIsInN1YiI6ImRldiIsInR5cGUiOiJnYXRld2F5IiwiaWF0IjoxNDgyNDIxMTEyfQ.obhobeREK9bOpi-YO5lZ8rpW4CkXZUSrRBRIjbFThhvAsj_IjkFmCovIVLsGlaDVEKciZmXmWnY-6ZEgUEu6H6_GG4AD6HNHXnT0o0XSPgf5_Bc6dpzuI5FCEpcELihpBMaW3vPUt29NecLo4LvZGAuOllUYKHsZi34GYnR6PFlOgi40drN_iU_8aMCxFxm6ki83QlcyHEmDAh5GAGIym0qnUDh5_L1VE_upmoR72j8_l5lSuUA2_w8CH5_Z9CrXlTKQ2XQXsQXprkhbmOKKC8rfbTjRsB_nxObu0qcTWLH9tMd4KGFkJ20mdMw38fg2Vt7eLrkU1R1kl6a65eo6LZi0JvRSsboVZFWLwI02Azkwsm903K5n1r25Wq2oiwPJpNq5vsYLdYlb-WdAPsEDnfQGLPaqxd5we8tDcHsF4C1JHTwLsKy2Sqj8WNVmLgXiFER0DNfISDgS5SYdOxd9dUf5lTlIYdJU6aG1yYLSEhq80QOcdhCqNMVu1uRIucn_BhHbKo_LCMmD7TGppaXcQ2tCL3qHQaW8GCoun_UPo4C67LIMYUMfwd_h6CaykzlZvDlLa64ZiQ3XPmMcT_gVT7MJS2jGPbtJmcLHAVa5NZLv2d6WZfutPAocl3bYrY-sQmaSwJrzakIb2D-DNsg0qBJAZcm2o021By8U4bKAAFQ") } func printKV(key, t interface{}) {