equal
deleted
inserted
replaced
41 |
41 |
42 if instanceURL == "" { |
42 if instanceURL == "" { |
43 return errors.New("no instance provided") |
43 return errors.New("no instance provided") |
44 } |
44 } |
45 |
45 |
|
46 if verbose { |
|
47 errPrint("Instance: '%s'", instanceURL) |
|
48 } |
|
49 |
46 if appID != "" && appSecret != "" { |
50 if appID != "" && appSecret != "" { |
47 // We already have an app key/secret pair |
51 // We already have an app key/secret pair |
48 gClient, err = madon.RestoreApp(AppName, instanceURL, appID, appSecret, nil) |
52 gClient, err = madon.RestoreApp(AppName, instanceURL, appID, appSecret, nil) |
49 if err != nil { |
53 if err != nil { |
50 return err |
54 return err |
51 } |
55 } |
52 // Check instance |
56 // Check instance |
53 if _, err := gClient.GetCurrentInstance(); err != nil { |
57 if _, err := gClient.GetCurrentInstance(); err != nil { |
54 return errors.New("could not use provided app secrets") |
58 return errors.New("could not connect to server with provided app ID/secret") |
55 } |
59 } |
56 if verbose { |
60 if verbose { |
57 errPrint("Using provided app secrets") |
61 errPrint("Using provided app ID/secret") |
58 } |
62 } |
59 return nil |
63 return nil |
60 } |
64 } |
61 |
65 |
62 if appID != "" || appSecret != "" { |
66 if appID != "" || appSecret != "" { |